From 8618ee13c665889c33e2f55f804d490101c4c02e Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 12 Jul 2010 17:04:34 +0200 Subject: [PATCH] [REF] Rewrite a chunk of code in the res.company with the default value for a multicompany context bzr revid: stephane@openerp.com-20100712150434-8ummpcj142t0u2rx --- bin/addons/base/res/res_company.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index e2e4d18637f..3601e57d321 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -121,12 +121,11 @@ class res_company(osv.osv): ] ids = proxy.search(cr, uid, args, context=context) + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) for rule in proxy.browse(cr, uid, ids, context): - user = self.pool.get('res.users').browse(cr, uid, uid) if eval(rule.expression, {'context': context, 'user': user}): return rule.company_dest_id.id - user_company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id - return user_company_id + return user.company_id.id def _get_child_ids(self, cr, uid, uid2, context={}): company = self.pool.get('res.users').company_get(cr, uid, uid2)