From e85763d982b3a6985125a4e7eb00d1d4b264bd09 Mon Sep 17 00:00:00 2001
From: William Braeckman <wbr@odoo.com>
Date: Mon, 10 May 2021 14:04:49 +0000
Subject: [PATCH] [IMP] fleet: minor changes to views

Adds two new columns to the vehicle model tree view.
Changes the name of the vehicle model action.
Modifies the order by which vehicle manufacturers are ordered.
Adds filter and modify goupby on vehicle, vehicle model/brand.

Task ID: 2487706
---
 addons/fleet/models/fleet_vehicle_model.py       | 2 +-
 addons/fleet/views/fleet_vehicle_model_views.xml | 5 +++--
 addons/fleet/views/fleet_vehicle_views.xml       | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/fleet/models/fleet_vehicle_model.py b/addons/fleet/models/fleet_vehicle_model.py
index 9ab82bfaac9..82178360220 100644
--- a/addons/fleet/models/fleet_vehicle_model.py
+++ b/addons/fleet/models/fleet_vehicle_model.py
@@ -52,7 +52,7 @@ class FleetVehicleModel(models.Model):
 class FleetVehicleModelBrand(models.Model):
     _name = 'fleet.vehicle.model.brand'
     _description = 'Brand of the vehicle'
-    _order = 'model_count desc, name asc'
+    _order = 'name asc'
 
     name = fields.Char('Make', required=True)
     image_128 = fields.Image("Logo", max_width=128, max_height=128)
diff --git a/addons/fleet/views/fleet_vehicle_model_views.xml b/addons/fleet/views/fleet_vehicle_model_views.xml
index c110e812106..e4637bbf8de 100644
--- a/addons/fleet/views/fleet_vehicle_model_views.xml
+++ b/addons/fleet/views/fleet_vehicle_model_views.xml
@@ -68,6 +68,7 @@
             <tree string="Models">
                 <field name="brand_id" />
                 <field name="name" />
+                <field name="vehicle_count" string="Vehicles"/>
                 <field name="category_id" optional="show"/>
                 <field name="vehicle_type" optional="show"/>
             </tree>
@@ -98,14 +99,14 @@
             <search string="Vehicles costs" >
                 <field name="brand_id" />
                 <group expand="1" string="Group By">
-                    <filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Make"/>
+                    <filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Contains Vehicles"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id='fleet_vehicle_model_action' model='ir.actions.act_window'>
-        <field name="name">Vehicles Model</field>
+        <field name="name">Models</field>
         <field name="res_model">fleet.vehicle.model</field>
         <field name="view_mode">tree,form</field>
         <field name="context">{"search_default_groupby_brand" : True,}</field>
diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index d625197cec7..b7b27db5d4b 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -193,6 +193,7 @@
                     <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'}"/>
+                    <filter string="Fuel Type" name="groupby_fueltype" context="{'group_by': 'fuel_type'}"/>
                 </group>
            </search>
         </field>