summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2012-10-22 12:15:25 +0200
committerVo Minh Thu <vmt@openerp.com>2012-10-22 12:15:25 +0200
commitf5f1276a71ff1bd1104d766b2db40a76e1f6dbae (patch)
tree75f62869794d1e805f697f5580f535c1e65ca311
parentd6f262da378803224902ab852364c69bb6c49529 (diff)
parentf4b6f015b30c34bf7474ca7f0ec10a123d509859 (diff)
[MERGE] adding missing contexts.
bzr revid: vmt@openerp.com-20121022101525-3y1g7sxfukpkhjx2
-rw-r--r--openerp/addons/base/res/res_users.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 14673ce118f..27fb7603c7e 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -334,10 +334,10 @@ class res_users(osv.osv):
context={}
ids = []
if name:
- ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
+ ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit, context=context)
if not ids:
- ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
- return self.name_get(cr, user, ids)
+ ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+ return self.name_get(cr, user, ids, context=context)
def copy(self, cr, uid, id, default=None, context=None):
user2copy = self.read(cr, uid, [id], ['login','name'])[0]