From 74f8854b5f0f2230013b86e75ff07583e43b3027 Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:48:28 +0100
Subject: [PATCH] [OU-FIX] *: update multi-company ir_rules

---
 docsource/modules130-140.rst                  |  6 +--
 .../account/14.0.1.1/noupdate_changes.xml     | 16 +++++++
 .../analytic/14.0.1.1/noupdate_changes.xml    | 15 +++++++
 .../analytic/14.0.1.1/post-migration.py       |  6 +++
 .../base/14.0.1.3/noupdate_changes.xml        |  7 +++
 .../scripts/crm/14.0.1.2/noupdate_changes.xml | 10 +++--
 .../delivery/14.0.1.0/noupdate_changes.xml    |  7 +--
 .../event/14.0.1.3/noupdate_changes.xml       |  4 +-
 .../fleet/14.0.0.1/noupdate_changes.xml       | 16 +++++--
 .../scripts/hr/14.0.1.1/noupdate_changes.xml  | 23 +++++-----
 .../hr_contract/14.0.1.0/noupdate_changes.xml |  7 +--
 .../hr_expense/14.0.2.0/noupdate_changes.xml  |  9 ++++
 .../hr_expense/14.0.2.0/post-migration.py     |  1 +
 .../hr_holidays/14.0.1.5/noupdate_changes.xml | 17 ++++---
 .../14.0.1.0/noupdate_changes.xml             |  3 ++
 .../lunch/14.0.1.0/noupdate_changes.xml       |  5 ++-
 .../maintenance/14.0.1.0/noupdate_changes.xml | 23 +++++-----
 .../scripts/mrp/14.0.2.0/noupdate_changes.xml | 27 +++++++-----
 .../14.0.1.0.1/noupdate_changes.xml           |  7 +--
 .../product/14.0.1.2/noupdate_changes.xml     | 15 ++++---
 .../purchase/14.0.1.2/noupdate_changes.xml    | 16 ++++---
 .../14.0.0.1/noupdate_changes.xml             |  2 +
 .../14.0.0.1/post-migration.py                |  8 ++++
 .../sale/14.0.1.1/noupdate_changes.xml        | 14 +++---
 .../14.0.1.0/noupdate_changes.xml             |  7 +--
 .../sales_team/14.0.1.0/noupdate_changes.xml  |  6 +++
 .../sales_team/14.0.1.0/post-migration.py     |  6 +++
 .../stock/14.0.1.1/noupdate_changes.xml       | 44 +++++++++++--------
 .../14.0.1.1/noupdate_changes.xml             |  1 +
 29 files changed, 231 insertions(+), 97 deletions(-)
 create mode 100644 openupgrade_scripts/scripts/analytic/14.0.1.1/noupdate_changes.xml
 create mode 100644 openupgrade_scripts/scripts/analytic/14.0.1.1/post-migration.py
 create mode 100644 openupgrade_scripts/scripts/hr_expense/14.0.2.0/noupdate_changes.xml
 create mode 100644 openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/post-migration.py
 create mode 100644 openupgrade_scripts/scripts/sales_team/14.0.1.0/noupdate_changes.xml
 create mode 100644 openupgrade_scripts/scripts/sales_team/14.0.1.0/post-migration.py

diff --git a/docsource/modules130-140.rst b/docsource/modules130-140.rst
index 6fb2300040fe..9b835a04a41c 100644
--- a/docsource/modules130-140.rst
+++ b/docsource/modules130-140.rst
@@ -48,7 +48,7 @@ Module coverage 13.0 -> 14.0
 +--------------------------------------------+-------------------------------------------------+
 | |new| adyen_platforms                      |                                                 |
 +--------------------------------------------+-------------------------------------------------+
-|analytic                                    | Nothing to do                                   |
+|analytic                                    | Done                                            |
 +--------------------------------------------+-------------------------------------------------+
 |association                                 | Nothing to do                                   |
 +--------------------------------------------+-------------------------------------------------+
@@ -164,7 +164,7 @@ Module coverage 13.0 -> 14.0
 +--------------------------------------------+-------------------------------------------------+
 |hr_contract                                 | Done                                            |
 +--------------------------------------------+-------------------------------------------------+
