[IMP] improving the rule for properties

bzr revid: fp@tinyerp.com-20091228162245-x6gfv1usvmeaxnwr

bin/addons/base/ir/ir.xml

@@ -1203,22 +1203,9 @@
             <field model="ir.model" name="model_id" ref="model_ir_property"/>
             <field eval="True" name="global"/>
         </record>
-        <record id="property_rule_group2" model="ir.rule.group">
-            <field name="name">Property multi-company 2</field>
-            <field model="ir.model" name="model_id" ref="model_ir_property"/>
-            <field eval="True" name="global"/>
-        </record>
         <record id="property_rule" model="ir.rule">
             <field model="ir.model.fields" name="field_id" search="[('model', '=', 'ir.property'), ('name', '=', 'company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="property_rule_group"/>
-        </record>
-        <record id="property_rule_bis" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model', '=', 'ir.property'), ('name', '=', 'company_id')]"/>
-            <field name="operator">=</field>
-            <field name="operand">False</field>
-            <field name="rule_group" ref="property_rule_group2"/>
+            <field name="domain_force">['|',('company_id','child_of',user.company_id.id),('company_id','=',False)]</field>
         </record>
 
         <!--server action view-->