From f91c52e84cc21dbdaa90898ff8b266fe559e3c5b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 12 Oct 2010 09:12:27 +0200 Subject: [PATCH] fix bzr revid: fp@tinyerp.com-20101012071227-khzuqvg1jfc3st7x --- bin/addons/base/ir/ir_rule.py | 1 + bin/addons/base/res/res_security.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py index 799a411c15f..ba1eaca3f8d 100644 --- a/bin/addons/base/ir/ir_rule.py +++ b/bin/addons/base/ir/ir_rule.py @@ -35,6 +35,7 @@ class ir_rule(osv.osv): for rule in self.browse(cr, uid, ids, context): eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid), 'time':time} + print rule.domain_force res[rule.id] = eval(rule.domain_force, eval_user_data) return res diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml index ea7b541b9a1..3ca0685baee 100644 --- a/bin/addons/base/res/res_security.xml +++ b/bin/addons/base/res/res_security.xml @@ -17,7 +17,7 @@ company rule - ['|', ('child_ids', 'child_of', [company_id]), ('parent_id', 'child_of', [company_id])] + ['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]