From f8f1923a9fda7dc6c0af1cbdfb16d3471e931f6d Mon Sep 17 00:00:00 2001
From: Abdurrahman Saber <a.saber@odex.sa>
Date: Wed, 17 Sep 2025 05:02:24 +0300
Subject: [PATCH] [IMP] hr_base, *: activate multi-company for various custom
 models

---
 .../models/employee_custody.py                |   3 +-
 .../security/custody_security.xml             |   6 +
 odex25_hr/exp_payroll_custom/__manifest__.py  |   1 +
 .../exp_payroll_custom/models/hr_contract.py  |   1 +
 .../exp_payroll_custom/security/ir_rule.xml   | 124 ++++++++++++++++++
 .../exp_payroll_custom/security/security.xml  | 118 -----------------
 .../views/contract_advantage.xml              |   1 -
 .../exp_payroll_promotion/__manifest__.py     |   2 +-
 .../exp_payroll_promotion/data/ir_rule.xml    |  10 ++
 .../models/hr_payroll_promotion_setting.py    |   1 +
 .../hr_payroll_promotion_setting_view.xml     |   2 +
 odex25_hr/hr_base/__manifest__.py             |   1 +
 odex25_hr/hr_base/data/ir_rule.xml            |  10 ++
 .../hr_base/models/employee_iqama_renewal.py  |   3 +-
 .../views/employee_iqama_renewal_view.xml     |   3 +
 odex25_hr/hr_docs_expiry/__manifest__.py      |   1 +
 odex25_hr/hr_docs_expiry/data/ir_rule.xml     |  10 ++
 .../models/employee_documents.py              |   2 +-
 .../models/exit_and_return.py                 |   2 +-
 .../models/request_visa.py                    |   1 +
 .../hr_government_relations_security.xml      |  12 ++
 .../security/hr_holidays_security.xml         |   2 +-
 22 files changed, 191 insertions(+), 125 deletions(-)
 create mode 100644 odex25_hr/exp_payroll_custom/security/ir_rule.xml
 create mode 100644 odex25_hr/exp_payroll_promotion/data/ir_rule.xml
 create mode 100644 odex25_hr/hr_base/data/ir_rule.xml
 create mode 100644 odex25_hr/hr_docs_expiry/data/ir_rule.xml

diff --git a/odex25_hr/exp_employee_custody/models/employee_custody.py b/odex25_hr/exp_employee_custody/models/employee_custody.py
index 53bc7b819..4ab770362 100644
--- a/odex25_hr/exp_employee_custody/models/employee_custody.py
+++ b/odex25_hr/exp_employee_custody/models/employee_custody.py
@@ -33,6 +33,7 @@ class EmployeeCustody(models.Model):
     department_id = fields.Many2one(related="employee_id.department_id", readonly=True)
     job_id = fields.Many2one(related="employee_id.job_id", readonly=True)
     country_id = fields.Many2one(related="employee_id.country_id", readonly=True)
+    company_id = fields.Many2one(related="employee_id.company_id", store=True)
 
     def draft(self):
         self.state = "draft"
@@ -84,7 +85,7 @@ class EmployeeCustodyLine(models.Model):
     amount = fields.Float()
 
     # Relational fields
-    employee_custody_line = fields.Many2one(comodel_name='custom.employee.custody')  # Inverse field
+    employee_custody_line = fields.Many2one('custom.employee.custody')  # Inverse field
 
 
 EmployeeCustodyLine()
\ No newline at end of file
diff --git a/odex25_hr/exp_employee_custody/security/custody_security.xml b/odex25_hr/exp_employee_custody/security/custody_security.xml
index 7e307a59e..df61107bf 100644
--- a/odex25_hr/exp_employee_custody/security/custody_security.xml
+++ b/odex25_hr/exp_employee_custody/security/custody_security.xml
@@ -2,6 +2,12 @@
 <odoo>
     <data noupdate="0">
 
