diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index cc44f866169..9a2383de45b 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+<data noupdate="0">
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
@@ -30,7 +30,9 @@
         <field name="name">Check Total on supplier invoices</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
+</data>
 
+<data noupdate="1">
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field name="model_id" ref="model_account_move"/>
diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml
index 7ff68c7d849..63c6e30eb22 100644
--- a/addons/account_analytic_default/security/account_analytic_default_security.xml
+++ b/addons/account_analytic_default/security/account_analytic_default_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
     <record id="analytic_default_comp_rule" model="ir.rule">
         <field name="name">Analytic Default multi company rule</field>
diff --git a/addons/account_asset/security/account_asset_security.xml b/addons/account_asset/security/account_asset_security.xml
index d6b9840ceb0..77f218d13b9 100644
--- a/addons/account_asset/security/account_asset_security.xml
+++ b/addons/account_asset/security/account_asset_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="account_asset_category_multi_company_rule" model="ir.rule">
             <field name="name">Account Asset Category multi-company</field>
             <field ref="model_account_asset_category" name="model_id"/>
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 46a3efebb5c..05a67c00077 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
         <record id="budget_post_comp_rule" model="ir.rule">
             <field name="name">Budget post multi-company</field>
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index fd90e16fec8..1586403d701 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
     <record id="account_followup_comp_rule" model="ir.rule">
         <field name="name">Account Follow-up multi company rule</field>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 135059c79d5..4bca00eaa6d 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
     <record id="group_account_payment" model="res.groups">
         <field name="name">Accounting / Payments</field>
@@ -10,6 +10,9 @@
         <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>
     </record>
 
+</data>
+<data noupdate="1">
+
     <record id="payment_mode_comp_rule" model="ir.rule">
         <field name="name">Payment Mode company rule</field>
         <field model="ir.model" name="model_id" ref="model_payment_mode"/>
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
index df4e58484b5..04540fd8aa0 100644
--- a/addons/account_voucher/security/account_voucher_security.xml
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="voucher_comp_rule" model="ir.rule">
             <field name="name">Voucher multi-company</field>
             <field model="ir.model" name="model_id" ref="model_account_voucher"/>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index a8c43b0bbb7..70688275de2 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
+<openerp>
+<data noupdate="1">
 
     <record id="analytic_comp_rule" model="ir.rule">
         <field name="name">Analytic multi company rule</field>
@@ -14,9 +15,14 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-    
+
+</data>
+<data noupdate="0">
+
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-</data></openerp>
+
+</data>
+</openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 9bb54441aa3..2c34252209c 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -32,6 +32,18 @@
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
 
+    <record model='ir.ui.menu' id='base.menu_base_partner'>
+        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
+    </record>
+
+    <record model="ir.ui.menu" id="base.menu_base_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
+    </record>
+
+</data>
+
+<data noupdate="1">
+
     <record id="crm_rule_personal_lead" model="ir.rule">
         <field name="name">Personal Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
@@ -45,14 +57,6 @@
         <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
-    <record model='ir.ui.menu' id='base.menu_base_partner'>
-        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
-    </record>
-
-    <record model="ir.ui.menu" id="base.menu_base_config">
-        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
-    </record>
-
     <record id="crm_meeting_global" model="ir.rule">
         <field name="name">Hide Private Meetings</field>
         <field ref="model_crm_meeting" name="model_id"/>
@@ -73,5 +77,5 @@
         <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
-    </data>
+</data>
 </openerp>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index cacde50c36e..a7ec76eafac 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -11,6 +11,8 @@
 <!--    <record id="group_document_manager" model="res.groups">-->
 <!--        <field name="name">Document / Manager</field>-->
 <!--    </record>-->
+</data>
+<data noupdate="1">
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 2cc749a1a40..83039ca4686 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="0">
 
         <record model="ir.module.category" id="module_category_event_management">
             <field name="name">Events</field>
@@ -20,6 +20,10 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
+    </data>
+
+    <data noupdate="1">
+
         <!-- Multi - Company Rules -->
         <record model="ir.rule" id="event_event_comp_rule">
             <field name="name">Event multi-company</field>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index c9b86799b5c..0d11edf023a 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
+    <data noupdate="0">
         <record model="ir.module.category" id="module_fleet_category">
             <field name="name">Fleet</field>
             <field name="sequence">17</field>
@@ -15,6 +15,9 @@
             <field name="category_id" ref="module_fleet_category"/>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
