[IMP]:changes in ir.rule demo to support the new functionaliy of ir.rule

bzr revid: rvo@tinyerp.co.in-20100428125109-wq33afl8104gx6rf

14 files changed, 107 insertions, 321 deletions

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index cd9727d5903..beb3e4e8ebb 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -36,161 +36,88 @@
         <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
-    <record id="account_move_comp_rule_group" model="ir.rule.group">
+    <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
         <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record id="account_move_comp_rule" model="ir.rule">
-        <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="rule_group" ref="account_move_comp_rule_group"/>
-    </record>
-
-    <record id="account_move_line_comp_rule_group" model="ir.rule.group">
-        <field name="name">Entry lines</field>
+    <record id="account_move_line_comp_rule" model="ir.rule">
+    	 <field name="name">Entry lines</field>
         <field model="ir.model" name="model_id" ref="model_account_move_line"/>
         <field eval="True" name="global"/>
-    </record>
-
-    <record id="account_move_line_comp_rule" model="ir.rule">
-        <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="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
-    <record id="journal_period_comp_rule_group" model="ir.rule.group">
-        <field name="name">Journal Period</field>
+
+    <record id="journal_period_comp_rule" model="ir.rule">
+    	<field name="name">Journal Period</field>
         <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="journal_period_comp_rule" model="ir.rule">
-        <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_of',[user.company_id.id])]</field>
-        <field name="rule_group" ref="journal_period_comp_rule_group"/>
     </record>
 
-    <record id="journal_comp_rule_group" model="ir.rule.group">
-        <field name="name">Journal multi-company</field>
+    <record id="journal_comp_rule" model="ir.rule">
+    	<field name="name">Journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_journal"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="journal_comp_rule" model="ir.rule">
-        <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_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">
-        <field name="name">Analytic journal multi-company</field>
+
+    <record id="analytic_journal_comp_rule" model="ir.rule">
+    	<field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="analytic_journal_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.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_of',[user.company_id.id])]</field>
-        <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
     </record>
-    <record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
-        <field name="name">Analytic journal multi-company</field>
+
+    <record id="analytic_journal_comp_rule_false" model="ir.rule">
+    	<field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
-    </record>
-    
-    <record id="analytic_journal_comp_rule_false" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">False</field>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        <field name="rule_group" ref="analytic_journal_comp_rule_group1"/>
     </record>
-    
-    <record id="period_comp_rule_group" model="ir.rule.group">
-        <field name="name">Period multi-company</field>
+
+    <record id="period_comp_rule" model="ir.rule">
+    	<field name="name">Period multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_period"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="period_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.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_of',[user.company_id.id])]</field>
-        <field name="rule_group" ref="period_comp_rule_group"/>
     </record>
-    
-    
-    <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
-        <field name="name">Fiscal year multi-company</field>
+
+    <record id="fiscal_year_comp_rule" model="ir.rule">
+    	<field name="name">Fiscal year multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="fiscal_year_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('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="rule_group" ref="fiscal_year_comp_rule_group"/>
     </record>
