19.0 vanilla

odoo-bringout-oca-ocb-hr_holidays/hr_holidays/security/hr_holidays_security.xml

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record model="ir.module.category" id="base.module_category_human_resources_time_off">
-        <field name="description">A user without any rights on Time Off will be able to see the application, create his own holidays and manage the requests of the users he's manager of.</field>
+    <record model="res.groups.privilege" id="res_groups_privilege_time_off">
+        <field name="name">Time Off</field>
         <field name="sequence">10</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
     </record>
 
     <record id="group_hr_holidays_responsible" model="res.groups">
         <field name="name">Time Off Responsible</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
     <record id="group_hr_holidays_user" model="res.groups">
-        <field name="name">Officer : Manage all requests</field>
-        <field name="category_id" ref="base.module_category_human_resources_time_off"/>
-        <field name="implied_ids" eval="[(4, ref('hr_holidays.group_hr_holidays_responsible'))]"/>
+        <field name="name">Officer: Manage all requests</field>
+        <field name="sequence">10</field>
+        <field name="privilege_id" ref="res_groups_privilege_time_off"/>
+        <field name="implied_ids" eval="[(4, ref('hr_holidays.group_hr_holidays_responsible')), (4, ref('hr.group_hr_user'))]"/>
     </record>
 
     <record id="group_hr_holidays_manager" model="res.groups">
         <field name="name">Administrator</field>
-        <field name="category_id" ref="base.module_category_human_resources_time_off"/>
+        <field name="sequence">20</field>
+        <field name="comment">Can manage and configure all holidays and leave requests.
+
+A user without any rights on Time Off will be able to see the application, create his own holidays and manage the requests of the users he's manager of.</field>
+        <field name="privilege_id" ref="res_groups_privilege_time_off"/>
         <field name="implied_ids" eval="[(4, ref('hr_holidays.group_hr_holidays_user'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
+        <field name="user_ids" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
     </record>
 
     <data noupdate="1">
 
-    <record id="base.default_user" model="res.users">
-        <field name="groups_id" eval="[(4,ref('hr_holidays.group_hr_holidays_manager'))]"/>
-    </record>
-
     <record id="hr_leave_rule_employee" model="ir.rule">
         <field name="name">Time Off base.group_user read</field>
         <field name="model_id" ref="model_hr_leave"/>