-|hr_expense                                  | Nothing to do                                   |
+|hr_expense                                  | Done                                            |
 +--------------------------------------------+-------------------------------------------------+
 | |del| hr_expense_check                     | Done. Merged into hr_expense                    |
 +--------------------------------------------+-------------------------------------------------+
@@ -582,7 +582,7 @@ Module coverage 13.0 -> 14.0
 +--------------------------------------------+-------------------------------------------------+
 |purchase_product_matrix                     |                                                 |
 +--------------------------------------------+-------------------------------------------------+
-|purchase_requisition                        | Nothing to do                                   |
+|purchase_requisition                        | Done                                            |
 +--------------------------------------------+-------------------------------------------------+
 |purchase_requisition_stock                  | Nothing to do                                   |
 +--------------------------------------------+-------------------------------------------------+
diff --git a/openupgrade_scripts/scripts/account/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/account/14.0.1.1/noupdate_changes.xml
index b5a9e7a9593d..8c564fc66c4b 100644
--- a/openupgrade_scripts/scripts/account/14.0.1.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/account/14.0.1.1/noupdate_changes.xml
@@ -8,15 +8,19 @@
   </record>
   <record id="account_bank_statement_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="account_bank_statement_line_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="account_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="account_fiscal_position_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="account_invoice_line_rule_portal" model="ir.rule">
     <field name="domain_force">[('parent_state', 'not in', ('cancel', 'draft')), ('move_id.move_type', 'in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund')), ('move_id.message_partner_ids','child_of',[user.commercial_partner_id.id])]</field>
@@ -26,18 +30,26 @@
   </record>
   <record id="account_move_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="account_move_line_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="account_payment_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+  </record>
+  <record id="account_payment_term_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="account_reconcile_model_template_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="account_root_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="email_template_edi_invoice" model="mail.template">
     <field name="body_html" type="html">
@@ -82,12 +94,15 @@
   </record>
   <record id="invoice_analysis_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="journal_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="journal_group_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="mail_template_data_payment_receipt" model="mail.template">
     <field name="body_html" type="xml">
@@ -111,5 +126,6 @@
   </record>
   <record id="tax_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/analytic/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/analytic/14.0.1.1/noupdate_changes.xml
new file mode 100644
index 000000000000..554ba33ebf2f
--- /dev/null
+++ b/openupgrade_scripts/scripts/analytic/14.0.1.1/noupdate_changes.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+  <record id="analytic_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="analytic_group_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="analytic_line_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+  </record>
+  <record id="analytic_tag_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+</odoo>
diff --git a/openupgrade_scripts/scripts/analytic/14.0.1.1/post-migration.py b/openupgrade_scripts/scripts/analytic/14.0.1.1/post-migration.py
new file mode 100644
index 000000000000..e39aab21b2b9
--- /dev/null
+++ b/openupgrade_scripts/scripts/analytic/14.0.1.1/post-migration.py
@@ -0,0 +1,6 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(env.cr, "analytic", "14.0.1.1/noupdate_changes.xml")
diff --git a/openupgrade_scripts/scripts/base/14.0.1.3/noupdate_changes.xml b/openupgrade_scripts/scripts/base/14.0.1.3/noupdate_changes.xml
index cc534268f748..48ad83b11a68 100644
--- a/openupgrade_scripts/scripts/base/14.0.1.3/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/base/14.0.1.3/noupdate_changes.xml
@@ -66,9 +66,16 @@
   <record id="paperformat_us" model="report.paperformat">
     <field name="margin_bottom">30</field>
   </record>
+  <record id="res_currency_rate_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
   <record id="res_partner_bank_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     <field name="global"/>
   </record>
+  <record id="res_partner_rule" model="ir.rule">
+    <field name="domain_force">['|', ('partner_share', '=', False), ('company_id', 'in', company_ids + [False])]</field>
+  </record>
   <record id="res_partner_rule_private_employee" model="ir.rule">
     <field name="perm_create" eval="True"/>
     <field name="perm_unlink" eval="True"/>
