From bf163b6b05ca7ea9e9bf02f36f07b24769557511 Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Wed, 27 Mar 2024 17:02:52 +0100
Subject: [PATCH] [OU-IMP] update multi-company ir_rule

---
 .../account/16.0.1.2/noupdate_changes.xml        |  6 ++++++
 .../{16.0.1.5 => 16.0.1.6}/noupdate_changes.xml  | 16 ++++++++++++++++
 .../{16.0.1.5 => 16.0.1.6}/post-migration.py     |  2 +-
 .../{16.0.1.5 => 16.0.1.6}/upgrade_analysis.txt  |  0
 .../upgrade_analysis_work.txt                    |  0
 5 files changed, 23 insertions(+), 1 deletion(-)
 rename openupgrade_scripts/scripts/hr_holidays/{16.0.1.5 => 16.0.1.6}/noupdate_changes.xml (65%)
 rename openupgrade_scripts/scripts/hr_holidays/{16.0.1.5 => 16.0.1.6}/post-migration.py (92%)
 rename openupgrade_scripts/scripts/hr_holidays/{16.0.1.5 => 16.0.1.6}/upgrade_analysis.txt (100%)
 rename openupgrade_scripts/scripts/hr_holidays/{16.0.1.5 => 16.0.1.6}/upgrade_analysis_work.txt (100%)

diff --git a/openupgrade_scripts/scripts/account/16.0.1.2/noupdate_changes.xml b/openupgrade_scripts/scripts/account/16.0.1.2/noupdate_changes.xml
index 67e8f8a7d23c..dd0293d14890 100644
--- a/openupgrade_scripts/scripts/account/16.0.1.2/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/account/16.0.1.2/noupdate_changes.xml
@@ -1,5 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
+  <record id="account_bank_statement_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
+  <record id="account_bank_statement_line_comp_rule" model="ir.rule">
+    <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+  </record>
   <!-- Don't recreate this, as they are usually touched by users and in fact the changes are only to use Command syntax
   <record id="account_payment_term_15days" model="account.payment.term">
     <field name="line_ids" eval="[Command.clear(), Command.create({'value': 'balance', 'value_amount': 0.0, 'days': 15})]"/>
diff --git a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/noupdate_changes.xml b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/noupdate_changes.xml
similarity index 65%
rename from openupgrade_scripts/scripts/hr_holidays/16.0.1.5/noupdate_changes.xml
rename to openupgrade_scripts/scripts/hr_holidays/16.0.1.6/noupdate_changes.xml
index 08b506762784..38b16d8a8946 100644
--- a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/noupdate_changes.xml
@@ -29,4 +29,20 @@
                     ('employee_id.leave_manager_id', '=', user.id),
         ]</field>
   </record>
+  <record id="hr_leave_allocation_rule_multicompany" model="ir.rule">
+    <field name="domain_force">[
+            '|',
+                ('employee_id', '=', False),
+                ('employee_id.company_id', 'in', company_ids),
+            ('holiday_status_id.company_id', 'in', company_ids + [False])
+        ]</field>
+  </record>
+  <record id="hr_leave_rule_multicompany" model="ir.rule">
+    <field name="domain_force">[
+            '|',
+                ('employee_id', '=', False),
+                ('employee_id.company_id', 'in', company_ids),
+            ('holiday_status_id.company_id', 'in', company_ids + [False])
+        ]</field>
+  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/post-migration.py b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/post-migration.py
similarity index 92%
rename from openupgrade_scripts/scripts/hr_holidays/16.0.1.5/post-migration.py
rename to openupgrade_scripts/scripts/hr_holidays/16.0.1.6/post-migration.py
index 70aef7b5c96b..1a5050ede897 100644
--- a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/post-migration.py
+++ b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/post-migration.py
@@ -22,4 +22,4 @@ def _set_allocation_validation_type(env):
 @openupgrade.migrate()
 def migrate(env, version):
     _set_allocation_validation_type(env)
-    openupgrade.load_data(env.cr, "hr_holidays", "16.0.1.5/noupdate_changes.xml")
+    openupgrade.load_data(env.cr, "hr_holidays", "16.0.1.6/noupdate_changes.xml")
diff --git a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/upgrade_analysis.txt b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/upgrade_analysis.txt
similarity index 100%
rename from openupgrade_scripts/scripts/hr_holidays/16.0.1.5/upgrade_analysis.txt
rename to openupgrade_scripts/scripts/hr_holidays/16.0.1.6/upgrade_analysis.txt
diff --git a/openupgrade_scripts/scripts/hr_holidays/16.0.1.5/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/hr_holidays/16.0.1.6/upgrade_analysis_work.txt
similarity index 100%
rename from openupgrade_scripts/scripts/hr_holidays/16.0.1.5/upgrade_analysis_work.txt
rename to openupgrade_scripts/scripts/hr_holidays/16.0.1.6/upgrade_analysis_work.txt