From f581d4ad17bb501adbe4dae41b378b48f99cca14 Mon Sep 17 00:00:00 2001
From: shag-odoo <shag@odoo.com>
Date: Thu, 10 Aug 2023 11:40:29 +0530
Subject: [PATCH] [IMP] fleet: improve the search positioning and add
 filter_domain

Before this commit, the 'Current Driver(Employee)' option was present within the
search menu and appeared as the last choice in the search list.

IMP:
Following this commit, the 'Current Driver(Employee)' is been
removed and all its functionality is implemented in Driver.

closes odoo/odoo#131512

Taskid: 3459896
Signed-off-by: Sofie Gvaladze (sgv) <sgv@odoo.com>
---
 addons/fleet/views/fleet_vehicle_views.xml    | 5 +++--
 addons/hr_fleet/views/fleet_vehicle_views.xml | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index 0720c3485ab..6b165dc6200 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -216,16 +216,17 @@
             <search string="All vehicles">
                 <field string="Vehicle" name="name" filter_domain="['|', ('name', 'ilike', self), ('license_plate', 'ilike', self)]"/>
                 <field string="Drivers" name="log_drivers" filter_domain="[
-                    '|', '|',
+                    '|', '|','|','|',
                     ('log_drivers.driver_id', 'ilike', self),
                     ('driver_id', 'ilike', self),
                     ('future_driver_id', 'ilike', self),
+                    ('driver_employee_id', 'ilike', self),
+                    ('future_driver_employee_id', 'ilike', self),
                 ]"/>
                 <field string="Model" name="model_id"/>
                 <field string="License Plate" name="license_plate"/>
                 <field name="tag_ids"/>
                 <field string="Status" name="state_id"/>
-                <field string="Current Driver" name="driver_id"/>
                 <field string="Properties" name="vehicle_properties"/>
                 <filter string="Available" name="available"
                     domain="['&amp;', ('future_driver_id', '=', False), '|', ('driver_id', '=', False), '|', '&amp;', ('plan_to_change_car', '=', True), ('vehicle_type', '=', 'car'), '&amp;', ('plan_to_change_bike', '=', True), ('vehicle_type', '=', 'bike')]"/>
diff --git a/addons/hr_fleet/views/fleet_vehicle_views.xml b/addons/hr_fleet/views/fleet_vehicle_views.xml
index 7d6db767483..9dfa7faaaa9 100644
--- a/addons/hr_fleet/views/fleet_vehicle_views.xml
+++ b/addons/hr_fleet/views/fleet_vehicle_views.xml
@@ -78,12 +78,10 @@
             <xpath expr="//field[@name='license_plate']" position="after">
                 <field name="mobility_card"/>
             </xpath>
-            <xpath expr="//field[@name='driver_id']" position="after">
-                <field name="driver_employee_id" string="Current Driver (Employee)"/>
-            </xpath>
             <xpath expr="//field[@name='log_drivers']" position="attributes">
                 <attribute name="filter_domain">[
-                    '|', '|', '|', '|',
+                    '|', '|', '|', '|','|',
+                    ('log_drivers.driver_employee_id.name', 'ilike', self),
                     ('log_drivers.driver_id.name', 'ilike', self),
                     ('driver_id.name', 'ilike', self),
                     ('future_driver_id.name', 'ilike', self),