From c972b62b3c8a7d6def39dc4bb90e8d879adc3602 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 8 Oct 2018 09:55:20 +0000
Subject: [PATCH] [IMP] fleet: Load fleet vehicles as data instead of demo data

Purpose
=======

In the fleet module, Models & Brand are in demo data. It should be loaded as regular data.

closes odoo/odoo#27524
---
 addons/fleet/data/fleet_cars_data.xml | 180 +++++++++++++++++++++
 addons/fleet/data/fleet_demo.xml      | 225 --------------------------
 2 files changed, 180 insertions(+), 225 deletions(-)

diff --git a/addons/fleet/data/fleet_cars_data.xml b/addons/fleet/data/fleet_cars_data.xml
index 6e6b2081752..34412ec64c2 100644
--- a/addons/fleet/data/fleet_cars_data.xml
+++ b/addons/fleet/data/fleet_cars_data.xml
@@ -264,4 +264,184 @@
         <field name="name">Suzuki</field>
         <field name="image" type="base64" file="fleet/static/img/brand_suzuki-image.png"/>
       </record>
+      <record id="model_corsa" model="fleet.vehicle.model">
+          <field name="name">Corsa</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_astra" model="fleet.vehicle.model">
+          <field name="name">Astra</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_agila" model="fleet.vehicle.model">
+          <field name="name">Agila</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_combotour" model="fleet.vehicle.model">
+          <field name="name">Combo Tour</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_meriva" model="fleet.vehicle.model">
+          <field name="name">Meriva</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_astragtc" model="fleet.vehicle.model">
+          <field name="name">AstraGTC</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_zafira" model="fleet.vehicle.model">
+          <field name="name">Zafira</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_zafiratourer" model="fleet.vehicle.model">
+          <field name="name">Zafira Tourer</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_insignia" model="fleet.vehicle.model">
+          <field name="name">Insignia</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_mokka" model="fleet.vehicle.model">
+          <field name="name">Mokka</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_antara" model="fleet.vehicle.model">
+          <field name="name">Antara</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_ampera" model="fleet.vehicle.model">
+          <field name="name">Ampera</field>
+          <field name="brand_id" ref="brand_opel" />
+      </record>
+      <record id="model_a1" model="fleet.vehicle.model">
+          <field name="name">A1</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a3" model="fleet.vehicle.model">
+          <field name="name">A3</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a4" model="fleet.vehicle.model">
+          <field name="name">A4</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a5" model="fleet.vehicle.model">
+          <field name="name">A5</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a6" model="fleet.vehicle.model">
+          <field name="name">A6</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a7" model="fleet.vehicle.model">
+          <field name="name">A7</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_a8" model="fleet.vehicle.model">
+          <field name="name">A8</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_q3" model="fleet.vehicle.model">
+          <field name="name">Q3</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_q5" model="fleet.vehicle.model">
+          <field name="name">Q5</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_q7" model="fleet.vehicle.model">
+          <field name="name">Q7</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_tt" model="fleet.vehicle.model">
+          <field name="name">TT</field>
+          <field name="brand_id" ref="brand_audi" />
+      </record>
+      <record id="model_serie1" model="fleet.vehicle.model">
+          <field name="name">Serie 1</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_serie3" model="fleet.vehicle.model">
+          <field name="name">Serie 3</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_serie5" model="fleet.vehicle.model">
+          <field name="name">Serie 5</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_serie6" model="fleet.vehicle.model">
+          <field name="name">Serie 6</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_serie7" model="fleet.vehicle.model">
+          <field name="name">Serie 7</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_seriex" model="fleet.vehicle.model">
+          <field name="name">Serie X</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_seriez4" model="fleet.vehicle.model">
+          <field name="name">Serie Z4</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_seriem" model="fleet.vehicle.model">
+          <field name="name">Serie M</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_seriehybrid" model="fleet.vehicle.model">
+          <field name="name">Serie Hybrid</field>
+          <field name="brand_id" ref="brand_bmw" />
+      </record>
+      <record id="model_classa" model="fleet.vehicle.model">
+          <field name="name">Class A</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classb" model="fleet.vehicle.model">
+          <field name="name">Class B</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classc" model="fleet.vehicle.model">
+          <field name="name">Class C</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classcl" model="fleet.vehicle.model">
+          <field name="name">Class CL</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classcls" model="fleet.vehicle.model">
+          <field name="name">Class CLS</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classe" model="fleet.vehicle.model">
+          <field name="name">Class E</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classm" model="fleet.vehicle.model">
+          <field name="name">Class M</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classgl" model="fleet.vehicle.model">
+          <field name="name">Class GL</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classglk" model="fleet.vehicle.model">
+          <field name="name">Class GLK</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classr" model="fleet.vehicle.model">
+          <field name="name">Class R</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classs" model="fleet.vehicle.model">
+          <field name="name">Class S</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classslk" model="fleet.vehicle.model">
+          <field name="name">Class SLK</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
+      <record id="model_classsls" model="fleet.vehicle.model">
+          <field name="name">SLS</field>
+          <field name="brand_id" ref="brand_mercedes" />
+      </record>
 </odoo>