+        <record id="employee_custody_rule_comp_rule" model="ir.rule">
+            <field name="name">Employee custody multi company rule</field>
+            <field name="model_id" ref="model_custom_employee_custody"/>
+            <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+        </record>
+
         <record id="custom_employee_custody_emp_rule" model="ir.rule">
             <field name="name">Employee: views custody</field>
             <field name="model_id" ref="model_custom_employee_custody"/>
diff --git a/odex25_hr/exp_payroll_custom/__manifest__.py b/odex25_hr/exp_payroll_custom/__manifest__.py
index 1a0d20c68..f27ac87c4 100644
--- a/odex25_hr/exp_payroll_custom/__manifest__.py
+++ b/odex25_hr/exp_payroll_custom/__manifest__.py
@@ -23,6 +23,7 @@
     'data': [
         'security/security.xml',
         'security/ir.model.access.csv',
+        'security/ir_rule.xml',
 
         'data/data.xml',
 
diff --git a/odex25_hr/exp_payroll_custom/models/hr_contract.py b/odex25_hr/exp_payroll_custom/models/hr_contract.py
index 18415ca21..33ff16f81 100644
--- a/odex25_hr/exp_payroll_custom/models/hr_contract.py
+++ b/odex25_hr/exp_payroll_custom/models/hr_contract.py
@@ -288,6 +288,7 @@ class Advantages(models.Model):
 
     comments = fields.Text(string='Comments')
     payroll_month = fields.Text(string='Payroll Month', tracking=True)
+    company_id = fields.Many2one('res.company', string='Company', related='employee_id.company_id', store=True)
 
     @api.constrains('date_from', 'date_to', 'amount')
     def _chick_date(self):
diff --git a/odex25_hr/exp_payroll_custom/security/ir_rule.xml b/odex25_hr/exp_payroll_custom/security/ir_rule.xml
new file mode 100644
index 000000000..52961af12
--- /dev/null
+++ b/odex25_hr/exp_payroll_custom/security/ir_rule.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="employee_promotion_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee promotions multi company rule</field>
+        <field name="model_id" ref="model_employee_promotions" />
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="employee_reward_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee reward multi company rule</field>
+        <field name="model_id" ref="model_hr_employee_reward" />
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="hr_payslip_run_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee hr payslip run multi company rule</field>
+        <field name="model_id" ref="model_hr_payslip_run" />
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="salary_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee hr_salary_rule multi company rule</field>
+        <field name="model_id" ref="model_hr_salary_rule" />
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="hr_payroll_structure_comp_rule" model="ir.rule">
+        <field name="name">Employee hr_salary_rule multi company rule</field>
+        <field name="model_id" ref="model_hr_payroll_structure" />
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="rule_advance_salary_multi_company" model="ir.rule">
+        <field name="name">Advance Request Multi Company</field>
+        <field name="model_id" ref="model_salary_advance"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in',company_ids)]
+        </field>
+    </record>
+
+    <record id="hr_payslip_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee hr payslip multi company rule</field>
+        <field name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+    
+    <record id="contract_advantage_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee contract advantage multi company rule</field>
+        <field name="model_id" ref="model_contract_advantage"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+    <record id="hr_salary_advance_manager_rule" model="ir.rule">
+        <field name="name">Salary Advance</field>
+        <field name="model_id" ref="model_salary_advance"/>
+        <field name="groups" eval="[(4, ref('hr.group_hr_user')),(4, ref('account.group_account_user'))]"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
+
+    <record id="hr_salary_advance_employee_rule" model="ir.rule">
+        <field name="name">Salary Advance Rule For Employee</field>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="global" eval="True"/>
+        <field name="model_id" ref="model_salary_advance"/>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
+
+    <record id="hr_payroll_rule_employee" model="ir.rule">
+        <field name="name">Employee Payslip</field>
+        <field name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[('employee_id.user_id.id', '=', user.id),('state', '=', 'transfered')]</field>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="hr_payslip_contributor_rule" model="ir.rule">
+        <field name="name">All Payslip</field>
+        <field name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('exp_payroll_custom.group_hr_payroll_contributor')),
+                                    (4, ref('hr_base.group_general_manager')),
+                                    (4, ref('exp_hr_payroll.group_hr_payroll_user')),
+                                    (4, ref('hr_base.group_executive_manager')),
+                                    (4, ref('hr.group_hr_manager')),
+                                    (4, ref('hr_base.group_account_manager')),
+                                    (4, ref('exp_payroll_custom.group_payroll_expense_manger')),
+                                    (4, ref('exp_payroll_custom.group_payroll_finance_review'))]"/>
+    </record>
+
+    <record id="employee_promotion_employee_rule" model="ir.rule">
+        <field name="name">Employee: views its promotions only</field>
+        <field name="model_id" ref="model_employee_promotions"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="employee_promotion_division_manager_rule" model="ir.rule">
+        <field name="name">Division/Dep Manager: views promotions of its subordinates</field>
+        <field name="model_id" ref="model_employee_promotions"/>
+        <field name="domain_force">['|','|',('employee_id.department_id.manager_id','=',False),
+            ('employee_id.department_id.manager_id.user_id','child_of', [user.id]),
+            ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+        </field>
+        <field name="groups"
+               eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
+    </record>
+
+    <record id="employee_promotion_all_rule" model="ir.rule">
+        <field name="name">Manager: views promotions of all employee</field>
+        <field name="model_id" ref="model_employee_promotions" />
+        <field name="domain_force">[(1 ,'=', 1)]</field>
+        <field name="groups"
+            eval="[(3, ref('hr_base.group_account_manager')),
+                    (4, ref('hr_base.group_executive_manager')),
+                    (4, ref('hr_base.group_general_manager')),
+                    (4, ref('hr.group_hr_manager'))]" />
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/odex25_hr/exp_payroll_custom/security/security.xml b/odex25_hr/exp_payroll_custom/security/security.xml
index 077dbd3d6..41ee2db2d 100644
--- a/odex25_hr/exp_payroll_custom/security/security.xml
+++ b/odex25_hr/exp_payroll_custom/security/security.xml
@@ -17,123 +17,5 @@
             <field name="category_id" ref="base.module_category_payroll_localization"/>
         </record>
 
