diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f22dc39f7dd..b179a7eb535 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -75,6 +75,10 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+</data>
+
+<data noupdate="1">
+
     <record id="account_analytic_line_rule_billing_user" model="ir.rule">
         <field name="name">account.analytic.line.billing.user</field>
         <field name="model_id" ref="analytic.model_account_analytic_line"/>
@@ -82,10 +86,6 @@
         <field name="groups" eval="[(4, ref('account.group_account_invoice'))]"/>
     </record>
 
-</data>
-
-
-<data noupdate="1">
     <record id="base.group_public" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('account.group_show_line_subtotals_tax_excluded'))]"/>
     </record>
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 513146cd564..be8922535a0 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,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
     <record id="analytic_default_comp_rule" model="ir.rule">
         <field name="name">Analytic Default multi company rule</field>
@@ -8,6 +7,5 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
-     
-    </data>
+
 </odoo>
diff --git a/addons/crm_sms/security/sms_security.xml b/addons/crm_sms/security/sms_security.xml
index 33f490f317e..f5bf0769b15 100644
--- a/addons/crm_sms/security/sms_security.xml
+++ b/addons/crm_sms/security/sms_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="ir_rule_sms_template_sale_manager" model="ir.rule">
         <field name="name">SMS Template: sale manager CRUD on opportunity / partner templates</field>
         <field name="model_id" ref="sms.model_sms_template"/>
diff --git a/addons/delivery/security/delivery_carrier_security.xml b/addons/delivery/security/delivery_carrier_security.xml
index 84b71329eca..32566b4ced5 100644
--- a/addons/delivery/security/delivery_carrier_security.xml
+++ b/addons/delivery/security/delivery_carrier_security.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
-<odoo>
-  <data noupdate="1">
+<odoo noupdate="1">
+
     <record model="ir.rule" id="delivery_carrier_comp_rule">
       <field name="name">Delivery Carrier multi-company</field>
       <field name="model_id" ref="model_delivery_carrier"/>
       <field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
     </record>
-  </data>
-</odoo>
+
+  </odoo>
diff --git a/addons/event_sms/security/sms_security.xml b/addons/event_sms/security/sms_security.xml
index 036a91320b4..4c7bfa9d80c 100644
--- a/addons/event_sms/security/sms_security.xml
+++ b/addons/event_sms/security/sms_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="ir_rule_sms_template_event_manager" model="ir.rule">
         <field name="name">SMS Template: event manager CRUD on event / registrations templates</field>
         <field name="model_id" ref="sms.model_sms_template"/>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 0733209d3f6..574c89cce2f 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -1,5 +1,4 @@
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals or goal from the same challenge in board visibility</field>
@@ -34,5 +33,4 @@
             <field name="domain_force">[('user_id.company_id', 'in', company_ids)]</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 3b13eb977a6..947bcd66f76 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
+
         <record id="ir_rule_hr_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
             <field name="model_id" ref="model_hr_expense"/>
