diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 2305e11d469..48b88ee171d 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index f904e3f8d45..12e1bb3bf30 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 00:34+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-05-03 05:57+0000\n"
+"Last-Translator: KenSai <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
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"/>
-    </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>
-        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
-        <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_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>
-        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
+    	 <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="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_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"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <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>
-        <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>
+    	<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="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"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <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_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 0e2583dfe3d..41882762d6f 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -7,27 +7,27 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-29 11:06+0000\n"
-"Last-Translator: Lorenzo Lucio Ancora <Unknown>\n"
+"PO-Revision-Date: 2010-05-03 16:30+0000\n"
+"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "Identificativo di Account4"
+msgstr ""
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Il nome dell'oggetto deve iniziare con x_ e non può contenere caratteri "
-"speciali !"
+"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+"speciali!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -43,7 +43,7 @@ msgstr "Identificativo di Account5"
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "Data fine"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -57,7 +57,7 @@ msgstr "Tasso (%)"
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr "Pianificazione analitica"
+msgstr "Piano analitico"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -67,7 +67,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "Righe della distribuzione analitica"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,print:0
@@ -82,12 +82,12 @@ msgstr "Alla data"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "Identificativo del piano"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "Modelli di distribuzione analitica"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -97,7 +97,7 @@ msgstr "Nome conto"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "Riga distribuzione analitica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
@@ -143,32 +143,32 @@ msgstr "Identificativo di Account3"
 #: field:account.analytic.plan.instance,journal_id:0
 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
 msgid "Analytic Journal"
-msgstr "Registro Analitico"
+msgstr "Libro Giornale analitico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr "Cento per cento"
+msgstr "100%"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
 msgid "Analytic Account Ref."
-msgstr ""
+msgstr "Riferimento conto analitico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr "Account analitico:"
+msgstr "Conto analitico :"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Line"
-msgstr "Linea del piano analitico"
+msgstr "Riga piano analitico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Riferimento conto analitico"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
@@ -186,7 +186,7 @@ msgstr "Valori di default"
 #: field:account.journal,plan_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
-msgstr ""
+msgstr "Piani analitici"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -261,13 +261,13 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Gestione multi-piano in contabilità analitica"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Lines"
-msgstr "Linee del piano analitico"
+msgstr "Righe del piano analitico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -277,7 +277,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr "Piano dei modelli"
+msgstr "Piano del modello"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
@@ -292,7 +292,7 @@ msgstr "Quantità"
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr "Account radice per questo piano"
+msgstr "Conto base di questo piano"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -307,7 +307,7 @@ msgstr "Quantità"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "Identificativo dell'Account"
+msgstr "Identificativo del conto"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -322,7 +322,7 @@ msgstr "OK"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr "Account radice"
+msgstr "Conto base"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
@@ -340,7 +340,7 @@ msgstr "Sequenza"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Account analitico"
+msgstr "Conto Analitico"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
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/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index b7d4262a2ca..c5c335c4f5f 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
 
+		<wizard id="wizard_populate_statement" menu="False" model="account.bank.statement" name="populate_statement" string="Populate Statement with Payment lines"/>
         <!-- View used in the wizard -->
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.inherit</field>
diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po
index 3fddc4ffbd8..5d0f82c83d6 100644
--- a/addons/account_tax_include/i18n/oc.po
+++ b/addons/account_tax_include/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 91d9c373a54..89de5e0ac50 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 1b8cb2de92b..b9424d024dd 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index c7c6c60a932..cc9231b12fa 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index abbc1ce1987..d395d60a8a2 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 16:05+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
+"PO-Revision-Date: 2010-05-03 08:04+0000\n"
+"Last-Translator: Piotr Lipski <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -27,7 +27,7 @@ msgstr ""
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid ">="
-msgstr ""
+msgstr ">="
 
 #. module: delivery
 #: view:res.partner:0
@@ -62,7 +62,7 @@ msgstr "Stany"
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
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_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 0aa743eeb55..9d0158f14b2 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-01 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
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..955bdad2fdd 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/olap_crm/i18n/de.po b/addons/olap_crm/i18n/de.po
index 41398f13f85..f304ac7ea7f 100644
--- a/addons/olap_crm/i18n/de.po
+++ b/addons/olap_crm/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
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/profile_manufacturing/i18n/pt_BR.po b/addons/profile_manufacturing/i18n/pt_BR.po
index 725964a977f..ca245a1e0dd 100644
--- a/addons/profile_manufacturing/i18n/pt_BR.po
+++ b/addons/profile_manufacturing/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
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>
-        <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>
+    	<field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
+
     <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"/>
         <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 100644
--- 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/i18n/es.po b/addons/stock/i18n/es.po
index 9c935de5c1e..3673eeebe69 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 1ea74cea1ef..4dad60a3c97 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -19,75 +19,46 @@
 
 <!-- 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>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>