From 61dba5d86cd203be7a3f55167145d21680a5f3ae Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Wed, 12 May 2021 15:23:14 +0200 Subject: [PATCH] [IMP] hr_fleet: allow searching an employee from a license plate Allows an hr officer to lookup an employee from his license plate. Task ID: 2415309 --- addons/hr_fleet/__manifest__.py | 1 + addons/hr_fleet/models/employee.py | 14 +++----- .../hr_fleet/security/hr_fleet_security.xml | 32 +++++++++++++++++++ addons/hr_fleet/security/ir.model.access.csv | 6 ++-- addons/hr_fleet/views/employee_views.xml | 13 ++++++++ 5 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 addons/hr_fleet/security/hr_fleet_security.xml diff --git a/addons/hr_fleet/__manifest__.py b/addons/hr_fleet/__manifest__.py index 927915aebdb..0666f878778 100644 --- a/addons/hr_fleet/__manifest__.py +++ b/addons/hr_fleet/__manifest__.py @@ -10,6 +10,7 @@ 'data': [ 'data/hr_fleet_data.xml', 'security/ir.model.access.csv', + 'security/hr_fleet_security.xml', 'views/employee_views.xml', 'views/fleet_category_views.xml', 'views/fleet_vehicle_views.xml', diff --git a/addons/hr_fleet/models/employee.py b/addons/hr_fleet/models/employee.py index 08596cee026..b813bd856c3 100644 --- a/addons/hr_fleet/models/employee.py +++ b/addons/hr_fleet/models/employee.py @@ -9,6 +9,10 @@ class Employee(models.Model): _inherit = 'hr.employee' employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars", groups="fleet.fleet_group_manager") + car_ids = fields.One2many( + 'fleet.vehicle', 'driver_employee_id', string='Vehicles (private)', + groups="fleet.fleet_group_manager,hr.group_hr_user", + ) mobility_card = fields.Char(groups="fleet.fleet_group_user") def action_open_employee_cars(self): @@ -26,16 +30,8 @@ class Employee(models.Model): } def _compute_employee_cars_count(self): - driver_ids = (self.mapped('user_id.partner_id') | self.sudo().mapped('address_home_id')).ids - fleet_data = self.env['fleet.vehicle.assignation.log'].read_group( - domain=[('driver_id', 'in', driver_ids)], fields=['vehicle_id:array_agg'], groupby=['driver_id']) - mapped_data = { - group['driver_id'][0]: len(set(group['vehicle_id'])) - for group in fleet_data - } for employee in self: - drivers = employee.user_id.partner_id | employee.sudo().address_home_id - employee.employee_cars_count = sum(mapped_data.get(pid, 0) for pid in drivers.ids) + employee.employee_cars_count = len(employee.car_ids) def action_get_claim_report(self): self.ensure_one() diff --git a/addons/hr_fleet/security/hr_fleet_security.xml b/addons/hr_fleet/security/hr_fleet_security.xml new file mode 100644 index 00000000000..c440f25ac52 --- /dev/null +++ b/addons/hr_fleet/security/hr_fleet_security.xml @@ -0,0 +1,32 @@ + + + + + Hr Officer read rights on vehicle with employees assigned + + + + + + + ['|', ('driver_employee_id', '!=', False), ('future_driver_employee_id', '!=', False)] + + + + ['|', ('vehicle_id.driver_id','=',user.partner_id.id), + ('vehicle_id.driver_employee_id.user_id','=',user.id)] + + + ['|', ('vehicle_id.driver_id','=',user.partner_id.id), + ('vehicle_id.driver_employee_id.user_id','=',user.id)] + + + ['|', ('vehicle_id.driver_id','=',user.partner_id.id), + ('vehicle_id.driver_employee_id.user_id','=',user.id)] + + + ['|', ('driver_id','=',user.partner_id.id), + ('driver_employee_id.user_id','=',user.id)] + + + diff --git a/addons/hr_fleet/security/ir.model.access.csv b/addons/hr_fleet/security/ir.model.access.csv index d22886e426a..900b6293ba6 100644 --- a/addons/hr_fleet/security/ir.model.access.csv +++ b/addons/hr_fleet/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink -hr_fleet_convert_wizard_access_right_user,hr_fleet_convert_wizard_access_right,model_hr_fleet_convert_wizard,fleet.fleet_group_user,1,1,1,1 -hr_fleet_convert_wizard_line_access_right_user,hr_fleet_convert_wizard_line_access_right,model_hr_fleet_convert_wizard_line,fleet.fleet_group_user,1,1,1,1 - +hr_fleet_convert_wizard_access_right_user,hr_fleet_convert_wizard_access_right,model_hr_fleet_convert_wizard,fleet.fleet_group_manager,1,1,1,1 +hr_fleet_convert_wizard_line_access_right_user,hr_fleet_convert_wizard_line_access_right,model_hr_fleet_convert_wizard_line,fleet.fleet_group_manager,1,1,1,1 +hr_fleet_vehicle_access_right_hr_officer,hr_fleet_vehicle_access_right_hr_officer,model_fleet_vehicle,hr.group_hr_user,1,0,0,0 diff --git a/addons/hr_fleet/views/employee_views.xml b/addons/hr_fleet/views/employee_views.xml index 8df6f178e8b..29f38118168 100644 --- a/addons/hr_fleet/views/employee_views.xml +++ b/addons/hr_fleet/views/employee_views.xml @@ -1,5 +1,6 @@ + hr.employee.form.inherit.hr.fleet hr.employee @@ -28,6 +29,18 @@ + + hr.employee.filter.inherit.hr.fleet + hr.employee + + + + + + + + hr.user.preferences.form.inherit.hr.fleet res.users