Merge pull request #5206 from expsa/fix_security_files_ma

fix secuirty files

odex25_hr/attendances/security/attendance_security.xml

@@ -11,8 +11,8 @@
     <record id="hr_attendance_register_manager_rule" model="ir.rule">
         <field name="name">Manager: views attendance register of its subordinates</field>
         <field name="model_id" ref="model_hr_attendance_register"/>
-        <field name="domain_force">['|',('employee_id.department_id.manager_id.user_id','child_of', [user.id]),
+        <field name="domain_force">['|',('employee_id.department_id.manager_id','child_of', user.employee_id.ids),
-            ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
         </field>
         <field name="groups"
                eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
@@ -51,8 +51,8 @@
     <record id="hr_reasons_lateness_manager_rule" model="ir.rule">
         <field name="name">Manager: views lateness reasons of its subordinates</field>
         <field name="model_id" ref="model_hr_reasons_lateness"/>
-        <field name="domain_force">['|',('employee_id.department_id.manager_id.user_id','child_of', [user.id]),
+        <field name="domain_force">['|',('employee_id.department_id.manager_id','child_of', user.employee_id.ids),
-            ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
         </field>
         <field name="groups"
                eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
@@ -83,8 +83,8 @@
     <record id="hr_attendance_transaction_manager_rule" model="ir.rule">
         <field name="name">Manager: views attendance transactions of its subordinates</field>
         <field name="model_id" ref="model_hr_attendance_transaction"/>
-        <field name="domain_force">['|',('employee_id.department_id.manager_id.user_id','child_of', [user.id]),
+        <field name="domain_force">['|',('employee_id.department_id.manager_id','child_of', user.employee_id.ids),
-            ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
         </field>
         <field name="groups"
                eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/employee_requests/security/employee_requests_security.xml

@@ -14,7 +14,7 @@
             <field name="name">Division manager: views forms of its subordinates</field>
             <field name="model_id" ref="model_employee_effective_form"/>
             <field name="domain_force">['|',('department_id.manager_id.user_id','=', user.id),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
@@ -52,7 +52,7 @@
             <field name="name">Division manager: views overtime of its subordinates</field>
             <field name="model_id" ref="model_employee_overtime_request"/>
             <field name="domain_force">['|',('employee_id.department_id.manager_id.user_id','=',  user.id),
-                ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups" eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
         </record>
@@ -131,7 +131,7 @@
             <field name="name">Division manager: views clearances of its subordinates</field>
             <field name="model_id" ref="model_hr_clearance_form"/>
             <field name="domain_force">['|',('department_id.manager_id.user_id','=',user.id),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
@@ -169,7 +169,7 @@
             <field name="name">Division manager: views permissions of its subordinates</field>
             <field name="model_id" ref="model_hr_personal_permission"/>
             <field name="domain_force">['|',('department_id.manager_id.user_id','=',user.id),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
@@ -205,7 +205,7 @@
             <field name="name">Division manager: views Other Request of its subordinates</field>
             <field name="model_id" ref="model_employee_other_request"/>
             <field name="domain_force">['|',('department_id.manager_id.user_id','=',user.id),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
@@ -233,7 +233,7 @@
             <field name="name">Division manager1: views Department Jobs Request</field>
             <field name="model_id" ref="model_employee_department_jobs"/>
             <field name="domain_force">['|',('old_department_2_id.manager_id.user_id','=', user.id),
-                ('old_department_2_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('old_department_2_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>
@@ -243,7 +243,7 @@
             <field name="name">Division manager2: views Department Jobs Request</field>
             <field name="model_id" ref="model_employee_department_jobs"/>
             <field name="domain_force">['|',('new_department_id.manager_id.user_id','=', user.id),
-                ('new_department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('new_department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>

odex25_hr/exp_official_mission/security/official_mission_security.xml

@@ -18,7 +18,7 @@
             <field name="name">Division manager: views missions of its subordinates</field>
             <field name="model_id" ref="model_hr_official_mission"/>
             <field name="domain_force">['|',('department_id2.manager_id.user_id','=',user.id),
-                ('department_id2.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id2.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>

odex25_hr/exp_payroll_custom/security/ir_rule.xml

@@ -104,8 +104,8 @@
         <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.manager_id','child_of', user.employee_id.ids),
-            ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
         </field>
         <field name="groups"
                eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/exp_payroll_loans/security/exp_payroll_loans_security.xml

@@ -12,8 +12,8 @@
             <field name="name"> Manager: views leaves reconciliations of its subordinates </field>
             <field name="model_id" ref="model_reconcile_leaves"/>
             <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                                                ('department_id.manager_id.user_id','child_of', [user.id]),
+                                                ('department_id.manager_id','child_of', user.employee_id.ids),
-                                                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]</field>
+                                                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]</field>
             <field name="groups" eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
         </record>
 

odex25_hr/exp_ticket_request/security/exp_ticket_request_security.xml

@@ -13,8 +13,8 @@
             <field name="name">Manager: views tickets requests of its subordinates</field>
             <field name="model_id" ref="model_hr_ticket_request"/>
             <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                ('department_id.manager_id.user_id','child_of', [user.id]),
+                ('department_id.manager_id','child_of', user.employee_id.ids),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/hr_base/security/hr_base_security.xml

@@ -90,8 +90,8 @@
         <field name="name"> Manager: views profiles of its subordinates </field>
         <field name="model_id" ref="model_hr_employee" />
         <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                                            ('department_id.manager_id.user_id','child_of', [user.id]),
+                                            ('department_id.manager_id','child_of', user.employee_id.ids),
-                                            ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]</field>
+                                            ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]</field>
         <field
             name="groups"
             eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"
@@ -120,8 +120,8 @@
         <field name="name"> Manager: views timesheets of its subordinates </field>
         <field name="model_id" ref="analytic.model_account_analytic_line" />
         <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                                            ('department_id.manager_id.user_id','child_of', [user.id]),
+                                            ('department_id.manager_id','child_of', user.employee_id.ids),
-                                            ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]</field>
+                                            ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]</field>
         <field
             name="groups"
             eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"

odex25_hr/hr_contract_custom/security/ir_rules.xml

@@ -6,8 +6,8 @@
             <field name="name">Manager: views tickets requests of its subordinates
             </field>
             <field name="model_id" ref="model_hr_re_contract"/>
-            <field name="domain_force">['|',('department_id.manager_id.user_id','child_of', [user.id]),
+            <field name="domain_force">['|',('department_id.manager_id','child_of', user.employee_id.ids),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                     eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/hr_delegation_management/security/hr_base_security.xml

@@ -16,8 +16,8 @@
             <field name="domain_force">
                 ['|','|',('delegate_id.user_id', '=', user.id),
                 ('delegator_id.user_id', '=', user.id),('delegate_id.department_id.manager_id','=',False),
-            ('delegate_id.department_id.manager_id.user_id','child_of', [user.id]),
+            ('delegate_id.department_id.manager_id','child_of', user.employee_id.ids),
-            ('delegate_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])
+            ('delegate_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)
                 ]
             </field>
             <field name="groups" eval="[(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/hr_disciplinary_tracking/security/security.xml

@@ -14,7 +14,7 @@
             <field name="name">Division manager: views forms of its subordinates</field>
             <field name="model_id" ref="model_hr_penalty_register"/>
             <field name="domain_force">['|',('department_id.manager_id.user_id','=', user.id),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager')),]"/>

odex25_hr/hr_government_relations/security/hr_government_relations_security.xml

@@ -13,8 +13,8 @@
         <field name="name"> Manager: views exist and returns of its subordinates </field>
         <field name="model_id" ref="model_hr_exit_return"/>
         <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-            ('department_id.manager_id.user_id','child_of', [user.id]),
+            ('department_id.manager_id','child_of', user.employee_id.ids),
-            ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]</field>
+            ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]</field>
         <field name="groups" eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
     </record>
 
@@ -53,8 +53,8 @@
         <field name="name"> Manager: views Request Visa of its subordinates </field>
         <field name="model_id" ref="model_hr_request_visa"/>
         <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-            ('department_id.manager_id.user_id','child_of', [user.id]),
+            ('department_id.manager_id','child_of', user.employee_id.ids),
-            ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]</field>
+            ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]</field>
         <field name="groups" eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
     </record>
 

odex25_hr/hr_holidays_public/security/hr_holidays_public_security.xml

@@ -25,8 +25,8 @@
             <field name="name">Manager: views holidays of its subordinates</field>
             <field name="model_id" ref="model_hr_holidays"/>
             <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                ('department_id.manager_id.user_id','child_of', [user.id]),
+                ('department_id.manager_id','child_of', user.employee_id.ids),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
@@ -64,8 +64,8 @@
             <field name="name">Manager: views holidays cancellation of its subordinates</field>
             <field name="model_id" ref="model_leave_cancellation"/>
             <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-                ('department_id.manager_id.user_id','child_of', [user.id]),
+                ('department_id.manager_id','child_of', user.employee_id.ids),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>
@@ -98,8 +98,8 @@
             <field name="name">Manager: views holidays returns of its subordinates</field>
             <field name="model_id" ref="model_return_from_leave"/>
             <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.manager_id','child_of', user.employee_id.ids),
-                ('employee_id.department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('employee_id.department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/hr_loans_salary_advance/security/hr_loans_salary_advance.xml

@@ -35,8 +35,8 @@
         <field name="name">Manager: views loans of its subordinates</field>
         <field name="model_id" ref="model_hr_loan_salary_advance"/>
         <field name="domain_force">['|','|',('department_id.manager_id','=',False),
-            ('department_id.manager_id.user_id','child_of', [user.id]),
+            ('department_id.manager_id','child_of', user.employee_id.ids),
-            ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
         </field>
         <field name="groups"
                eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>

odex25_hr/hr_termination/security/security.xml

@@ -11,8 +11,8 @@
         <record id="hr_termination_manager_rule" model="ir.rule">
             <field name="name">Manager: views terminations of its subordinates</field>
             <field name="model_id" ref="model_hr_termination"/>
-            <field name="domain_force">['|',('department_id.manager_id.user_id','child_of', [user.id]),
+            <field name="domain_force">['|',('department_id.manager_id','child_of', user.employee_id.ids),
-                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+                ('department_id.parent_id.manager_id','child_of', user.employee_id.ids)]
             </field>
             <field name="groups"
                    eval="[(4, ref('hr_base.group_department_manager')),(4, ref('hr_base.group_division_manager'))]"/>