-        <record id="rule_advance_salary_multi_company" model="ir.rule">
-            <field name="name">Advance Request Multi Company</field>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-            </field>
-        </record>
-
-        <record id="hr_salary_advance_manager_rule" model="ir.rule">
-            <field name="name">Salary Advance</field>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field name="groups" eval="[(4, ref('hr.group_hr_user')),(4, ref('account.group_account_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-        <record id="hr_salary_advance_employee_rule" model="ir.rule">
-            <field name="name">Salary Advance Rule For Employee</field>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="global" eval="True"/>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-        <record id="hr_payroll_rule_employee" model="ir.rule">
-            <field name="name">Employee Payslip</field>
-            <field name="model_id" ref="model_hr_payslip"/>
-            <field name="domain_force">[('employee_id.user_id.id', '=', user.id),('state', '=', 'transfered')]</field>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-        </record>
-
-        <record id="hr_payslip_contributor_rule" model="ir.rule">
-            <field name="name">All Payslip</field>
-            <field name="model_id" ref="model_hr_payslip"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('exp_payroll_custom.group_hr_payroll_contributor')),
-                                        (4, ref('hr_base.group_general_manager')),
-                                        (4, ref('exp_hr_payroll.group_hr_payroll_user')),
-                                        (4, ref('hr_base.group_executive_manager')),
-                                        (4, ref('hr.group_hr_manager')),
-                                        (4, ref('hr_base.group_account_manager')),
-                                        (4, ref('exp_payroll_custom.group_payroll_expense_manger')),
-                                        (4, ref('exp_payroll_custom.group_payroll_finance_review')),
-                                        ]"/>
-<!--            (4, ref('hr.group_hr_manager')),(4, ref('hr.group_hr_user')),-->
-        </record>
-
-        <record id="hr_payslip_rule_comp_rule" model="ir.rule">
-            <field name="name">Employee hr payslip multi company rule</field>
-            <field name="model_id" ref="model_hr_payslip"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-        <record id="employee_promotion_employee_rule" model="ir.rule">
-            <field name="name">Employee: views its promotions only</field>
-            <field name="model_id" ref="model_employee_promotions"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-        </record>
-
-        <record id="employee_promotion_division_manager_rule" model="ir.rule">
-            <field name="name">Division/Dep Manager: views promotions of its subordinates</field>
-            <field name="model_id" ref="model_employee_promotions"/>
-            <field name="domain_force">['|','|',('employee_id.department_id.manager_id','=',False),
-                ('employee_id.department_id.manager_id.user_id','child_of', [user.id]),
-                ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
-            </field>
-            <field name="groups"
-                   eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
-        </record>
-
-        <record id="employee_promotion_all_rule" model="ir.rule">
-            <field name="name">Manager: views promotions of all employee</field>
-            <field name="model_id" ref="model_employee_promotions"/>
-            <field name="domain_force">[(1 ,'=', 1)]</field>
-            <field name="groups" eval="[(3, ref('hr_base.group_account_manager')),
-                                        (4, ref('hr_base.group_executive_manager')),
-                                        (4, ref('hr_base.group_general_manager')),
-                                        (4, ref('hr.group_hr_manager'))]"/>
-        </record>
-
-        <record id="employee_promotion_rule_comp_rule" model="ir.rule">
-            <field name="name">Employee promotions multi company rule</field>
-            <field name="model_id" ref="model_employee_promotions"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-        <record id="employee_reward_rule_comp_rule" model="ir.rule">
-            <field name="name">Employee reward multi company rule</field>
-            <field name="model_id" ref="model_hr_employee_reward"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-        <record id="hr_payslip_run_rule_comp_rule" model="ir.rule">
-            <field name="name">Employee hr payslip run multi company rule</field>
-            <field name="model_id" ref="model_hr_payslip_run"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-        <record id="salary_rule_comp_rule" model="ir.rule">
-            <field name="name">Employee hr_salary_rule multi company rule</field>
-            <field name="model_id" ref="model_hr_salary_rule"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-        <record id="hr_payroll_structure_comp_rule" model="ir.rule">
-            <field name="name">Employee hr_salary_rule multi company rule</field>
-            <field name="model_id" ref="model_hr_payroll_structure"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
-        </record>
-
-
     </data>
 </odoo>
