[REVIEW]: review record rules for the sale, purchase, account, stock, and produc

bzr revid: mga@mga-20100316143337-ng6bmx315jq3ymu4

addons/account/security/account_security.xml

@@ -46,7 +46,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
         <field name="rule_group" ref="account_move_comp_rule_group"/>
     </record>
 
@@ -60,7 +60,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
@@ -72,7 +72,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_period_comp_rule_group"/>
     </record>
 
@@ -85,7 +85,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_comp_rule_group"/>
     </record>
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">

addons/product/security/product_security.xml

@@ -17,7 +17,7 @@
     </record>
     <record id="product_comp_rule" model="ir.rule">
         <field name="rule_group" ref="product_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">

addons/project/security/project_security.xml

@@ -23,7 +23,7 @@
     </record>
     <record model="ir.rule" id="project_comp_rule">
         <field name="rule_group" ref="project_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="task_comp_rule_group">
@@ -32,7 +32,7 @@
         <field name="global" eval="True"/>
     </record>
     <record model="ir.rule" id="task_comp_rule">
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="task_comp_rule_group"/>
     </record>
 

addons/purchase/security/purchase_security.xml

@@ -18,7 +18,7 @@
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
@@ -29,7 +29,7 @@
     <record model="ir.rule" id="purchase_order_line_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>

addons/sale/security/sale_security.xml

@@ -9,7 +9,6 @@
         <field name="name">Sale / Salesman</field>
     </record>
 
-
     <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
@@ -22,7 +21,7 @@
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="sale_order_line_comp_rule_group">
@@ -33,7 +32,7 @@
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="field_id" search="[('model','=','sale.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 

addons/stock/security/stock_security.xml

@@ -25,14 +25,14 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_picking_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','=',False)]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_picking_rule_group"/>
      </record>
 
-	<record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
+    <record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
         <field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
@@ -41,7 +41,7 @@
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="field_id" search="[('model','=','stock.warehouse'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_warehouse_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_location_comp_rule_group">
@@ -52,7 +52,7 @@
     <record model="ir.rule" id="stock_location_comp_rule">
         <field name="field_id" search="[('model','=','stock.location'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_location_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
      <record model="ir.rule.group" id="stock_move_rule_group">
@@ -61,10 +61,10 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_move_rule">
-      	<field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-   	    <field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_move_rule_group"/>
      </record>
 
@@ -76,7 +76,7 @@
     <record model="ir.rule" id="stock_inventory_line_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_inventory_comp_rule_group">
@@ -87,7 +87,7 @@
     <record model="ir.rule" id="stock_inventory_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">[('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>