From 3f3d4370e804a942fd8eb83965b83a0181e6f418 Mon Sep 17 00:00:00 2001 From: Dossogne Bertrand Date: Thu, 1 Sep 2022 12:00:11 +0000 Subject: [PATCH] [FIX] hr: allow onboarding plan access for officers taskID 2969653 closes odoo/odoo#99407 Signed-off-by: Kevin Baptiste --- addons/hr/security/ir.model.access.csv | 2 +- addons/hr/views/hr_employee_views.xml | 2 +- addons/hr/views/hr_views.xml | 4 ++-- addons/hr/wizard/hr_plan_wizard.py | 7 ++++++- addons/hr/wizard/hr_plan_wizard_views.xml | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 605abf575b6..0f662b3901c 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -12,7 +12,7 @@ access_hr_plan_activity_type_employee,access_hr_plan_activity_type,model_hr_plan access_hr_plan_employee,access_hr_plan_employee,model_hr_plan,base.group_user,1,0,0,0 access_hr_plan_activity_type_hr_user,access_hr_plan_activity_type,model_hr_plan_activity_type,group_hr_user,1,1,1,1 access_hr_plan_hr_user,access_hr_plan_hr_user,model_hr_plan,group_hr_user,1,1,1,1 -access_hr_plan_wizard,access.hr.plan.wizard,model_hr_plan_wizard,hr.group_hr_manager,1,1,1,0 +access_hr_plan_wizard,access.hr.plan.wizard,model_hr_plan_wizard,hr.group_hr_user,1,1,1,0 access_hr_departure_wizard,access.hr.departure.wizard,model_hr_departure_wizard,hr.group_hr_user,1,1,1,0 access_hr_work_location_user,access_hr_work_location_user,model_hr_work_location,base.group_user,1,0,0,0 access_hr_work_location_manager,access_hr_work_location_manager,model_hr_work_location,group_hr_manager,1,1,1,1 diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml index 6d02de93e18..d671dfa1aa8 100644 --- a/addons/hr/views/hr_employee_views.xml +++ b/addons/hr/views/hr_employee_views.xml @@ -52,7 +52,7 @@
-
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml index fea0b49e6e6..52415ea56bc 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -122,7 +122,7 @@ id="menu_config_plan" name="Activity Planning" parent="menu_human_resources_configuration" - groups="group_hr_manager" + groups="group_hr_user" sequence="100"/> diff --git a/addons/hr/wizard/hr_plan_wizard.py b/addons/hr/wizard/hr_plan_wizard.py index 2400c530f4b..0cbf893f562 100644 --- a/addons/hr/wizard/hr_plan_wizard.py +++ b/addons/hr/wizard/hr_plan_wizard.py @@ -12,7 +12,12 @@ class HrPlanWizard(models.TransientModel): def _default_plan_id(self): # We know that all employees belong to the same company employee = self.env['hr.employee'].browse(self.env.context.get('active_ids')[0] if self.env.context.get('active_ids') else []) - return self.env['hr.plan'].search([('company_id', '=', employee.company_id.id)], limit=1) + return self.env['hr.plan'].search([ + ('company_id', '=', employee.company_id.id), + '|', + ('department_id', '=', employee.department_id.id), + ('department_id', '=', False) + ], limit=1) plan_id = fields.Many2one('hr.plan', default=lambda self: self._default_plan_id(), domain="[('company_id', '=', company_id), '|', ('department_id', '=', department_id), ('department_id', '=', False)]") diff --git a/addons/hr/wizard/hr_plan_wizard_views.xml b/addons/hr/wizard/hr_plan_wizard_views.xml index 91a0c20f77a..2da10891d8d 100644 --- a/addons/hr/wizard/hr_plan_wizard_views.xml +++ b/addons/hr/wizard/hr_plan_wizard_views.xml @@ -18,8 +18,8 @@