@@ -44,7 +45,6 @@
         <field name="name">Time Off base.group_user create/write</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[
-            ('holiday_type', '=', 'employee'),
             '|',
                 '&amp;',
                     ('employee_id.user_id', '=', user.id),
@@ -61,7 +61,7 @@
     <record id="hr_leave_rule_employee_unlink" model="ir.rule">
         <field name="name">Time Off base.group_user unlink</field>
         <field name="model_id" ref="model_hr_leave"/>
-        <field name="domain_force">[('employee_id.user_id', '=', user.id), ('state', 'in', ['draft', 'confirm'])]</field>
+        <field name="domain_force">[('employee_id.user_id', '=', user.id), ('state', 'in', ['confirm', 'validate1'])]</field>
         <field name="perm_read" eval="False"/>
         <field name="perm_write" eval="False"/>
         <field name="perm_create" eval="False"/>
@@ -85,7 +85,6 @@
         <field name="name">Time Off Responsible create/write</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[
-            ('holiday_type', '=', 'employee'),
             '|',
                 '&amp;',
                     ('employee_id.user_id', '=', user.id),
@@ -111,7 +110,6 @@
         <field name="name">Time Off All Approver create/write</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[
-            ('holiday_type', '=', 'employee'),
             '|',
                 '&amp;',
                     ('employee_id.user_id', '=', user.id),
@@ -135,18 +133,11 @@
     <record id="hr_leave_rule_multicompany" model="ir.rule">
         <field name="name">Time Off: multi company global rule</field>
         <field name="model_id" ref="model_hr_leave"/>
-        <field name="domain_force">[
-            '|',
-                ('employee_id', '=', False),
-                ('employee_id.company_id', 'in', company_ids),
-            '|',
-                ('holiday_status_id', '=', False),
-                ('holiday_status_id.company_id', 'in', company_ids + [False]),
-        ]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
 
     <record id="hr_leave_allocation_rule_multicompany" model="ir.rule">
-        <field name="name">Leave Allocations: multi company global rule</field>
+        <field name="name">Time Off: multi company global rule</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">[
             '|',
@@ -174,13 +165,12 @@
         <field name="name">Allocations: base.group_user create/write</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">[
-            ('holiday_status_id.requires_allocation', '=', 'yes'),
-            ('holiday_status_id.employee_requests', '=', 'yes'),
-            ('holiday_type', '=', 'employee'),
             '|',
-                ('employee_id.user_id', '=', user.id),
                 '&amp;',
-                    ('validation_type', '=', 'officer'),
+                    ('employee_id.user_id', '=', user.id),
+                    ('state', '=', 'confirm'),
+                '&amp;',
+                    ('validation_type', 'in', ['manager', 'both', 'no_validation']),
                     ('employee_id.leave_manager_id', '=', user.id),
         ]</field>
         <field name="perm_read" eval="False"/>
@@ -188,6 +178,21 @@
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
 
+    <record id="hr_leave_allocation_rule_responsible_update" model="ir.rule">
+        <field name="name">Allocations: Responsible: create/write</field>
+        <field name="model_id" ref="model_hr_leave_allocation"/>
+        <field name="domain_force">[
+            '|',
+                '&amp;',
+                    ('employee_id.user_id', '=', user.id),
+                    ('state', '!=', 'validate'),
+                ('employee_id.leave_manager_id', '=', user.id),
+        ]</field>
+        <field name="perm_read" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+        <field name="groups" eval="[(4, ref('hr_holidays.group_hr_holidays_responsible'))]"/>
+    </record>
+
     <record id="hr_leave_allocation_rule_officer_read" model="ir.rule">
         <field name="name">Allocations: see all time off: read all</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
@@ -209,10 +214,9 @@
     </record>
 
     <record id="hr_leave_allocation_rule_officer_update" model="ir.rule">
-        <field name="name">Allocations: holiday user : create/write</field>
+        <field name="name">Allocations: holiday user: create/write</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">[
-            ('holiday_type', '=', 'employee'),
             '|',
                 '&amp;',
                     ('employee_id.user_id', '=', user.id),
@@ -252,12 +256,25 @@
     <record id="hr_holidays_status_rule_multi_company" model="ir.rule">
         <field name="name">Time Off multi company rule</field>
         <field name="model_id" ref="model_hr_leave_type"/>
+        <field name="domain_force">[
+            '|', 
+                ('company_id', 'in', company_ids),
+                '&amp;',
+                    ('company_id', '=', False),
+                    ('country_id', 'in', user.env.companies.country_id.ids + [False])
+        ]
+        </field>
+    </record>
+
+    <record id="hr_leave_accrual_plan_rule_multi_company" model="ir.rule">
+        <field name="name">Accrual plan multi company rule</field>
+        <field name="model_id" ref="model_hr_leave_accrual_plan"/>
         <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
-    <record id="hr_leave_stress_day_rule_multi_company" model="ir.rule">
-        <field name="name">Stress Day: multi company rule</field>
-        <field name="model_id" ref="model_hr_leave_stress_day"/>
+    <record id="hr_leave_mandatory_day_rule_multi_company" model="ir.rule">
+        <field name="name">Mandatory Day: multi company rule</field>
+        <field name="model_id" ref="model_hr_leave_mandatory_day"/>
         <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
@@ -277,7 +294,7 @@
     <record id="hr_leave_report_rule_group_user" model="ir.rule">
         <field name="name">Time Off Summary / Report: Internal User</field>
         <field name="model_id" ref="model_hr_leave_report"/>
-        <field name="domain_force">[('employee_id.user_id', '=', user.id)]</field>
+        <field name="domain_force">[('has_department_manager_access', '=', True)]</field>
         <field name="perm_create" eval="False"/>
         <field name="perm_write" eval="False"/>
         <field name="perm_unlink" eval="False"/>

odoo-bringout-oca-ocb-hr_holidays/hr_holidays/security/ir.model.access.csv

@@ -16,11 +16,13 @@ access_calendar_attendee_hr_user,calendar.attendee.hr.user,calendar.model_calend
 access_mail_activity_type_holidays_manager,mail.activity.type.holidays.manager,mail.model_mail_activity_type,hr_holidays.group_hr_holidays_manager,1,1,1,1
 access_hr_holidays_summary_employee,access.hr.holidays.summary.employee,model_hr_holidays_summary_employee,hr_holidays.group_hr_holidays_user,1,1,1,0
 access_hr_leave_report_calendar,access_hr_leave_report_calendar,model_hr_leave_report_calendar,base.group_user,1,0,0,0
-access_hr_leave_employee_type_report,access_hr_leave_employee_type_report,model_hr_leave_employee_type_report,base.group_user,1,0,0,0
+access_hr_leave_employee_type_report_manager,access_hr_leave_employee_type_report_manager,model_hr_leave_employee_type_report,hr_holidays.group_hr_holidays_manager,1,1,0,0
 access_hr_leave_accrual_plan_user,hr.leave.accrual.plan.user,model_hr_leave_accrual_plan,hr_holidays.group_hr_holidays_user,1,0,0,0
 access_hr_leave_accrual_level_user,hr.leave.accrual.level.user,model_hr_leave_accrual_level,hr_holidays.group_hr_holidays_user,1,0,0,0
 access_hr_leave_accrual_plan_manager,hr.leave.accrual.plan.manager,model_hr_leave_accrual_plan,hr_holidays.group_hr_holidays_manager,1,1,1,1
 access_hr_leave_accrual_level_manager,hr.leave.accrual.level.manager,model_hr_leave_accrual_level,hr_holidays.group_hr_holidays_manager,1,1,1,1
 access_hr_holidays_cancel_leave,access_hr_holidays_cancel_leave,hr_holidays.model_hr_holidays_cancel_leave,base.group_user,1,1,1,1
-access_hr_leave_stress_day_user,access_hr_holidays_stress_day_user,hr_holidays.model_hr_leave_stress_day,base.group_user,1,0,0,0
-access_hr_leave_stress_day_manager,access_hr_holidays_stress_day_manager,hr_holidays.model_hr_leave_stress_day,hr_holidays.group_hr_holidays_manager,1,1,1,1
+access_hr_leave_mandatory_day_user,access_hr_holidays_mandatory_day_user,hr_holidays.model_hr_leave_mandatory_day,base.group_user,1,0,0,0
+access_hr_leave_mandatory_day_manager,access_hr_holidays_mandatory_day_manager,hr_holidays.model_hr_leave_mandatory_day,hr_holidays.group_hr_holidays_manager,1,1,1,1
+access_hr_leave_generate_multi_wizard,access_hr_leave_generate_multi_wizard,hr_holidays.model_hr_leave_generate_multi_wizard,hr_holidays.group_hr_holidays_responsible,1,1,1,1
+access_hr_leave_allocation_generate_multi_wizard,access_hr_leave_allocation_generate_multi_wizard,hr_holidays.model_hr_leave_allocation_generate_multi_wizard,hr_holidays.group_hr_holidays_responsible,1,1,1,1