summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-30 15:37:25 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-30 15:37:25 +0200
commitda388aa1920da810c80fd28a154b06b0cad8879d (patch)
treecf487659c426ef88385cdfd7b2f26bd4808f5f5e /addons
parentc8ca71fc62b44dbb6ba9eebf9091dae87c723cf4 (diff)
parenteb4f0309a9cdd609c4313de1ef320b4542bcf484 (diff)
[MERGE] forward port branch saas-6 up to eb4f030
Diffstat (limited to 'addons')
-rw-r--r--addons/auth_ldap/users_ldap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index c9de7c5f15f..c7506b9cd55 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -84,7 +84,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]]