19.0 vanilla

odoo-bringout-oca-ocb-hr_fleet/hr_fleet/models/fleet_vehicle.py

@@ -1,9 +1,9 @@
-# -*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
+
 class FleetVehicle(models.Model):
     _inherit = 'fleet.vehicle'
 
@@ -13,6 +13,7 @@ class FleetVehicle(models.Model):
         compute='_compute_driver_employee_id', store=True,
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
         tracking=True,
+        index='btree_not_null',
     )
     driver_employee_name = fields.Char(related="driver_employee_id.name")
     future_driver_employee_id = fields.Many2one(
@@ -24,30 +25,38 @@ class FleetVehicle(models.Model):
 
     @api.depends('driver_id')
     def _compute_driver_employee_id(self):
+        employees_by_partner_id_and_company_id = self.env['hr.employee']._read_group(
+            domain=[('work_contact_id', 'in', self.driver_id.ids)],
+            groupby=['work_contact_id', 'company_id'],
+            aggregates=['id:recordset']
+        )
+        employees_by_partner_id_and_company_id = {
+            (partner, company): employee for partner, company, employee in employees_by_partner_id_and_company_id
+        }
         for vehicle in self:
-            if vehicle.driver_id:
-                vehicle.driver_employee_id = self.env['hr.employee'].search([
-                    ('address_home_id', '=', vehicle.driver_id.id),
-                ], limit=1)
-            else:
-                vehicle.driver_employee_id = False
+            employees = employees_by_partner_id_and_company_id.get((vehicle.driver_id, vehicle.company_id))
+            vehicle.driver_employee_id = employees[0] if employees else False
 
     @api.depends('future_driver_id')
     def _compute_future_driver_employee_id(self):
+        employees_by_partner_id_and_company_id = self.env['hr.employee']._read_group(
+            domain=[('work_contact_id', 'in', self.future_driver_id.ids)],
+            groupby=['work_contact_id', 'company_id'],
+            aggregates=['id:recordset']
+        )
+        employees_by_partner_id_and_company_id = {
+            (partner, company): employee for partner, company, employee in employees_by_partner_id_and_company_id
+        }
         for vehicle in self:
-            if vehicle.future_driver_id:
-                vehicle.future_driver_employee_id = self.env['hr.employee'].search([
-                    ('address_home_id', '=', vehicle.future_driver_id.id),
-                ], limit=1)
-            else:
-                vehicle.future_driver_employee_id = False
+            employees = employees_by_partner_id_and_company_id.get((vehicle.future_driver_id, vehicle.company_id))
+            vehicle.future_driver_employee_id = employees[0] if employees else False
 
     @api.depends('driver_id')
     def _compute_mobility_card(self):
         for vehicle in self:
             employee = self.env['hr.employee']
             if vehicle.driver_id:
-                employee = employee.search([('address_home_id', '=', vehicle.driver_id.id)], limit=1)
+                employee = employee.search([('work_contact_id', '=', vehicle.driver_id.id)], limit=1)
                 if not employee:
                     employee = employee.search([('user_id.partner_id', '=', vehicle.driver_id.id)], limit=1)
             vehicle.mobility_card = employee.mobility_card
@@ -57,7 +66,7 @@ class FleetVehicle(models.Model):
             partner = False
             if vals['driver_employee_id']:
                 employee = self.env['hr.employee'].sudo().browse(vals['driver_employee_id'])
-                partner = employee.address_home_id.id
+                partner = employee.work_contact_id.id
             vals['driver_id'] = partner
         elif 'driver_id' in vals:
             # Reverse the process if we can find a single employee
@@ -65,7 +74,7 @@ class FleetVehicle(models.Model):
             if vals['driver_id']:
                 # Limit to 2, we only care about the first one if he is the only one
                 employee_ids = self.env['hr.employee'].sudo().search([
-                    ('address_home_id', '=', vals['driver_id'])
+                    ('work_contact_id', '=', vals['driver_id'])
                 ], limit=2)
                 if len(employee_ids) == 1:
                     employee = employee_ids[0].id
@@ -76,7 +85,7 @@ class FleetVehicle(models.Model):
             partner = False
             if vals['future_driver_employee_id']:
                 employee = self.env['hr.employee'].sudo().browse(vals['future_driver_employee_id'])
-                partner = employee.address_home_id.id
+                partner = employee.work_contact_id.id
             vals['future_driver_id'] = partner
         elif 'future_driver_id' in vals:
             # Reverse the process if we can find a single employee
@@ -84,7 +93,7 @@ class FleetVehicle(models.Model):
             if vals['future_driver_id']:
                 # Limit to 2, we only care about the first one if he is the only one
                 employee_ids = self.env['hr.employee'].sudo().search([
-                    ('address_home_id', '=', vals['future_driver_id'])
+                    ('work_contact_id', '=', vals['future_driver_id'])
                 ], limit=2)
                 if len(employee_ids) == 1:
                     employee = employee_ids[0].id
@@ -120,5 +129,5 @@ class FleetVehicle(models.Model):
 
     def open_assignation_logs(self):
         action = super().open_assignation_logs()
-        action['views'] = [[self.env.ref('hr_fleet.fleet_vehicle_assignation_log_view_list').id, 'tree']]
+        action['views'] = [[self.env.ref('hr_fleet.fleet_vehicle_assignation_log_view_list').id, 'list']]
         return action