pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] (hr_)fleet: Improve vehicle search view

Browse Source 
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>
This commit is contained in:
Yannick Tivisse
2022-08-16 08:07:13 +02:00
parent 23220de37e
commit 61c9f6aec0
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/views/fleet_vehicle_views.xml
+7 -2
View File
@@ -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')]"/>
addons/hr_fleet/views/fleet_vehicle_views.xml
+13 -2
View File
@@ -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>