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

[IMP] fleet: improve the search positioning and add filter_domain

Browse Source 
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>
This commit is contained in:
shag-odoo
2023-09-05 19:58:00 +00:00
parent 6aa3a1e243
commit f581d4ad17
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/views/fleet_vehicle_views.xml
+3 -2
View File
@@ -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')]"/>
addons/hr_fleet/views/fleet_vehicle_views.xml
+2 -4
View File
@@ -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),