diff --git a/addons/fleet/data/fleet_demo.xml b/addons/fleet/data/fleet_demo.xml
index 422a05c4810..c8815df3340 100644
--- a/addons/fleet/data/fleet_demo.xml
+++ b/addons/fleet/data/fleet_demo.xml
@@ -446,231 +446,6 @@
         <field name="color" eval="8"/>
       </record>
 
-      <record id="model_corsa" model="fleet.vehicle.model">
-          <field name="name">Corsa</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_astra" model="fleet.vehicle.model">
-          <field name="name">Astra</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_agila" model="fleet.vehicle.model">
-          <field name="name">Agila</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_combotour" model="fleet.vehicle.model">
-          <field name="name">Combo Tour</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_meriva" model="fleet.vehicle.model">
-          <field name="name">Meriva</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_astragtc" model="fleet.vehicle.model">
-          <field name="name">AstraGTC</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafira" model="fleet.vehicle.model">
-          <field name="name">Zafira</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafiratourer" model="fleet.vehicle.model">
-          <field name="name">Zafira Tourer</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_insignia" model="fleet.vehicle.model">
-          <field name="name">Insignia</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_mokka" model="fleet.vehicle.model">
-          <field name="name">Mokka</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_antara" model="fleet.vehicle.model">
-          <field name="name">Antara</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_ampera" model="fleet.vehicle.model">
-          <field name="name">Ampera</field>
-          <field name="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_a1" model="fleet.vehicle.model">
-          <field name="name">A1</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a3" model="fleet.vehicle.model">
-          <field name="name">A3</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a4" model="fleet.vehicle.model">
-          <field name="name">A4</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a5" model="fleet.vehicle.model">
-          <field name="name">A5</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a6" model="fleet.vehicle.model">
-          <field name="name">A6</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a7" model="fleet.vehicle.model">
-          <field name="name">A7</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a8" model="fleet.vehicle.model">
-          <field name="name">A8</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_q3" model="fleet.vehicle.model">
-          <field name="name">Q3</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_q5" model="fleet.vehicle.model">
-          <field name="name">Q5</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_q7" model="fleet.vehicle.model">
-          <field name="name">Q7</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_tt" model="fleet.vehicle.model">
-          <field name="name">TT</field>
-          <field name="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_serie1" model="fleet.vehicle.model">
-          <field name="name">Serie 1</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie3" model="fleet.vehicle.model">
-          <field name="name">Serie 3</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie5" model="fleet.vehicle.model">
-          <field name="name">Serie 5</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie6" model="fleet.vehicle.model">
-          <field name="name">Serie 6</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie7" model="fleet.vehicle.model">
-          <field name="name">Serie 7</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriex" model="fleet.vehicle.model">
-          <field name="name">Serie X</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriez4" model="fleet.vehicle.model">
-          <field name="name">Serie Z4</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriem" model="fleet.vehicle.model">
-          <field name="name">Serie M</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriehybrid" model="fleet.vehicle.model">
-          <field name="name">Serie Hybrid</field>
-          <field name="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_classa" model="fleet.vehicle.model">
-          <field name="name">Class A</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classb" model="fleet.vehicle.model">
-          <field name="name">Class B</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classc" model="fleet.vehicle.model">
-          <field name="name">Class C</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcl" model="fleet.vehicle.model">
-          <field name="name">Class CL</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcls" model="fleet.vehicle.model">
-          <field name="name">Class CLS</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classe" model="fleet.vehicle.model">
-          <field name="name">Class E</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classm" model="fleet.vehicle.model">
-          <field name="name">Class M</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classgl" model="fleet.vehicle.model">
-          <field name="name">Class GL</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classglk" model="fleet.vehicle.model">
-          <field name="name">Class GLK</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classr" model="fleet.vehicle.model">
-          <field name="name">Class R</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classs" model="fleet.vehicle.model">
-          <field name="name">Class S</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classslk" model="fleet.vehicle.model">
-          <field name="name">Class SLK</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classsls" model="fleet.vehicle.model">
-          <field name="name">SLS</field>
-          <field name="brand_id" ref="brand_mercedes" />
-      </record>
-
       <record id="vehicle_1" model="fleet.vehicle">
           <field name="license_plate">1-ACK-205</field>
           <field name="vin_sn">5454541</field>