[FIX] Bugfix domain_force

[IMP] Added customer_id field in view

bzr revid: fabian@fabian-openerp-20091125163718-5q7064l71c8hv101

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 5d93287..20ceb73 100644 (file)
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -106,14 +106,15 @@ 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}
-            if rule.operand.startswith('user.') and rule.operand.count('.') > 1:
-                #Need to check user.field.field1.field2(if field  is False,it will break the chain)
-                op = rule.operand[5:]
-                rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
             
             if rule.domain_force:
                 res[rule.id] = eval(rule.domain_force, eval_user_data)
             else:
+                if rule.operand.startswith('user.') and rule.operand.count('.') > 1:
+                    #Need to check user.field.field1.field2(if field  is False,it will break the chain)
+                    op = rule.operand[5:]
+                    rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
+
                 if rule.operator in ('in', 'child_of'):
                     dom = eval("[('%s', '%s', [%s])]" % (rule.field_id.name, rule.operator,
                         eval(rule.operand,eval_user_data)), eval_user_data)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 16c30e2..c03bd94 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -298,6 +298,7 @@
                             <field name="website" widget="url"/>
                             <field name="date" select="2"/>
                             <field name="parent_id"/>
+                            <field name="company_id" groups="base.group_extended" widget="selection"/>
                             <newline/>
                         </page>
                         <page string="History">