From 8f07f01783a7c059243ae21152e803d0c12e555d Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 16 Jul 2015 14:33:44 +0200 Subject: [PATCH] [FIX] base: res.company _company_default_get Fix rule processing the criteria user.company_id was not honored. Closes: #4614, #7504 --- openerp/addons/base/res/res_company.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index fc0c442c493..8b0cce0741a 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -232,9 +232,10 @@ class res_company(osv.osv): args = [ ('object_id.model', '=', object), ('field_id', '=', field), + ('company_id', '=', self.pool['res.users']._get_company(cr, uid, context=context)), ] - ids = proxy.search(cr, uid, args, context=context) + ids = proxy.search(cr, uid, args, context=context, order='sequence') user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context) for rule in proxy.browse(cr, uid, ids, context): if eval(rule.expression, {'context': context, 'user': user}):