From 556c1237a264b57448977d6719c4843eca215d34 Mon Sep 17 00:00:00 2001
From: William Braeckman <wbr@odoo.com>
Date: Tue, 19 Oct 2021 13:13:38 +0000
Subject: [PATCH] [IMP] fleet: reorder/reword fuel types

There was some confusion about all the types of hybrid vehicles.
Also changes the order in which they are displayed.

TaskId-2629318

closes odoo/odoo#82672

X-original-commit: 73171da60059c85355e8675061db485e84aedb05
Related: odoo/enterprise#23460
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/fleet/i18n/fleet.pot                | 14 +++++++-------
 addons/fleet/models/fleet_vehicle_model.py | 14 ++++++++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 4c1ed24be33..f06190d2a15 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -845,12 +845,6 @@ msgstr ""
 msgid "Fuel Used by the vehicle"
 msgstr ""
 
-#. module: fleet
-#: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle__fuel_type__full_hybrid_gasoline
-#: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle_model__default_fuel_type__full_hybrid_gasoline
-msgid "Full Hybrid Gasoline"
-msgstr ""
-
 #. module: fleet
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
@@ -914,7 +908,13 @@ msgstr ""
 #. module: fleet
 #: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle__fuel_type__hybrid
 #: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle_model__default_fuel_type__hybrid
-msgid "Hybrid"
+msgid "Hybrid Diesel"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle__fuel_type__full_hybrid_gasoline
+#: model:ir.model.fields.selection,name:fleet.selection__fleet_vehicle_model__default_fuel_type__full_hybrid_gasoline
+msgid "Hybrid Gasoline"
 msgstr ""
 
 #. module: fleet
diff --git a/addons/fleet/models/fleet_vehicle_model.py b/addons/fleet/models/fleet_vehicle_model.py
index c3e61f4ebca..5e7c18c3be9 100644
--- a/addons/fleet/models/fleet_vehicle_model.py
+++ b/addons/fleet/models/fleet_vehicle_model.py
@@ -5,10 +5,16 @@ from odoo import _, api, fields, models
 
 
 FUEL_TYPES = [
-    ('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('lpg', 'LPG'),
-    ('electric', 'Electric'), ('hybrid', 'Hybrid'), ('plug_in_hybrid_diesel', 'Plug-in Hybrid Diesel'),
-    ('plug_in_hybrid_gasoline', 'Plug-in Hybrid Gasoline'), ('full_hybrid_gasoline', 'Full Hybrid Gasoline'),
-    ('cng', 'CNG'), ('hydrogen', 'Hydrogen'),
+    ('diesel', 'Diesel'),
+    ('gasoline', 'Gasoline'),
+    ('hybrid', 'Hybrid Diesel'),
+    ('full_hybrid_gasoline', 'Hybrid Gasoline'),
+    ('plug_in_hybrid_diesel', 'Plug-in Hybrid Diesel'),
+    ('plug_in_hybrid_gasoline', 'Plug-in Hybrid Gasoline'),
+    ('cng', 'CNG'),
+    ('lpg', 'LPG'),
+    ('hydrogen', 'Hydrogen'),
+    ('electric', 'Electric'),
 ]
 
 class FleetVehicleModel(models.Model):