From 61c9f6aec0cb8e6d3996ef539faa233b262d3ef8 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 12 Aug 2022 14:00:15 +0000
Subject: [PATCH] [IMP] (hr_)fleet: Improve vehicle search view

Purpose
=======

Avoid having too many search for, lead the end user to use the main one.

closes odoo/odoo#98096

Taskid: 2937036
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/fleet/views/fleet_vehicle_views.xml    |  9 +++++++--
 addons/hr_fleet/views/fleet_vehicle_views.xml | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index dd9fcfb3ac7..014ce641649 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -206,12 +206,17 @@
         <field name="arch" type="xml">
             <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.name', 'ilike', self)]"/>
-                <field string="Current Driver" name="driver_id"/>
+                <field string="Drivers" name="log_drivers" filter_domain="[
+                    '|', '|',
+                    ('log_drivers.driver_id', 'ilike', self),
+                    ('driver_id', 'ilike', self),
+                    ('future_driver_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"/>
                 <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')]"/>
                 <filter string="Bikes" name="bikes" domain="[('vehicle_type', '=', 'bike')]"/>
diff --git a/addons/hr_fleet/views/fleet_vehicle_views.xml b/addons/hr_fleet/views/fleet_vehicle_views.xml
index e9d01f89c63..af10cd2542e 100644
--- a/addons/hr_fleet/views/fleet_vehicle_views.xml
+++ b/addons/hr_fleet/views/fleet_vehicle_views.xml
@@ -75,10 +75,21 @@
         <field name="model">fleet.vehicle</field>
         <field name="inherit_id" ref="fleet.fleet_vehicle_view_search"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='driver_id']" position="after">
+            <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)"/>
-                <field name="future_driver_employee_id" string="Future Driver (Employee)"/>
+            </xpath>
+            <xpath expr="//field[@name='log_drivers']" position="attributes">
+                <attribute name="filter_domain">[
+                    '|', '|', '|', '|',
+                    ('log_drivers.driver_id.name', 'ilike', self),
+                    ('driver_id.name', 'ilike', self),
+                    ('future_driver_id.name', 'ilike', self),
+                    ('driver_employee_id.name', 'ilike', self),
+                    ('future_driver_employee_id.name', 'ilike', self),
+                ]</attribute>
             </xpath>
         </field>
     </record>