diff --git a/odex25_hr/exp_payroll_custom/views/contract_advantage.xml b/odex25_hr/exp_payroll_custom/views/contract_advantage.xml
index e80a0e8a4..c7d3349cc 100644
--- a/odex25_hr/exp_payroll_custom/views/contract_advantage.xml
+++ b/odex25_hr/exp_payroll_custom/views/contract_advantage.xml
@@ -100,7 +100,6 @@
                   parent="exp_hr_payroll.menu_hr_payroll_root" action="employee_advantage_list_action" sequence="10"
                   groups="hr_base.group_executive_manager,hr_base.group_general_manager,exp_hr_payroll.group_hr_payroll_user"/>
 
-        />
 <!--                  groups="hr.group_hr_user,hr.group_hr_manager,hr_base.group_executive_manager,hr_base.group_general_manager,exp_hr_payroll.group_hr_payroll_user"-->
 <!--        -->
 
diff --git a/odex25_hr/exp_payroll_promotion/__manifest__.py b/odex25_hr/exp_payroll_promotion/__manifest__.py
index 6b8383494..730daab45 100644
--- a/odex25_hr/exp_payroll_promotion/__manifest__.py
+++ b/odex25_hr/exp_payroll_promotion/__manifest__.py
@@ -15,7 +15,7 @@
         'exp_official_mission'],
     'data': [
         'security/ir.model.access.csv',
-
+        'data/ir_rule.xml',
         'views/hr_employee_view.xml',
         'views/hr_payroll_structure_view.xml',
         'views/hr_payroll_raise_view.xml',
diff --git a/odex25_hr/exp_payroll_promotion/data/ir_rule.xml b/odex25_hr/exp_payroll_promotion/data/ir_rule.xml
new file mode 100644
index 000000000..f77463c7c
--- /dev/null
+++ b/odex25_hr/exp_payroll_promotion/data/ir_rule.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_payroll_promotion_setting_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee hr payroll promotion setting multi company rule</field>
+        <field name="model_id" ref="model_hr_payroll_promotion_setting"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+</odoo>
diff --git a/odex25_hr/exp_payroll_promotion/models/hr_payroll_promotion_setting.py b/odex25_hr/exp_payroll_promotion/models/hr_payroll_promotion_setting.py
index b0977fb16..c4002050e 100644
--- a/odex25_hr/exp_payroll_promotion/models/hr_payroll_promotion_setting.py
+++ b/odex25_hr/exp_payroll_promotion/models/hr_payroll_promotion_setting.py
@@ -41,6 +41,7 @@ class HrPromotionPromotionSetting(models.Model):
 
     exceptional_timeframe = fields.Integer('Years Between Two Exceptional Promotions')
     regular_timeframe = fields.Integer('Years Between Exceptional And Regular Promotion')
+    company_id = fields.Many2one('res.company', string='Company', required=True)
 
     @api.constrains('active', 'date_from', 'date_to')
     def check_active(self):
diff --git a/odex25_hr/exp_payroll_promotion/views/hr_payroll_promotion_setting_view.xml b/odex25_hr/exp_payroll_promotion/views/hr_payroll_promotion_setting_view.xml
index a5ddd5801..8c0f5d01a 100644
--- a/odex25_hr/exp_payroll_promotion/views/hr_payroll_promotion_setting_view.xml
+++ b/odex25_hr/exp_payroll_promotion/views/hr_payroll_promotion_setting_view.xml
@@ -17,6 +17,7 @@
                                 <field name="date_from"/>
                                 <field name="active"/>
                                 <field name="date_to"/>
+                                <field name="company_id"/>
                             </group>
                         </group>
                         <notebook>
@@ -98,6 +99,7 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="active"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
diff --git a/odex25_hr/hr_base/__manifest__.py b/odex25_hr/hr_base/__manifest__.py
index e3acb4721..0085eac88 100644
--- a/odex25_hr/hr_base/__manifest__.py
+++ b/odex25_hr/hr_base/__manifest__.py
@@ -22,6 +22,7 @@
         "security/ir.model.access.csv",
         "data/ir_sequence.xml",
         "data/ir_cron.xml",
+        "data/ir_rule.xml",
         # "views/assets_document_view.xml",
         "views/hr_base_view.xml",
         "views/employee_iqama_renewal_view.xml",
diff --git a/odex25_hr/hr_base/data/ir_rule.xml b/odex25_hr/hr_base/data/ir_rule.xml
new file mode 100644
index 000000000..3244d6125
--- /dev/null
+++ b/odex25_hr/hr_base/data/ir_rule.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="employee_iqama_renewal_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee iqama renewal multi company rule</field>
+        <field name="model_id" ref="model_employee_iqama_renewal"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+</odoo>
diff --git a/odex25_hr/hr_base/models/employee_iqama_renewal.py b/odex25_hr/hr_base/models/employee_iqama_renewal.py
index 7dde533d2..49a932579 100644
--- a/odex25_hr/hr_base/models/employee_iqama_renewal.py
+++ b/odex25_hr/hr_base/models/employee_iqama_renewal.py
@@ -14,6 +14,7 @@ class EmployeeIqamaRenew(models.Model):
     date = fields.Date()
     line_ids = fields.One2many("employee.iqama.renewal.line", "line_id")
     x_description = fields.Char()
+    company_id = fields.Many2one("res.company", string="Company", default=lambda self: self.env.user.company_id)
     state = fields.Selection(
         [('draft', _('Draft')), ('submit', _('Submit')), ('hr_depart', _('HR Department')),
          ('effective_department', _('Effective_Department')),
@@ -196,7 +197,7 @@ class EmployeeIqamaRenewLine(models.Model):
     renewal_fees = fields.Float(required=True, default=0)
     work_premint_fees = fields.Float(required=True, default=0)
     total = fields.Float(readonly=True, compute="get_total_fees")
-    line_id = fields.Many2one(comodel_name="employee.iqama.renewal")
+    line_id = fields.Many2one("employee.iqama.renewal", required=True, ondelete="cascade")
     iqama_new_expiry = fields.Date()
     account_id = fields.Many2one("account.account")
     account_id2 = fields.Many2one("account.account")
diff --git a/odex25_hr/hr_base/views/employee_iqama_renewal_view.xml b/odex25_hr/hr_base/views/employee_iqama_renewal_view.xml
index ae467d195..2cf44882b 100644
--- a/odex25_hr/hr_base/views/employee_iqama_renewal_view.xml
+++ b/odex25_hr/hr_base/views/employee_iqama_renewal_view.xml
@@ -121,6 +121,8 @@
                                    attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="date" string="Date" widget="date" required="True"
                                    attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="company_id" string="Company" required="True"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <field name="line_ids" string="Employees">
                             <tree editable="bottom">
@@ -170,6 +172,7 @@
                     <field name="name" string="Ref"/>
                     <field name="x_description" string="Description"/>
                     <field name="line_ids" string="Employees"/>
+                    <field name="company_id" string="Company"/>
                     <field name="date" string="Date" widget="date"/>
                     <field name="state" string="State"/>
                 </tree>
diff --git a/odex25_hr/hr_docs_expiry/__manifest__.py b/odex25_hr/hr_docs_expiry/__manifest__.py
index 9c8473301..ab265b803 100644
--- a/odex25_hr/hr_docs_expiry/__manifest__.py
+++ b/odex25_hr/hr_docs_expiry/__manifest__.py
@@ -9,6 +9,7 @@
     "data": [
         "security/ir.model.access.csv",
         "data/data.xml",
+        "data/ir_rule.xml",
         "data/ir_cron.xml",
         "data/mail_template.xml",
         "views/employee_check_list_view.xml",
diff --git a/odex25_hr/hr_docs_expiry/data/ir_rule.xml b/odex25_hr/hr_docs_expiry/data/ir_rule.xml
new file mode 100644
index 000000000..486b5d16f
--- /dev/null
+++ b/odex25_hr/hr_docs_expiry/data/ir_rule.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_employee_document_rule_comp_rule" model="ir.rule">
+        <field name="name">Employee hr employee document multi company rule</field>
+        <field name="model_id" ref="model_hr_employee_document"/>
+        <field name="domain_force">['|', ('company_id','=',False), ('company_id', 'in', company_ids)]</field>
+    </record>
+
+</odoo>
diff --git a/odex25_hr/hr_docs_expiry/models/employee_documents.py b/odex25_hr/hr_docs_expiry/models/employee_documents.py
index 151c33596..7c26f71a3 100644
--- a/odex25_hr/hr_docs_expiry/models/employee_documents.py
+++ b/odex25_hr/hr_docs_expiry/models/employee_documents.py
@@ -96,7 +96,7 @@ class HrEmployeeDocument(models.Model):
     specialization = fields.Char(string="Specialization")
     category = fields.Many2one(comodel_name="membership.categorys",string="Category")
 
-    company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id)
+    company_id = fields.Many2one('res.company',string="Company", related="employee_ref.company_id", store=True)
 
     employee_number = fields.Char(related="employee_ref.contract_id.name", copy=False, string='Employee Number')
 
diff --git a/odex25_hr/hr_government_relations/models/exit_and_return.py b/odex25_hr/hr_government_relations/models/exit_and_return.py
index 0f6b5dc3a..ccc6e4795 100644
--- a/odex25_hr/hr_government_relations/models/exit_and_return.py
+++ b/odex25_hr/hr_government_relations/models/exit_and_return.py
@@ -56,7 +56,7 @@ class hr_exit_return(models.Model):
 
     iqama_end_date = fields.Date(related="employee_id.iqama_number.expiry_date",string='Identity End Date', readonly=True)
     iqama_number = fields.Char(related="employee_id.iqama_number.iqama_id",string='Identity Number', readonly=True)
-
+    company_id = fields.Many2one(related="employee_id.company_id", store=True)
     # @api.onchange('employee_id')
     # def _get_leave_request_domain(self):
     #     self.leave_request_id = False
diff --git a/odex25_hr/hr_government_relations/models/request_visa.py b/odex25_hr/hr_government_relations/models/request_visa.py
index 749a0f6eb..50c1f2c31 100644
--- a/odex25_hr/hr_government_relations/models/request_visa.py
+++ b/odex25_hr/hr_government_relations/models/request_visa.py
@@ -47,6 +47,7 @@ class hr_request_visa(models.Model):
     account_move_id = fields.Many2one(comodel_name='account.move')
     account_journal_id = fields.Many2one(comodel_name='account.journal')
     account_debit_id = fields.Many2one(comodel_name='account.account')
+    company_id = fields.Many2one(related="employee_id.company_id", store=True)
 
     def request(self):
         self.state = 'request'
diff --git a/odex25_hr/hr_government_relations/security/hr_government_relations_security.xml b/odex25_hr/hr_government_relations/security/hr_government_relations_security.xml
index e288012ff..3d7b1fb8b 100644
--- a/odex25_hr/hr_government_relations/security/hr_government_relations_security.xml
+++ b/odex25_hr/hr_government_relations/security/hr_government_relations_security.xml
@@ -28,6 +28,12 @@
                                     (4, ref('hr_base.group_government_relations')),
                                     ]"/>
     </record>
+
+    <record id="hr_exit_return_comp_rule" model="ir.rule">
+        <field name="name">Employee hr_exit_return multi company rule</field>
+        <field name="model_id" ref="model_hr_exit_return"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+    </record>
     <!--#########################################Request Visa<###########################-->
 
     <record id="hr_request_visa_employee_rule" model="ir.rule">
@@ -37,6 +43,12 @@
         <field name="groups" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
+    <record id="hr_request_visa_comp_rule" model="ir.rule">
+        <field name="name">Employee hr_request_visa multi company rule</field>
+        <field name="model_id" ref="model_hr_request_visa"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+    </record>
+
     <record id="hr_request_visa_manager_rule" model="ir.rule">
         <field name="name"> Manager: views Request Visa of its subordinates </field>
         <field name="model_id" ref="model_hr_request_visa"/>
diff --git a/odex25_hr/hr_holidays_community/security/hr_holidays_security.xml b/odex25_hr/hr_holidays_community/security/hr_holidays_security.xml
index b5a464fdd..722a1f76b 100644
--- a/odex25_hr/hr_holidays_community/security/hr_holidays_security.xml
+++ b/odex25_hr/hr_holidays_community/security/hr_holidays_security.xml
@@ -54,7 +54,7 @@
         <field name="name">Leaves multi company rule</field>
         <field name="model_id" ref="model_hr_holidays_status"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','in',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','in',company_ids)]</field>
     </record>
 
 </odoo>