diff options
| author | lbs-odoo <lbs@odoo.com> | 2019-07-17 10:31:16 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-08-16 13:35:21 +0000 |
| commit | 9a0fedfc657a71cd79aad03b562d6bc1b762422d (patch) | |
| tree | 27440e67b7dba9e7e31d4468652d6abfeebc2f39 /addons/fleet | |
| parent | bf347e7727b477575c4a2230ac01e25f9d08270e (diff) | |
[IMP] various: improve searchviews UX
Improve searchviews UX in all the modules
TaskID: 2029731
closes odoo/odoo#35700
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/fleet')
| -rw-r--r-- | addons/fleet/views/fleet_vehicle_cost_views.xml | 19 | ||||
| -rw-r--r-- | addons/fleet/views/fleet_vehicle_views.xml | 32 |
2 files changed, 26 insertions, 25 deletions
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml index 451f340d538..45511641bbe 100644 --- a/addons/fleet/views/fleet_vehicle_cost_views.xml +++ b/addons/fleet/views/fleet_vehicle_cost_views.xml @@ -334,26 +334,27 @@ <field name="model">fleet.vehicle.log.contract</field> <field name="arch" type="xml"> <search string="Vehicles Contracts"> - <field name="vehicle_id" string="Vehicle" filter_domain="[('vehicle_id.name','ilike', self)]"/> - <field name="purchaser_id" string="Driver" filter_domain="[('purchaser_id','child_of', self)]"/> - <field name="insurer_id" string="Vendor" filter_domain="[('insurer_id','child_of', self)]"/> + <field name="vehicle_id" string="Vehicle" filter_domain="[('vehicle_id.name', 'ilike', self)]"/> + <field name="purchaser_id" string="Driver" filter_domain="[('purchaser_id', 'child_of', self)]"/> + <field name="insurer_id" string="Vendor" filter_domain="[('insurer_id', 'child_of', self)]"/> <field name="cost_subtype_id" string="Service Type" filter_domain="[('cost_ids.cost_subtype_id', 'ilike', self)]"/> - <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> - <filter string="In Progress" name="open" domain="[('state', 'in', ['open','diesoon'])]"/> + <filter string="In Progress" name="open" domain="[('state', 'in', ['open', 'diesoon'])]"/> <filter string="Expired" name="expired" domain="[('state', '=', 'expired')]"/> <filter string="Expiring Soon" name="expire_soon" domain="[('state', '=', 'diesoon')]"/> + <separator/> + <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/> + <separator/> <filter invisible="1" string="Late Activities" name="activities_overdue" domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" help="Show all records which has next action date is before today"/> <filter invisible="1" string="Today Activities" name="activities_today" domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> <filter invisible="1" string="Future Activities" name="activities_upcoming_all" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) - ]"/> + domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> <filter string="Exception Activities" name="activities_exception" - domain="[('activity_exception_decoration', '!=', False)]"/> + domain="[('activity_exception_decoration', '!=', False)]"/> <group expand="0" string="Group By"> - <filter string="Vehicle" name="vehicle" context="{'group_by':'vehicle_id'}"/> + <filter string="Vehicle" name="vehicle" context="{'group_by': 'vehicle_id'}"/> </group> </search> </field> diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml index d0f175358d3..ee8ead77a26 100644 --- a/addons/fleet/views/fleet_vehicle_views.xml +++ b/addons/fleet/views/fleet_vehicle_views.xml @@ -166,34 +166,34 @@ <field name="model">fleet.vehicle</field> <field name="arch" type="xml"> <search string="All vehicles"> - <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/> - <field name="log_drivers" filter_domain="[('log_drivers.driver_id.name', 'ilike', self)]" string="Drivers History"/> - <field name="driver_id"/> + <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 name="future_driver_id"/> <field name="tag_ids"/> <field name="location"/> - <field name="state_id"/> - <filter name="available" string="Is Available" + <field string="Status" name="state_id"/> + <filter string="Available" name="available" domain="['&', ('future_driver_id', '=', False), '|', ('driver_id', '=', False), ('plan_to_change_car', '=', True)]"/> <filter name="planned" string="Planned for Change" domain="[('plan_to_change_car', '=', True)]"/> <separator/> - <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/> + <filter string="Need Action" name="alert_true" domain="['|', ('contract_renewal_due_soon', '=', True), ('contract_renewal_overdue', '=', True)]"/> + <separator/> + <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/> <separator/> - <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> <filter invisible="1" string="Late Activities" name="activities_overdue" domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" help="Show all records which has next action date is before today"/> <filter invisible="1" string="Today Activities" name="activities_today" domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> <filter invisible="1" string="Future Activities" name="activities_upcoming_all" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) - ]"/> + domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> <filter string="Exception Activities" name="activities_exception" - domain="[('activity_exception_decoration', '!=', False)]"/> + domain="[('activity_exception_decoration', '!=', False)]"/> <group expand="1" string="Group By"> - <filter name="groupby_status" context="{'group_by' : 'state_id'}" string="Status"/> - <filter name="groupby_model" context="{'group_by' : 'model_id'}" string="Model"/> - <filter name="groupby_make" context="{'group_by' : 'brand_id'}" string="Make"/> + <filter string="Status" name="groupby_status" context="{'group_by': 'state_id'}"/> + <filter string="Model" name="groupby_model" context="{'group_by': 'model_id'}"/> + <filter string="Brand" name="groupby_make" context="{'group_by': 'brand_id'}"/> </group> </search> </field> @@ -369,12 +369,12 @@ <field name="model">fleet.vehicle.odometer</field> <field name="arch" type="xml"> <search string="Vehicles odometers" > - <field name="vehicle_id" /> + <field name="vehicle_id"/> + <field name="driver_id"/> <field name="value"/> - <field name="unit"/> <field name="date"/> <group expand="0" string="Group By"> - <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/> + <filter name="groupby_vehicle" context="{'group_by': 'vehicle_id'}" string="Vehicle"/> </group> </search> </field> |