@@ -64,5 +64,4 @@
             <field name="domain_force">['|',('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/hr_gamification/security/gamification_security.xml b/addons/hr_gamification/security/gamification_security.xml
index f1de6b6d1e7..9c210e1d4ec 100644
--- a/addons/hr_gamification/security/gamification_security.xml
+++ b/addons/hr_gamification/security/gamification_security.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="gamification.goal_gamification_manager_visibility" model="ir.rule">
             <field name="groups" eval="[(4, ref('hr.group_hr_user'))]"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml
index f0a15d56563..9b2c42d4d5a 100644
--- a/addons/hr_holidays/security/hr_holidays_security.xml
+++ b/addons/hr_holidays/security/hr_holidays_security.xml
@@ -18,6 +18,8 @@
         <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
     </record>
 
+    <data noupdate="1">
+
     <record id="base.default_user" model="res.users">
         <field name="groups_id" eval="[(4,ref('hr_holidays.group_hr_holidays_manager'))]"/>
     </record>
@@ -191,4 +193,5 @@
         <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
     </record>
 
+    </data>
 </odoo>
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 50d5f825ca4..9979890aefa 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data noupdate="1">
+<odoo noupdate="1">
+
     <record model="ir.module.category" id="base.module_category_human_resources_recruitment">
         <field name="description">Helps you manage your recruitments.</field>
         <field name="sequence">11</field>
@@ -30,6 +30,4 @@
         <field name="groups_id" eval="[(4,ref('hr_recruitment.group_hr_recruitment_manager'))]"/>
     </record>
 
-
-  </data>
 </odoo>
diff --git a/addons/hr_skills/security/hr_skills_security.xml b/addons/hr_skills/security/hr_skills_security.xml
index 215f9502cc8..e82d0008bfc 100644
--- a/addons/hr_skills/security/hr_skills_security.xml
+++ b/addons/hr_skills/security/hr_skills_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
     <record id="hr_resume_rule_employee" model="ir.rule">
         <field name="name">Resumé: employee: read all</field>
diff --git a/addons/hr_work_entry/security/hr_work_entry_security.xml b/addons/hr_work_entry/security/hr_work_entry_security.xml
index 357f37fd2ff..aa7c46438dc 100644
--- a/addons/hr_work_entry/security/hr_work_entry_security.xml
+++ b/addons/hr_work_entry/security/hr_work_entry_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="hr_user_work_entry_employee" model="ir.rule">
             <field name="name">Work entries/Employee calendar filter: only self</field>
@@ -13,5 +12,4 @@
             <field name="perm_read" eval="0"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/iap/security/ir_rule.xml b/addons/iap/security/ir_rule.xml
index a81e1542854..3670899f16e 100644
--- a/addons/iap/security/ir_rule.xml
+++ b/addons/iap/security/ir_rule.xml
@@ -1,5 +1,5 @@
-<odoo>
-   <data>
+<odoo noupdate="1">
+
     <record id="user_iap_account" model="ir.rule">
       <field name="name">User IAP Account</field>
       <field name="model_id" ref="model_iap_account"/>
@@ -7,5 +7,5 @@
       <!-- partners can CUD services linked to themselves -->
       <field name="domain_force">['|', ('company_ids', '=', False), ('company_ids', 'in', company_ids)]</field>
     </record>
-  </data>
+
 </odoo>
\ No newline at end of file
diff --git a/addons/im_livechat/security/im_livechat_channel_security.xml b/addons/im_livechat/security/im_livechat_channel_security.xml
index be4753f9d4a..89c1910ee85 100644
--- a/addons/im_livechat/security/im_livechat_channel_security.xml
+++ b/addons/im_livechat/security/im_livechat_channel_security.xml
@@ -20,6 +20,7 @@
             <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
         </record>
 
+    <data noupdate="1">
         <record id="im_livechat_rule_manager_read_all_mail_channel" model="ir.rule">
             <field name="name">Livechat: Administrator: read all livechat channel</field>
             <field name="model_id" ref="model_mail_channel"/>
@@ -31,7 +32,7 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
-    <data noupdate="1">
+
         <record id="base.default_user" model="res.users">
             <field name="groups_id" eval="[(4,ref('im_livechat.im_livechat_group_manager'))]"/>
         </record>
diff --git a/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml b/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml
index a316014794e..9001538844f 100644
--- a/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml
+++ b/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml
@@ -1,4 +1,5 @@
-<odoo>
+<odoo noupdate="1">
+
     <record model="ir.rule" id="account_sale_closing_multi_company">
       <field name="name">Sale Closing multi-company</field>
       <field name="model_id" ref="model_account_sale_closing"/>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 8b8c17e80e6..4da736313e8 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -16,6 +16,7 @@
             <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
         </record>
 
+    <data noupdate="1">
 
         <record id="lunch_mind_your_own_food_money" model="ir.rule">
             <field name="name">lunch.cashmove: do not see other people's cashmove</field>
@@ -60,7 +61,6 @@
             <field name="groups" eval="[(4, ref('lunch.group_lunch_manager'))]"/>
         </record>
 
-    <data noupdate="1">
         <record id="base.default_user" model="res.users">
             <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/>
         </record>
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index c65ed7f641b..565af06b20a 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"?>
-<odoo>
-    <data noupdate="0">
+<odoo noupdate="1">
+
         <!-- RULES -->
         <record id="mail_channel_rule" model="ir.rule">
             <field name="name">Mail.channel: access only public and joined groups</field>
@@ -12,8 +12,7 @@
 '&amp;', ('public', '=', 'groups'), ('group_public_id', 'in', [g.id for g in user.groups_id])]</field>
             <field name="perm_create" eval="False"/>
         </record>
-    </data>
-    <data noupdate="1">
+
         <record id="ir_rule_mail_notifications_group_user" model="ir.rule">
             <field name="name">mail.notifications: group_user: write its own entries</field>
             <field name="model_id" ref="model_mail_notification"/>
@@ -57,5 +56,5 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_unlink" eval="False"/>
         </record>
-    </data>
+
 </odoo>
diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml
index 5b4912fd03c..e3f31dccde2 100644
--- a/addons/maintenance/security/maintenance.xml
+++ b/addons/maintenance/security/maintenance.xml
@@ -8,6 +8,8 @@
         <field name="comment">The user will be able to manage equipments.</field>
     </record>
 
+    <data noupdate="1">
+
     <!-- Rules -->
     <record id="equipment_request_rule_user" model="ir.rule">
         <field name="name">Users are allowed to access their own maintenance requests</field>
@@ -65,4 +67,6 @@
         <field name="groups_id" eval="[(4, ref('group_equipment_manager'))]"/>
     </record>
 
+    </data>
+
 </odoo>
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 6dac46ef040..3b657e48633 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<odoo>
+<odoo noupdate="1">
     <record id="note_note_rule_global" model="ir.rule">
         <field name="name">Only followers can access a sticky notes</field>
         <field name="model_id" ref="model_note_note"/>
diff --git a/addons/payment/security/payment_security.xml b/addons/payment/security/payment_security.xml
index df797070aed..7a0ec3f975c 100644
--- a/addons/payment/security/payment_security.xml
+++ b/addons/payment/security/payment_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="payment_transaction_user_rule" model="ir.rule">
             <field name="name">Access own payment transaction only</field>
@@ -19,5 +18,4 @@
             <field name="groups" eval="[(4, ref('base.group_user')), (4, ref('base.group_portal')), (4, ref('base.group_public'))]"/>
         </record>
 
-    </data>
 </odoo>
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 095c61fa999..57fa5950b7d 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -16,6 +16,7 @@
         <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
     </record>
 
+    <data noupdate="1">
 
     <record id="rule_pos_bank_statement_user" model="ir.rule">
         <field name="name">Point Of Sale Bank Statement POS User</field>
@@ -78,7 +79,6 @@
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
 
-    <data noupdate="1">
         <record id="base.default_user" model="res.users">
             <field name="groups_id" eval="[(4,ref('point_of_sale.group_pos_manager'))]"/>
         </record>
diff --git a/addons/pos_sale/security/pos_sale_security.xml b/addons/pos_sale/security/pos_sale_security.xml
index 265cb695d59..b857378a0e9 100644
--- a/addons/pos_sale/security/pos_sale_security.xml
+++ b/addons/pos_sale/security/pos_sale_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="pos_sale_rule_pos_channel_pos_manager" model="ir.rule">
         <field name="name">POS Sales Team</field>
         <field name="model_id" ref="sales_team.model_crm_team"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 883c11e3c82..1cf3c4753ee 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"?>
 <odoo>
-<data noupdate="0">
+<data>
 
     <record model="ir.module.category" id="base.module_category_inventory_purchase">
         <field name="description">Helps you manage your purchase-related processes such as requests for quotations, supplier bills, etc...</field>
diff --git a/addons/purchase_requisition/security/purchase_requisition_security.xml b/addons/purchase_requisition/security/purchase_requisition_security.xml
index d18f4792121..1fc52187ff9 100644
--- a/addons/purchase_requisition/security/purchase_requisition_security.xml
+++ b/addons/purchase_requisition/security/purchase_requisition_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data noupdate="1">
+<odoo noupdate="1">
 
     <record model="ir.rule" id="purchase_requisition_comp_rule">
         <field name="name">Purchase Requisition multi-company</field>
@@ -14,5 +13,4 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
-</data>
 </odoo>
diff --git a/addons/repair/security/repair_security.xml b/addons/repair/security/repair_security.xml
index 4f17fb2210c..d00a7d04c8f 100644
--- a/addons/repair/security/repair_security.xml
+++ b/addons/repair/security/repair_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
     <!-- Multicompay rules-->
     <record model="ir.rule" id="repair_order_rule">
@@ -19,5 +18,4 @@
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
 
-    </data>
 </odoo>
diff --git a/addons/resource/security/resource_security.xml b/addons/resource/security/resource_security.xml
index f2f4937ddc7..c0ccaac3c73 100644
--- a/addons/resource/security/resource_security.xml
+++ b/addons/resource/security/resource_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data noupdate="1">
+<odoo noupdate="1">
 
     <record model="ir.rule" id="resource_calendar_leaves_rule_group_user_create">
         <field name="name">resource.calendar.leaves: employee reads own or global</field>
@@ -27,5 +26,5 @@
         <field name="domain_force">[('resource_id', '=', False)]</field>
         <field name="perm_read" eval="False"/>
     </record>
-</data>
+
 </odoo>
diff --git a/addons/sale_coupon/security/sale_coupon_security.xml b/addons/sale_coupon/security/sale_coupon_security.xml
index e099e76273b..0f4de81de29 100644
--- a/addons/sale_coupon/security/sale_coupon_security.xml
+++ b/addons/sale_coupon/security/sale_coupon_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data noupdate="1">
+<odoo noupdate="1">
 
     <record id="sale_coupon_apply_code_rule" model="ir.rule">
         <field name="name">Sale Coupon Apply Code Rule</field>
@@ -13,5 +12,4 @@
         <field name="domain_force">[('create_uid', '=', user.id)]</field>
     </record>
 
-</data>
 </odoo>
diff --git a/addons/sale_expense/security/sale_expense_security.xml b/addons/sale_expense/security/sale_expense_security.xml
index c8087457e9d..48edc9cf1db 100644
--- a/addons/sale_expense/security/sale_expense_security.xml
+++ b/addons/sale_expense/security/sale_expense_security.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<data noupdate="1">
+<odoo noupdate="1">
 
     <!-- Required simply to set SO on expense before submitting. Used to avoid crash on name_get/name_search -->
     <record id="sale_order_rule_expense_user" model="ir.rule">
@@ -16,5 +14,4 @@
         <field name="active" eval="False"/> <!-- opw-2027005: this rules breaks sale "see own document" -->
     </record>
 
-</data>
 </odoo>
diff --git a/addons/sale_management/security/sale_management_security.xml b/addons/sale_management/security/sale_management_security.xml
index 2ec489b6650..3786f1ea20e 100644
--- a/addons/sale_management/security/sale_management_security.xml
+++ b/addons/sale_management/security/sale_management_security.xml
@@ -6,11 +6,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="sale_order_template_rule_company" model="ir.rule">
-        <field name="name">Quotation Template multi-company</field>
-        <field name="model_id" ref="model_sale_order_template"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
-    </record>
-
+    <data noupdate="1">
+        <record id="sale_order_template_rule_company" model="ir.rule">
+            <field name="name">Quotation Template multi-company</field>
+            <field name="model_id" ref="model_sale_order_template"/>
+            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+        </record>
+    </data>
 </odoo>
diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml
index 7b656de8511..e1860aa85fe 100644
--- a/addons/sale_stock/security/sale_stock_security.xml
+++ b/addons/sale_stock/security/sale_stock_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="0">
         <record id="group_display_incoterm" model="res.groups">
             <field name="name">Display incoterms on Sales Order and related invoices</field>
             <field name="category_id" ref="base.module_category_hidden"/>
@@ -11,6 +10,8 @@
             <field name="category_id" ref="base.module_category_hidden"/>
         </record>
 
+    <data noupdate="1">
+
         <!-- Stock Portal Access Rules -->
         <record id="stock_picking_rule_portal" model="ir.rule">
             <field name="name">Portal Follower Transfers</field>
diff --git a/addons/sale_timesheet/security/sale_timesheet_security.xml b/addons/sale_timesheet/security/sale_timesheet_security.xml
index f4d33495b02..6da589d7593 100644
--- a/addons/sale_timesheet/security/sale_timesheet_security.xml
+++ b/addons/sale_timesheet/security/sale_timesheet_security.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<odoo>
+<odoo noupdate="1">
 
-    <data noupdate="1">
 
         <!-- Override this rule because in hr_timesheet,
             the lowest access right can only see own timesheets (model: account.analytic.line)
@@ -12,5 +11,5 @@
         <record id="account.account_analytic_line_rule_billing_user" model="ir.rule">
             <field name="domain_force">[('project_id', '=', False)]</field>
         </record>
-    </data>
+
 </odoo>
diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml
index 6d95bb22adc..a293b29be66 100644
--- a/addons/sales_team/security/sales_team_security.xml
+++ b/addons/sales_team/security/sales_team_security.xml
@@ -27,6 +27,12 @@
             <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
         </record>
 
+        <record model="ir.ui.menu" id="sales_team.menu_sale_config">
+            <field name="name">Configuration</field>
+            <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
+        </record>
+
+    <data noupdate="1">
         <record id="crm_rule_all_salesteam" model="ir.rule">
             <field name="name">All Salesteam</field>
             <field ref="sales_team.model_crm_team" name="model_id"/>
@@ -40,12 +46,6 @@
             <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
         </record>
 
-        <record model="ir.ui.menu" id="sales_team.menu_sale_config">
-            <field name="name">Configuration</field>
-            <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
-        </record>
-
-    <data noupdate="1">
         <record id="base.default_user" model="res.users">
             <field name="groups_id" eval="[(4,ref('sales_team.group_sale_manager'))]"/>
         </record>
diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml
index 91346b2f909..1e47996bedc 100644
--- a/addons/stock_account/security/stock_account_security.xml
+++ b/addons/stock_account/security/stock_account_security.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
+
     <record model="ir.rule" id="stock_valuation_layer_company_rule">
         <field name="name">Stock Valuation Layer Multicompany</field>
         <field name="model_id" search="[('model','=','stock.valuation.layer')]" model="ir.model"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
+
 </odoo>
 
diff --git a/addons/stock_landed_costs/security/stock_landed_cost_security.xml b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
index c74c9db151b..fd3f1b525e9 100644
--- a/addons/stock_landed_costs/security/stock_landed_cost_security.xml
+++ b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
     <record model="ir.rule" id="stock_landed_cost_rule">
         <field name="name">stock_landed_cost multi-company</field>
diff --git a/addons/stock_sms/security/sms_security.xml b/addons/stock_sms/security/sms_security.xml
index c7394770c13..d6a79e98b7d 100644
--- a/addons/stock_sms/security/sms_security.xml
+++ b/addons/stock_sms/security/sms_security.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
+
     <record id="ir_rule_sms_template_stock_manager" model="ir.rule">
         <field name="name">SMS Template: stock manager CRUD on stock picking templates</field>
         <field name="model_id" ref="sms.model_sms_template"/>
         <field name="groups" eval="[(4, ref('stock.group_stock_manager'))]"/>
         <field name="domain_force">[('model_id.model', '=', 'stock.picking')]</field>
     </record>
+
 </odoo>
diff --git a/addons/test_mail/security/test_mail_security.xml b/addons/test_mail/security/test_mail_security.xml
index 762df7cf167..296cbdc02da 100644
--- a/addons/test_mail/security/test_mail_security.xml
+++ b/addons/test_mail/security/test_mail_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="mail_test_multi_company_rule" model="ir.rule">
             <field name="name">Mail Test Multi Company</field>
@@ -9,5 +8,4 @@
             <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/timer/security/timer_security.xml b/addons/timer/security/timer_security.xml
index 662a2aac0d7..8bad09e2641 100644
--- a/addons/timer/security/timer_security.xml
+++ b/addons/timer/security/timer_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data noupdate="0">
+<odoo noupdate="1">
 
         <record id="timer_user_rule_create-write-delete" model="ir.rule">
             <field name="name">timer.user.rule.create-write-delete</field>
@@ -28,5 +27,4 @@
             <field name="perm_read" eval="1"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/website/security/website_security.xml b/addons/website/security/website_security.xml
index ab822aeca80..e4113fbc717 100644
--- a/addons/website/security/website_security.xml
+++ b/addons/website/security/website_security.xml
@@ -27,6 +27,8 @@
         <field name="implied_ids" eval="[(4, ref('website.group_website_designer'))]"/>
     </record>
 
+    <data noupdate="1">
+
     <record id="website_menu" model="ir.rule">
         <field name="name">Website menu: group_ids</field>
         <field name="model_id" ref="model_website_menu"/>
@@ -90,4 +92,6 @@
         <field name="perm_unlink" eval="False"/>
         <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
     </record>
+
+    </data>
 </odoo>
diff --git a/addons/website_blog/security/website_blog_security.xml b/addons/website_blog/security/website_blog_security.xml
index ca1ae295701..79cfbbe6074 100644
--- a/addons/website_blog/security/website_blog_security.xml
+++ b/addons/website_blog/security/website_blog_security.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
+
     <record model="ir.rule" id="website_blog_post_public">
         <field name="name">Blog Post: public: published only</field>
         <field name="model_id" ref="model_blog_post"/>
         <field name="domain_force">[('website_published', '=', True)]</field>
         <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
     </record>
+
 </odoo>
diff --git a/addons/website_crm_partner_assign/security/ir_rule.xml b/addons/website_crm_partner_assign/security/ir_rule.xml
index 2081edd4419..881e7b27a5b 100644
--- a/addons/website_crm_partner_assign/security/ir_rule.xml
+++ b/addons/website_crm_partner_assign/security/ir_rule.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
+
         <!-- CRM Lead portal -->
         <record id="assigned_lead_portal_rule_1" model="ir.rule">
             <field name="name">Portal Graded Partner: read and write assigned leads</field>
diff --git a/addons/website_customer/security/ir_rule.xml b/addons/website_customer/security/ir_rule.xml
index b901763eb96..5bfd1859b5e 100644
--- a/addons/website_customer/security/ir_rule.xml
+++ b/addons/website_customer/security/ir_rule.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
         <record model="ir.rule" id="website_customer_res_partner_tag_public">
             <field name="name">Partner Tag: published only</field>
diff --git a/addons/website_event/security/event_security.xml b/addons/website_event/security/event_security.xml
index 0b86e8cf8cc..d34a1f76a48 100644
--- a/addons/website_event/security/event_security.xml
+++ b/addons/website_event/security/event_security.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <data noupdate="1">
     <record id="event_event_public" model="ir.rule">
         <field name="name">event: Public</field>
         <field name="model_id" ref="event.model_event_event"/>
@@ -21,6 +22,7 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
+    </data>
 
     <record id="event.group_event_manager" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/>
diff --git a/addons/website_event_sale/security/website_event_sale_security.xml b/addons/website_event_sale/security/website_event_sale_security.xml
index a3b77d8ad05..67336bf79aa 100644
--- a/addons/website_event_sale/security/website_event_sale_security.xml
+++ b/addons/website_event_sale/security/website_event_sale_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="event_product_template_public" model="ir.rule">
         <field name="name">Product template linked to event: Public</field>
         <field name="model_id" ref="product.model_product_template"/>
diff --git a/addons/website_event_track/security/event_track_security.xml b/addons/website_event_track/security/event_track_security.xml
index 850607bf2df..7ccae1c6f4c 100644
--- a/addons/website_event_track/security/event_track_security.xml
+++ b/addons/website_event_track/security/event_track_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="event_track_public" model="ir.rule">
             <field name="name">event tracks: Public</field>
@@ -13,5 +12,4 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/website_forum/security/website_forum_security.xml b/addons/website_forum/security/website_forum_security.xml
index 6908c0fb102..1293ae07cc1 100644
--- a/addons/website_forum/security/website_forum_security.xml
+++ b/addons/website_forum/security/website_forum_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="website_forum_public" model="ir.rule">
         <field name="name">Website forum: Public user can only access to public forum</field>
         <field name="model_id" ref="model_forum_forum"/>
diff --git a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
index 43ecfc36521..b96e7902c5e 100644
--- a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
+++ b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
+    <data noupdate="1">
     <record id="hr_job_public" model="ir.rule">
         <field name="name">Job Positions: Public</field>
         <field name="model_id" ref="hr.model_hr_job"/>
@@ -41,9 +41,10 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
+    </data>
+
 
     <record id="hr_recruitment.group_hr_recruitment_manager" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/>
     </record>
-</data>
 </odoo>
diff --git a/addons/website_livechat/security/website_livechat.xml b/addons/website_livechat/security/website_livechat.xml
index 9525b4d9e1a..e66ae0e8e05 100644
--- a/addons/website_livechat/security/website_livechat.xml
+++ b/addons/website_livechat/security/website_livechat.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
+<odoo noupdate="1">
 
         <record id="im_livechat_channel_rule_public" model="ir.rule">
             <field name="name">website_livechat.channel.public</field>
@@ -13,5 +12,4 @@
             <field name="perm_unlink" eval="0"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/website_membership/security/website_membership.xml b/addons/website_membership/security/website_membership.xml
index bdfeb1c42df..ca722e617e6 100644
--- a/addons/website_membership/security/website_membership.xml
+++ b/addons/website_membership/security/website_membership.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
+
     <record id="membership_product_product_public" model="ir.rule">
         <field name="name">Product membership: Public</field>
         <field name="model_id" ref="product.model_product_template"/>
@@ -20,4 +21,5 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
+
 </odoo>
diff --git a/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml b/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml
index d7f009041f4..6824c5ed63b 100644
--- a/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml
+++ b/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="product_wishlist_rule" model="ir.rule">
             <field name="name">See own Wishlist</field>
@@ -16,5 +15,4 @@
             <field name="groups" eval="[(4, ref('sales_team.group_sale_manager'))]"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/website_slides/security/website_slides_security.xml b/addons/website_slides/security/website_slides_security.xml
index ab14e8e2642..ab800865dd0 100644
--- a/addons/website_slides/security/website_slides_security.xml
+++ b/addons/website_slides/security/website_slides_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="0">
         <record model="ir.module.category" id="base.module_category_website_elearning">
             <field name="sequence">21</field>
         </record>
@@ -25,6 +24,7 @@
             <field name="implied_ids" eval="[(4, ref('group_website_slides_manager'))]"/>
         </record>
 
+        <data noupdate="1">
         <!-- CHANNEL -->
         <record id="rule_slide_channel_global" model="ir.rule">
             <field name="name">Channel: always visible (sub rules exist)</field>
diff --git a/addons/website_slides_forum/security/website_slides_forum_security.xml b/addons/website_slides_forum/security/website_slides_forum_security.xml
index 3ca12ec8b36..487d1bb6cea 100644
--- a/addons/website_slides_forum/security/website_slides_forum_security.xml
+++ b/addons/website_slides_forum/security/website_slides_forum_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
     <record id="website_slides_forum_public" model="ir.rule">
         <field name="name">Website forum: User can only access to forum related to followed courses</field>
         <field name="model_id" ref="website_forum.model_forum_forum"/>
diff --git a/odoo/addons/test_access_rights/security.xml b/odoo/addons/test_access_rights/security.xml
index d71e815cf95..e36812ed56b 100644
--- a/odoo/addons/test_access_rights/security.xml
+++ b/odoo/addons/test_access_rights/security.xml
@@ -1,4 +1,4 @@
-<odoo>
+<odoo noupdate="1">
     <record id="test_access_right_fake_ticket" model="ir.rule">
             <field name="name">Fake Ticket: portal or following</field>
             <field name="model_id" ref="model_test_access_right_ticket"/>