+    </data>
+
+    <data noupdate="1">
         <record id="fleet_user_contract_visibility" model="ir.rule">
             <field name="name">User can only see his/her contracts</field>
             <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index d46a0f0ba19..8f3697f234a 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+<data noupdate="0">
 
     <record model="res.groups" id="base.group_user">
         <field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
@@ -19,6 +19,10 @@
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
+
+</data>
+<data noupdate="1">
+
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_hr_department"/>
@@ -31,6 +35,6 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-    
-    </data>
+
+</data>
 </openerp>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index e08af0644bc..857fc2f54ae 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
 
         <record id="base.group_hr_attendance" model="res.groups">
             <field name="name">Attendances</field>
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 232f83fd963..7c7d6f43ee3 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data noupdate="0">
+
+    <!-- make Employee users Survey users -->
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
+    </record>
+
     <record id="survey.menu_surveys" model="ir.ui.menu">
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
@@ -19,7 +25,10 @@
     <record id="survey.menu_answer_surveys" model="ir.ui.menu">
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
-    
+
+</data>
+<data noupdate="1">
+
     <record id="hr_evaluation_plan_comp_rule" model="ir.rule">
         <field name="name">Evaluation Plan multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/>
@@ -50,10 +59,5 @@
         <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
     
-    <!-- make Employee users Survey users -->
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index 9c78204016b..d7cf34fa1fd 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
 
         <record id="property_rule_timesheet_manager" model="ir.rule">
             <field name="name">Manager HR Analytic Timesheet</field>
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
index ff387a898ca..9ef8689f436 100644
--- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record model="ir.rule" id="timesheet_comp_rule">
             <field name="name">Timesheet multi-company</field>
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 525425c2aa0..e0f50e0c929 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- RULES -->
         <record id="mail_group_public_and_joined" model="ir.rule">
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index f1f26aae1f2..35aae42b53d 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -23,6 +23,8 @@
         <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
     </record>
 
+</data>
+<data noupdate="1">
 <!-- Multi -->
     <record model="ir.rule" id="mrp_production_rule">
         <field name="name">mrp_production multi-company</field>
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 6e38321cbe2..54572ee3eb9 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
     <record id="group_pos_user" model="res.groups">
         <field name="name">User</field>
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index b6b15d565c6..2362db4c355 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
         <record model="ir.rule" id="procurement_rule">
             <field name="name">procurement multi-company</field>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 73ab6f8a3d5..2e6bdac9fca 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
-
-    <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"/>
-        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-    </record>
+<data noupdate="0">
 
     <record id="group_product_variant" model="res.groups">
         <field name="name">Product Variant</field>
@@ -49,6 +42,16 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+</data>
+<data noupdate="1">
+
+    <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"/>
+        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
     <record model="ir.rule" id="product_pricelist_comp_rule">
         <field name="name">product pricelist company rule</field>
         <field name="model_id" ref="model_product_pricelist"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 99cb3e8ae6c..f1d8c7e760f 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
     <record id="group_project_user" model="res.groups">
         <field name="name">User</field>
@@ -34,6 +34,9 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+</data>
+<data noupdate="1">
+
     <record model="ir.rule" id="project_comp_rule">
         <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index f9a711c1c75..4e1cf8b6107 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
     <record id="group_purchase_user" model="res.groups">
         <field name="name">User</field>
@@ -21,6 +21,9 @@
         <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
     </record>
 
+</data>
+<data noupdate="1">
+
     <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"/>
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 12f9a9e56b8..e60665e202b 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data noupdate="0">
 
     <record model="ir.module.category" id="module_category_purchase_requisition">
         <field name="name">Purchase Requisition</field>
@@ -19,7 +19,10 @@
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
-    
+
+</data>
+<data noupdate="1">
+
     <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"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b3e6463c515..bf38d31b156 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -60,6 +60,8 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
+</data>
+<data noupdate="1">
     <!-- Multi - Company Rules -->
 
     <record model="ir.rule" id="sale_order_comp_rule">
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 29971077a2c..2c68cc69937 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
         <record model="ir.module.category" id="module_category_share">
             <field name="name">Sharing</field>
             <field name="parent_id" ref="base.module_category_tools"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f052c458632..10ae6a16d59 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -34,6 +34,8 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+</data>
+<data noupdate="1">
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">
diff --git a/addons/stock_location/security/stock_location_security.xml b/addons/stock_location/security/stock_location_security.xml
index 880f5de70da..310c45da06c 100644
--- a/addons/stock_location/security/stock_location_security.xml
+++ b/addons/stock_location/security/stock_location_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0">
+<data noupdate="1">
 
 <!-- multi -->
      <record model="ir.rule" id="product_pulled_flow_comp_rule">