-    
-    <record id="account_comp_rule_group" model="ir.rule.group">
-        <field name="name">Account multi-company</field>
+
+    <record id="account_comp_rule" model="ir.rule">
+		<field name="name">Account multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_account"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="account_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('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="rule_group" ref="account_comp_rule_group"/>
     </record>
-    
-    <record id="tax_comp_rule_group" model="ir.rule.group">
-        <field name="name">Tax multi-company</field>
+
+    <record id="tax_comp_rule" model="ir.rule">
+    	 <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="tax_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('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="rule_group" ref="tax_comp_rule_group"/>
     </record>
-    
-    <record id="tax_code_comp_rule_group" model="ir.rule.group">
-        <field name="name">Tax code multi-company</field>
+
+    <record id="tax_code_comp_rule" model="ir.rule">
+    	<field name="name">Tax code multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="tax_code_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('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="rule_group" ref="tax_code_comp_rule_group"/>
     </record>
-    
-    <record id="invoice_comp_rule_group" model="ir.rule.group">
-        <field name="name">Invoice multi-company</field>
+
+    <record id="invoice_comp_rule" model="ir.rule">
+    	<field name="name">Invoice multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
-    </record>
-    <record id="invoice_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('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="rule_group" ref="invoice_comp_rule_group"/>
     </record>
 
 </data></openerp>
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 3dc66ec4a06..13ad6b34289 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
-    <record id="budget_post_comp_rule_group" model="ir.rule.group">
-        <field name="name">Budget post multi-company</field>
+
+    <record id="budget_post_comp_rule" model="ir.rule">
+    	<field name="name">Budget post multi-company</field>
         <field name="model_id" ref="model_account_budget_post"/>
         <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-    <record id="budget_post_comp_rule" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
-        <field name="operator">child_of</field>
-        <field name="operand">user.company_id.id</field>
-        <field name="rule_group" ref="budget_post_comp_rule_group"/>
-    </record>
-    <record id="budget_post_comp_rule_false" model="ir.rule">
-        <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
-        <field name="operator">=</field>
-        <field name="operand">False</field>
-        <field name="rule_group" ref="budget_post_comp_rule_group"/>
-    </record>
+
 </data></openerp>
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index d9f35874356..1b60f4ca0a8 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -12,19 +12,14 @@
             <field eval="'()'" name="args"/>
         </record>
     </data>
-    
+
     <data>
-        <record id="fetchmail_user_server" model="ir.rule.group">
-            <field name="name">User wise Server</field>
-            <field ref="model_email_server" name="model_id" model="ir.model"/>
-            <field eval="True" name="global"/>
-        </record>
 
         <record id="fetchmail_user_server_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','email.server'),('name','=','user_id')]"/>
-            <field name="operator">=</field>
-            <field name="operand">user.id</field>      
-            <field name="rule_group" ref="fetchmail_user_server"/>
+        	<field name="name">User wise Server</field>
+            <field ref="model_email_server" name="model_id" model="ir.model"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
         </record>
 
     </data>
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
index cc49ed9f936..2ff303cb48f 100644
--- a/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
@@ -2,16 +2,11 @@
 <openerp>
 	<data>
 
-		<record model="ir.rule.group" id="timesheet_comp_rule_group">
+		<record model="ir.rule" id="timesheet_comp_rule">
 			<field name="name">Timesheet multi-company</field>
 			<field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
 			<field name="global" eval="True"/>
-		</record>
-		<record model="ir.rule" id="timesheet_comp_rule">
-			<field name="field_id" search="[('model','=','hr_timesheet_sheet.sheet'),('name','=','company_id')]" model="ir.model.fields"/>
-			<field name="operator">child_of</field>
-			<field name="operand">user.company_id.id</field>
-			<field name="rule_group" ref="timesheet_comp_rule_group"/>
+			<field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
 		</record>
 
 	</data>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index cfb31f7d05d..be3dbe7293e 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -16,69 +16,39 @@
   	</record>
 
 <!-- Multi -->
-    <record model="ir.rule.group" id="mrp_procurement_rule_group">
-        <field name="name">mrp_procurement multi-company</field>
+    <record model="ir.rule" id="mrp_procurement_rule">
+    	<field name="name">mrp_procurement multi-company</field>
         <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="mrp_procurement_rule">
 		<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.procurement'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="mrp_procurement_rule_group"/>
     </record>
 
-    <record model="ir.rule.group" id="stock_warehouse_orderpoint_rule_group">
-        <field name="name">stock_warehouse.orderpoint multi-company</field>
+    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
+    	<field name="name">stock_warehouse.orderpoint multi-company</field>
         <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','stock.warehouse.orderpoint'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="stock_warehouse_orderpoint_rule_group"/>
     </record>
 
-    <record model="ir.rule.group" id="mrp_production_rule_group">
-        <field name="name">mrp_production multi-company</field>
+    <record model="ir.rule" id="mrp_production_rule">
+    	<field name="name">mrp_production multi-company</field>
         <field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="mrp_production_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.production'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="mrp_production_rule_group"/>
     </record>
 
-    <record model="ir.rule.group" id="mrp_workcenter_rule_group">
-        <field name="name">mrp_workcenter multi-company</field>
+    <record model="ir.rule" id="mrp_workcenter_rule">
+    	<field name="name">mrp_workcenter multi-company</field>
         <field name="model_id" search="[('model','=','mrp.workcenter')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="mrp_workcenter_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.workcenter'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="mrp_workcenter_rule_group"/>
     </record>
 
-    <record model="ir.rule.group" id="mrp_bom_rule_group">
-        <field name="name">mrp_bom multi-company</field>
+    <record model="ir.rule" id="mrp_bom_rule">
+    	<field name="name">mrp_bom multi-company</field>
         <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="mrp_bom_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.bom'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="mrp_bom_rule_group"/>
     </record>
 
 </data>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 05313a72d51..c81e6dd2dcc 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -80,16 +80,12 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-		<record id="ir_rule_group_posline0" model="ir.rule.group">
+
+		<record id="ir_rule_0" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
+			<field name="name">POS line</field>
 			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_posline0"/>
+			<field name="domain_force">[(point_of_sale.field_pos_order_line_company_id, 'child_of', [user.company_id.id])]</field>
 		</record>
 	</data>
 
@@ -121,42 +117,25 @@
 	</data>
 
 	<data>
-		<record id="ir_rule_group_point0" model="ir.rule.group">
+		<record id="ir_rule_0" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_pos_order"/>
-			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+			<field name="name">point</field>
 			<field eval="1" name="global"/>
+			<field name="domain_force">[(point_of_sale.field_pos_order_company_id, 'child_of', [user.company_id.id])]</field>
 		</record>
-		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_point0"/>
-		</record>
-
 
-		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
+		<record id="ir_rule_4" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
+			<field name="name">POS line</field>
 			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_4" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
+			<field name="domain_force">[(point_of_sale.field_pos_order_line_company_id, 'child_of', [user.company_id.id])]</field>
 		</record>
 
-		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+		<record id="ir_rule_5" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
-			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
+			<field name="name">POS Reporting</field>
 			<field eval="1" name="global"/>
-		</record>
-
-		<record id="ir_rule_5" model="ir.rule">
-			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
-			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+			<field name="domain_force">[(point_of_sale.field_report_transaction_pos_user_id, '=', user.id)]</field>
 		</record>
 
 	</data>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..c96e401bbc7 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -21,15 +21,15 @@
 			<field eval="1" name="perm_create"/>
 			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
 		</record>
-		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement"/>
-			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
+			<field name="name">Bank Statement Company</field>
 			<field eval="1" name="global"/>
 		</record>
 
-		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement_line"/>
-			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
+			<field name="name">Bank Statement Line Company</field>
 			<field eval="1" name="global"/>
 		</record>
 		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 4d71b0d480a..764e1277c93 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -10,13 +10,10 @@
 
     </record>
 
-     <record model="ir.rule.group" id="product_comp_rule_group">
-        <field name="name" >Product multi-company</field>
+    <record id="product_comp_rule" model="ir.rule">
+    	<field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
         <field name="global" eval="True"/>
-    </record>
-    <record id="product_comp_rule" model="ir.rule">
-        <field name="rule_group" ref="product_comp_rule_group"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 7fcb2e6fedb..447ee1af39e 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -16,34 +16,25 @@
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
     </record>
 
-    <record model="ir.rule.group" id="project_comp_rule_group">
-        <field name="name">Project multi-company</field>
+    <record model="ir.rule" id="project_comp_rule">
+    	<field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="project_comp_rule">
-        <field name="rule_group" ref="project_comp_rule_group"/>
         <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">
-        <field name="name" >Task multi-company</field>
+    <record model="ir.rule" id="task_comp_rule">
+    	<field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="task_comp_rule">
         <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>
 
-    <record model="ir.rule.group" id="task_visibility_rule_group">
-        <field name="name" >Tasks According to User and Project</field>
+    <record model="ir.rule" id="task_visibility_rule">
+    	<field name="name" >Tasks According to User and Project</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="task_visibility_rule">
         <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
-        <field name="rule_group" ref="task_visibility_rule_group"/>
     </record>
 
 </data>
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index 6d87dd1a06f..4f7c16cb70b 100755
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -2,17 +2,12 @@
 <openerp>
 <data noupdate="1">
 
-
-
-    <record model="ir.rule.group" id="project_issue_rule_group">
-        <field name="name">project.issue.rule.group</field>
+ 	<record id="project_issue_rule" model="ir.rule">
+ 		<field name="name">project.issue.rule.group</field>
         <field name="model_id" search="[('model','=','project.issue')]" model="ir.model"/>
         <field name="global" eval="True"/>
-    </record>
- 	<record id="project_issue_rule" model="ir.rule">
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
-        <field name="rule_group" ref="project_issue_rule_group"/>
-    </record>    
+    </record>
 
   </data>
 </openerp>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 2685e52d909..320b5d4609d 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -10,25 +10,17 @@
     </record>
 
 
-    <record model="ir.rule.group" id="purchase_order_comp_rule_group">
-        <field name="name">Purchase Order multi-company</field>
+    <record model="ir.rule" id="purchase_order_comp_rule">
+    	<field name="name">Purchase Order multi-company</field>
         <field name="model_id" ref="model_purchase_order"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
-        <field name="name">Purchase Order Line multi-company</field>
+    <record model="ir.rule" id="purchase_order_line_comp_rule">
+    	<field name="name">Purchase Order Line multi-company</field>
         <field name="model_id" ref="model_purchase_order_line"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index c8318ef01da..e56a2e69668 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -9,26 +9,17 @@
         <field name="name">Purchase Requisition / User</field>
     </record>
 
-
-    <record model="ir.rule.group" id="purchase_requisition_comp_rule_group">
-        <field name="name">Purchase Requisition multi-company</field>
+    <record model="ir.rule" id="purchase_requisition_comp_rule">
+    	<field name="name">Purchase Requisition multi-company</field>
         <field name="model_id" ref="model_purchase_requisition"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="purchase_requisition_comp_rule">
-        <field name="field_id" search="[('model','=','purchase.requisition'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="purchase_requisition_comp_rule_group"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="purchase_requisition_line_comp_rule_group">
-        <field name="name">Purchase requisition Line multi-company</field>
+    <record model="ir.rule" id="purchase_requisition_line_comp_rule">
+    	field name="name">Purchase requisition Line multi-company</field>
         <field name="model_id" ref="model_purchase_requisition_line"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="purchase_requisition_line_comp_rule">
-        <field name="field_id" search="[('model','=','purchase.requisition.line'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="purchase_requisition_line_comp_rule_group"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 590a849ab9a..fd8b3e0d3c7 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -13,25 +13,17 @@
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
 
-    <record model="ir.rule.group" id="sale_order_comp_rule_group">
-        <field name="name">Sale Order multi-company</field>
+    <record model="ir.rule" id="sale_order_comp_rule">
+    	<field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="sale_order_line_comp_rule_group">
-        <field name="name">Sale Order Line multi-company</field>
+    <record model="ir.rule" id="sale_order_line_comp_rule">
+    	<field name="name">Sale Order Line multi-company</field>
         <field name="model_id" ref="model_sale_order_line"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 1ea74cea1ef..3e14cac4c6c 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -19,74 +19,45 @@
 
 <!-- multi -->
 
-     <record model="ir.rule.group" id="stock_picking_rule_group">
-        <field name="name">stock_picking multi-company</field>
+     <record model="ir.rule" id="stock_picking_rule">
+     	<field name="name">stock_picking multi-company</field>
         <field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/>
         <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','=',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">
-        <field name="name">Warehouse multi-company</field>
+    <record model="ir.rule" id="stock_warehouse_comp_rule">
+    	<field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
-    </record>
-    
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="stock_location_comp_rule_group">
-        <field name="name">Location multi-company</field>
+    <record model="ir.rule" id="stock_location_comp_rule">
+    	<field name="name">Location multi-company</field>
         <field name="model_id" ref="model_stock_location"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-     <record model="ir.rule.group" id="stock_move_rule_group">
-        <field name="name">stock_move multi-company</field>
+     <record model="ir.rule" id="stock_move_rule">
+     	<field name="name">stock_move multi-company</field>
         <field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/>
         <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','=',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>
 
-    <record model="ir.rule.group" id="stock_inventory_line_comp_rule_group">
-        <field name="name">Inventory Line multi-company</field>
+    <record model="ir.rule" id="stock_inventory_line_comp_rule">
+    	<field name="name">Inventory Line multi-company</field>
         <field name="model_id" ref="model_stock_inventory_line"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="stock_inventory_comp_rule_group">
-        <field name="name">Inventory multi-company</field>
+    <record model="ir.rule" id="stock_inventory_comp_rule">
+    	<field name="name">Inventory multi-company</field>
         <field name="model_id" ref="model_stock_inventory"/>
         <field name="global" eval="True"/>
-    </record>
-    <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','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>