diff --git a/openupgrade_scripts/scripts/crm/14.0.1.2/noupdate_changes.xml b/openupgrade_scripts/scripts/crm/14.0.1.2/noupdate_changes.xml
index 614d8d92e2fb..3c584df66202 100644
--- a/openupgrade_scripts/scripts/crm/14.0.1.2/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/crm/14.0.1.2/noupdate_changes.xml
@@ -1,8 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
-  <!-- <record id="crm_activity_report_rule_multi_company" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="crm_activity_report_rule_multi_company" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
+  <record id="crm_lead_company_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
   <record id="frequency_field_country_id" model="crm.lead.scoring.frequency.field">
     <field name="field_id" ref="crm.field_crm_lead__country_id"/>
   </record>
diff --git a/openupgrade_scripts/scripts/delivery/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/delivery/14.0.1.0/noupdate_changes.xml
index 1116002a739c..119557c99a00 100644
--- a/openupgrade_scripts/scripts/delivery/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/delivery/14.0.1.0/noupdate_changes.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
-  <!-- <record id="delivery_carrier_comp_rule" model="ir.rule">
-   <field name="global"/>
-  </record> -->
+  <record id="delivery_carrier_comp_rule" model="ir.rule">
+    <field name="domain_force"> [('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="product_product_delivery" model="product.product">
     <field name="invoice_policy">order</field>
   </record>
diff --git a/openupgrade_scripts/scripts/event/14.0.1.3/noupdate_changes.xml b/openupgrade_scripts/scripts/event/14.0.1.3/noupdate_changes.xml
index 34e088567d7e..8c446c8594c7 100644
--- a/openupgrade_scripts/scripts/event/14.0.1.3/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/event/14.0.1.3/noupdate_changes.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
   <record id="event_event_company_rule" model="ir.rule">
-    <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="event_registration_company_rule" model="ir.rule">
-    <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="event_registration_mail_template_badge" model="mail.template">
     <field name="body_html" type="html">
diff --git a/openupgrade_scripts/scripts/fleet/14.0.0.1/noupdate_changes.xml b/openupgrade_scripts/scripts/fleet/14.0.0.1/noupdate_changes.xml
index f2ab7f421838..22b05321ff96 100644
--- a/openupgrade_scripts/scripts/fleet/14.0.0.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/fleet/14.0.0.1/noupdate_changes.xml
@@ -9,7 +9,17 @@
   <record id="fleet_vehicle_state_new_request" model="fleet.vehicle.state">
     <field name="sequence">4</field>
   </record>
-  <!-- <record id="ir_rule_fleet_vehicle" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="ir_rule_fleet_log_contract" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="ir_rule_fleet_log_services" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="ir_rule_fleet_odometer" model="ir.rule">
+    <field name="domain_force">[('vehicle_id.company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="ir_rule_fleet_vehicle" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml
index b48bc425aa05..4aaa3aee27c2 100644
--- a/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml
@@ -3,17 +3,20 @@
   <record id="employee_admin" model="hr.employee">
     <field name="address_home_id" ref="res_partner_admin_private_address"/>
   </record>
-<!--  <record id="hr_dept_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
-<!--  <record id="hr_employee_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="hr_dept_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
+  <record id="hr_employee_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="hr_employee_public_comp_rule" model="ir.rule">
-    <field name="domain_force">['|',('company_id', '=',False),('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="hr_job_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     <!-- <field name="global"/> -->
   </record>
-<!--  <record id="hr_job_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
 </odoo>
diff --git a/openupgrade_scripts/scripts/hr_contract/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/hr_contract/14.0.1.0/noupdate_changes.xml
index 7997c79bccba..6d36525c39c3 100644
--- a/openupgrade_scripts/scripts/hr_contract/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/hr_contract/14.0.1.0/noupdate_changes.xml
@@ -3,9 +3,10 @@
   <record id="ir_cron_data_contract_update_state" model="ir.cron">
     <field name="code">model.with_context(from_cron=True).update_state()</field>
   </record>
-  <!--<record id="ir_rule_hr_contract_multi_company" model="ir.rule">
-     <field name="global"/>
-  </record>-->
+  <record id="ir_rule_hr_contract_multi_company" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="mt_department_contract_pending" model="mail.message.subtype">
     <field name="parent_id" ref="mt_contract_pending"/>
   </record>
diff --git a/openupgrade_scripts/scripts/hr_expense/14.0.2.0/noupdate_changes.xml b/openupgrade_scripts/scripts/hr_expense/14.0.2.0/noupdate_changes.xml
new file mode 100644
index 000000000000..7b4f670abaa0
--- /dev/null
+++ b/openupgrade_scripts/scripts/hr_expense/14.0.2.0/noupdate_changes.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+  <record id="hr_expense_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+  </record>
+  <record id="hr_expense_report_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+  </record>
+</odoo>
diff --git a/openupgrade_scripts/scripts/hr_expense/14.0.2.0/post-migration.py b/openupgrade_scripts/scripts/hr_expense/14.0.2.0/post-migration.py
index a74d1024670b..3dcffb91cd43 100644
--- a/openupgrade_scripts/scripts/hr_expense/14.0.2.0/post-migration.py
+++ b/openupgrade_scripts/scripts/hr_expense/14.0.2.0/post-migration.py
@@ -12,3 +12,4 @@ def migrate(env, version):
         except Exception:
             # this means default_code is required
             product.default_code = "EXP_GEN/1"
+    openupgrade.load_data(env.cr, "hr_expense", "14.0.2.0/noupdate_changes.xml")
diff --git a/openupgrade_scripts/scripts/hr_holidays/14.0.1.5/noupdate_changes.xml b/openupgrade_scripts/scripts/hr_holidays/14.0.1.5/noupdate_changes.xml
index 75fd9bd4246e..ffb4f03ae8cc 100644
--- a/openupgrade_scripts/scripts/hr_holidays/14.0.1.5/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/hr_holidays/14.0.1.5/noupdate_changes.xml
@@ -19,9 +19,10 @@
     <field name="allocation_validation_type">both</field>
     <field name="leave_validation_type">both</field>
   </record> -->
-  <!-- <record id="hr_holidays_status_rule_multi_company" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="hr_holidays_status_rule_multi_company" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="hr_leave_allocation_rule_employee" model="ir.rule">
     <field name="domain_force">[
             '|',
@@ -44,6 +45,9 @@
     <field name="name">Allocations: base.group_user create/write</field>
     <field name="perm_unlink" eval="False"/>
   </record>
+  <record id="hr_leave_allocation_rule_multicompany" model="ir.rule">
+    <field name="domain_force">[('holiday_status_id.company_id', 'in', company_ids + [False])]</field>
+  </record>
   <record id="hr_leave_allocation_rule_officer_update" model="ir.rule">
     <field name="domain_force">[
             ('holiday_type', '=', 'employee'),
@@ -57,9 +61,10 @@
         ]</field>
     <field name="name">Allocations: holiday user : create/write</field>
   </record>
-  <!--<record id="hr_leave_rule_multicompany" model="ir.rule">
-     <field name="global"/>
-  </record>-->
+  <record id="hr_leave_rule_multicompany" model="ir.rule">
+    <field name="domain_force">[('holiday_status_id.company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="hr_leave_rule_user_read" model="ir.rule">
     <field name="perm_create" eval="True"/>
     <field name="perm_unlink" eval="True"/>
diff --git a/openupgrade_scripts/scripts/hr_recruitment/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/hr_recruitment/14.0.1.0/noupdate_changes.xml
index a61db1d37278..0822225424ff 100644
--- a/openupgrade_scripts/scripts/hr_recruitment/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/hr_recruitment/14.0.1.0/noupdate_changes.xml
@@ -149,6 +149,9 @@
       </table>
     </field>
   </record>
+  <record id="hr_applicant_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
   <record id="mt_department_new" model="mail.message.subtype">
     <field name="parent_id" ref="mt_job_new"/>
   </record>
diff --git a/openupgrade_scripts/scripts/lunch/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/lunch/14.0.1.0/noupdate_changes.xml
index 1ff8ed024b94..7e5df5934465 100644
--- a/openupgrade_scripts/scripts/lunch/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/lunch/14.0.1.0/noupdate_changes.xml
@@ -2,15 +2,18 @@
 <odoo>
   <record id="ir_rule_lunch_location_multi_company" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="ir_rule_lunch_product_multi_company" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="ir_rule_lunch_product_report_multi_company" model="ir.rule">
-    <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids), '|', ('category_id.company_id', '=', False), ('category_id.company_id', 'in', company_ids)]</field>
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False]), ('category_id.company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="ir_rule_lunch_supplier_multi_company" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/maintenance/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/maintenance/14.0.1.0/noupdate_changes.xml
index db095ac92657..f7429cdd41d2 100644
--- a/openupgrade_scripts/scripts/maintenance/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/maintenance/14.0.1.0/noupdate_changes.xml
@@ -1,25 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
-  <!-- No real changes, so no need to write the records -->
-  <!-- <record id="maintenance_equipment_category_comp_rule" model="ir.rule">
-    <field name="global"/>
+  <record id="equipment_request_rule_user" model="ir.rule">
+    <field name="domain_force">['|', '|', ('owner_user_id', '=', user.id), ('message_partner_ids', 'in', [user.partner_id.id]), ('user_id.id', '=', user.id)]</field>
+  </record>
+  <record id="maintenance_equipment_category_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="maintenance_equipment_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="maintenance_request_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="maintenance_team_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="mt_cat_mat_assign" model="mail.message.subtype">
     <field name="parent_id" ref="mt_mat_assign"/>
   </record>
   <record id="mt_cat_req_created" model="mail.message.subtype">
     <field name="parent_id" ref="mt_req_created"/>
   </record>
-  <record id="equipment_request_rule_user" model="ir.rule">
-    <field name="domain_force">['|', '|', ('owner_user_id', '=', user.id), ('message_partner_ids', 'in', [user.partner_id.id]), ('user_id.id', '=', user.id)]</field>
-  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/mrp/14.0.2.0/noupdate_changes.xml b/openupgrade_scripts/scripts/mrp/14.0.2.0/noupdate_changes.xml
index 6c400fbf5f29..8f8afec3400a 100644
--- a/openupgrade_scripts/scripts/mrp/14.0.2.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/mrp/14.0.2.0/noupdate_changes.xml
@@ -1,30 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
-  <!-- <record id="mrp_bom_byproduct_rule" model="ir.rule">
-    <field name="global"/>
+  <record id="mrp_bom_byproduct_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="mrp_bom_line_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="mrp_bom_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="mrp_production_rule" model="ir.rule">
+  <!-- <record id="mrp_production_rule" model="ir.rule">
     <field name="global"/>
-  </record>
+  </record> -->
   <record id="mrp_routing_workcenter_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="mrp_unbuild_rule" model="ir.rule">
+  <!--<record id="mrp_unbuild_rule" model="ir.rule">
     <field name="global"/>
   </record>
   <record id="mrp_workcenter_productivity" model="ir.rule">
     <field name="global"/>
-  </record>
+  </record> -->
   <record id="mrp_workcenter_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="mrp_workorder_rule" model="ir.rule">
+  <!-- <record id="mrp_workorder_rule" model="ir.rule">
     <field name="global"/>
   </record> -->
   <!--We need to update the context to the correct value because in v14 the context
diff --git a/openupgrade_scripts/scripts/point_of_sale/14.0.1.0.1/noupdate_changes.xml b/openupgrade_scripts/scripts/point_of_sale/14.0.1.0.1/noupdate_changes.xml
index 19b70ca66d66..b7374c7d94b9 100644
--- a/openupgrade_scripts/scripts/point_of_sale/14.0.1.0.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/point_of_sale/14.0.1.0.1/noupdate_changes.xml
@@ -12,9 +12,6 @@
 <!--  <record id="rule_pos_multi_company" model="ir.rule">
       <field name="global"/>
   </record>-->
-<!--  <record id="rule_pos_order_report_multi_company" model="ir.rule">
-      <field name="global"/>
-  </record>-->
 <!--  <record id="rule_pos_payment_method_multi_company" model="ir.rule">
       <field name="global"/>
   </record>-->
@@ -24,4 +21,8 @@
 <!--  <record id="rule_pos_session_multi_company" model="ir.rule">
       <field name="global"/>
   </record>-->
+  <record id="rule_pos_order_report_multi_company" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/product/14.0.1.2/noupdate_changes.xml b/openupgrade_scripts/scripts/product/14.0.1.2/noupdate_changes.xml
index 3cff9696634a..a5dc91b703d1 100644
--- a/openupgrade_scripts/scripts/product/14.0.1.2/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/product/14.0.1.2/noupdate_changes.xml
@@ -4,18 +4,23 @@
     <!-- <field name="digits" eval="2"/> -->
   </record>
   <record id="product_comp_rule" model="ir.rule">
-<!--    <field name="global"/>-->
+    <field name="domain_force"> [('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="product_packaging_comp_rule" model="ir.rule">
-<!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="product_pricelist_comp_rule" model="ir.rule">
-<!--    <field name="global"/>-->
+    <field name="domain_force"> [('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="product_pricelist_item_comp_rule" model="ir.rule">
-<!--    <field name="global"/>-->
+    <field name="domain_force"> [('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="product_supplierinfo_comp_rule" model="ir.rule">
-<!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/purchase/14.0.1.2/noupdate_changes.xml b/openupgrade_scripts/scripts/purchase/14.0.1.2/noupdate_changes.xml
index 7937adbe773a..5d0d366711d5 100644
--- a/openupgrade_scripts/scripts/purchase/14.0.1.2/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/purchase/14.0.1.2/noupdate_changes.xml
@@ -31,18 +31,22 @@
   <record id="portal_purchase_order_line_rule" model="ir.rule">
     <field name="name">Portal Purchase Order Lines</field>
   </record>
-  <!-- <record id="purchase_bill_union_comp_rule" model="ir.rule">
-    <field name="global"/>
+  <record id="purchase_bill_union_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="purchase_order_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="purchase_order_line_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="purchase_order_report_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="purchase_user_account_move_line_rule" model="ir.rule">
     <field name="domain_force">[('move_id.move_type', 'in', ('in_invoice', 'in_refund', 'in_receipt'))]</field>
   </record>
diff --git a/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/noupdate_changes.xml b/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/noupdate_changes.xml
index 01a16b70e5b4..d1c8d380785d 100644
--- a/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/noupdate_changes.xml
@@ -2,8 +2,10 @@
 <odoo>
   <record id="purchase_requisition_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
   <record id="purchase_requisition_line_comp_rule" model="ir.rule">
 <!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
   </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/post-migration.py b/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/post-migration.py
new file mode 100644
index 000000000000..e12fcf503985
--- /dev/null
+++ b/openupgrade_scripts/scripts/purchase_requisition/14.0.0.1/post-migration.py
@@ -0,0 +1,8 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(
+        env.cr, "purchase_requisition", "14.0.0.1/noupdate_changes.xml"
+    )
diff --git a/openupgrade_scripts/scripts/sale/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/sale/14.0.1.1/noupdate_changes.xml
index 77b3e1d88bc7..ff7ad123c070 100644
--- a/openupgrade_scripts/scripts/sale/14.0.1.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/sale/14.0.1.1/noupdate_changes.xml
@@ -132,12 +132,14 @@
 <!--  <record id="sale_order_comp_rule" model="ir.rule">
     <field name="global"/>
   </record> -->
-<!--  <record id="sale_order_line_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
-<!--  <record id="sale_order_report_comp_rule" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="sale_order_line_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+  </record>
+  <record id="sale_order_report_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <!-- Added due to the renaming of the XML-IDs -->
   <record id="account_invoice_rule_see_all" model="ir.rule">
     <field name="domain_force">[('move_type', 'in', ('out_invoice', 'out_refund'))]</field>
diff --git a/openupgrade_scripts/scripts/sale_management/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/sale_management/14.0.1.0/noupdate_changes.xml
index 428fa47ce72e..0fadad619bf2 100644
--- a/openupgrade_scripts/scripts/sale_management/14.0.1.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/sale_management/14.0.1.0/noupdate_changes.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
-<!--  <record id="sale_order_template_rule_company" model="ir.rule">
-    <field name="global"/>
-  </record> -->
+  <record id="sale_order_template_rule_company" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/sales_team/14.0.1.0/noupdate_changes.xml b/openupgrade_scripts/scripts/sales_team/14.0.1.0/noupdate_changes.xml
new file mode 100644
index 000000000000..883848b63ed9
--- /dev/null
+++ b/openupgrade_scripts/scripts/sales_team/14.0.1.0/noupdate_changes.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+  <record id="sale_team_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+</odoo>
diff --git a/openupgrade_scripts/scripts/sales_team/14.0.1.0/post-migration.py b/openupgrade_scripts/scripts/sales_team/14.0.1.0/post-migration.py
new file mode 100644
index 000000000000..7f97eaeb1917
--- /dev/null
+++ b/openupgrade_scripts/scripts/sales_team/14.0.1.0/post-migration.py
@@ -0,0 +1,6 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(env.cr, "sales_team", "14.0.1.0/noupdate_changes.xml")
diff --git a/openupgrade_scripts/scripts/stock/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/stock/14.0.1.1/noupdate_changes.xml
index e1ef75ef368f..bf734aab87d2 100644
--- a/openupgrade_scripts/scripts/stock/14.0.1.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/stock/14.0.1.1/noupdate_changes.xml
@@ -34,38 +34,42 @@
       </div>
     </field>
   </record>
-  <!-- <record id="product_pulled_flow_comp_rule" model="ir.rule">
-    <field name="global"/>
+  <record id="product_pulled_flow_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="report_stock_quantity_flow_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="route_warehouse0_mto" model="stock.location.route">
+  <!-- <record id="route_warehouse0_mto" model="stock.location.route">
     <field name="active">False</field>
-  </record>
-  <record id="stock_inventory_comp_rule" model="ir.rule">
+  </record> -->
+  <!-- <record id="stock_inventory_comp_rule" model="ir.rule">
     <field name="global"/>
   </record>
   <record id="stock_inventory_line_comp_rule" model="ir.rule">
     <field name="global"/>
-  </record>
+  </record> -->
   <record id="stock_location_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="stock_location_inter_wh" model="stock.location">
+  <!-- <record id="stock_location_inter_wh" model="stock.location">
     <field name="name">Inter-company transit</field>
     <field name="active" eval="False"/>
-  </record>
-  <record id="stock_location_route_comp_rule" model="ir.rule">
-    <field name="global"/>
   </record> -->
+  <record id="stock_location_route_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
+  </record>
   <record id="stock_move_line_rule" model="ir.rule">
-    <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-<!--    <field name="global"/>-->
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="stock_move_rule" model="ir.rule">
     <field name="domain_force">[('company_id', 'in', company_ids)]</field>
-<!--    <field name="global"/>-->
+    <!-- <field name="global"/> -->
   </record>
   <!-- <record id="stock_picking_rule" model="ir.rule">
     <field name="global"/>
@@ -78,14 +82,16 @@
   </record>
   <record id="stock_putaway_rule_rule" model="ir.rule">
     <field name="global"/>
-  </record>
+  </record> -->
   <record id="stock_quant_package_comp_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
   <record id="stock_quant_rule" model="ir.rule">
-    <field name="global"/>
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    <!-- <field name="global"/> -->
   </record>
-  <record id="stock_scrap_company_rule" model="ir.rule">
+  <!-- <record id="stock_scrap_company_rule" model="ir.rule">
     <field name="global"/>
   </record>
   <record id="stock_warehouse_comp_rule" model="ir.rule">
diff --git a/openupgrade_scripts/scripts/stock_landed_costs/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/stock_landed_costs/14.0.1.1/noupdate_changes.xml
index d85ba3eee71c..60fc16ba551b 100644
--- a/openupgrade_scripts/scripts/stock_landed_costs/14.0.1.1/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/stock_landed_costs/14.0.1.1/noupdate_changes.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
   <record id="stock_landed_cost_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     <!-- <field name="global"/> -->
   </record>
 </odoo>