diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-30 15:35:57 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-30 15:35:57 +0200 |
| commit | eb4f0309a9cdd609c4313de1ef320b4542bcf484 (patch) | |
| tree | f35db12161415e1e91ebd0d14747c6c721d34628 | |
| parent | 858a8b9ef15bd7a5fc0e08f28705088cbe4d98ca (diff) | |
| parent | 295f62741d8d416c7ce3f0af0825d5e80766ac9c (diff) | |
[MERGE] forward port branch 8.0 up to 295f627
| -rw-r--r-- | addons/auth_ldap/users_ldap.py | 2 | ||||
| -rw-r--r-- | openerp/tools/translate.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index 4c917cc6729..a0751df0697 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -102,7 +102,7 @@ class CompanyLDAP(osv.osv): _logger.warning('Could not format LDAP filter. Your filter should contain one \'%s\'.') return False try: - results = self.query(conf, filter) + results = self.query(conf, filter.encode('utf-8')) # Get rid of (None, attrs) for searchResultReference replies results = [i for i in results if i[0]] diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index c4e9b55d9d6..8d38cf819b4 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -859,8 +859,9 @@ def trans_generate(lang, modules, cr): def get_module_from_path(path): for (mp, rec) in path_list: + mp = os.path.join(mp, '') if rec and path.startswith(mp) and os.path.dirname(path) != mp: - path = path[len(mp)+1:] + path = path[len(mp):] return path.split(os.path.sep)[0] return 'base' # files that are not in a module are considered as being in 'base' module |