[IMP] fleet: usability improvements :

- simplifed name of vehicle model; the name is now the model name; the old function
is used to compute the name_get.
- added Suzuki data
- parent of a cost is now hidden except for technical group, because it is the
same as the vehicle
- fixed some vehicule -> vehicle typos

5 files changed, 61 insertions, 58 deletions

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 1b2b96ffbfb..ae2da5ea509 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -110,13 +110,13 @@ class fleet_vehicle_state(osv.Model):
 
 class fleet_vehicle_model(osv.Model):
 
-    def _model_name_get_fnc(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
+    def name_get(self, cr, uid, ids, context=None):
+        res = []
         for record in self.browse(cr, uid, ids, context=context):
-            name = record.modelname
+            name = record.name
             if record.brand_id.name:
-                name = record.brand_id.name + ' / ' + name
-            res[record.id] = name
+                name = record.brand_id.name + '/' + name
+            res.append((record.id, name))
         return res
 
     def on_change_brand(self, cr, uid, ids, model_id, context=None):
@@ -134,8 +134,7 @@ class fleet_vehicle_model(osv.Model):
     _order = 'name asc'
 
     _columns = {
-        'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
-        'modelname': fields.char('Model name', required=True), 
+        'name': fields.char('Model name', required=True),
         'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Make', required=True, help='Make of the vehicle'),
         'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
         'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
@@ -189,7 +188,7 @@ class fleet_vehicle(osv.Model):
     def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
+            res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.name + '/' + record.license_plate
         return res
 
     def return_action_to_open(self, cr, uid, ids, context=None):
diff --git a/addons/fleet/fleet_cars.xml b/addons/fleet/fleet_cars.xml
index dd3b3f6d51a..1c545fd67df 100644
--- a/addons/fleet/fleet_cars.xml
+++ b/addons/fleet/fleet_cars.xml
@@ -261,5 +261,9 @@
       	<field name="name">Willys</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_willys-image.png"/>
       </record>
+      <record id="brand_suzuki" model="fleet.vehicle.model.brand">
+        <field name="name">Suzuki</field>
+        <field name="image" type="base64" file="fleet/static/img/brand_suzuki-image.png"/>
+      </record>
     </data>
 </openerp>
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
index d0d07ade01e..2336c589cf3 100644
--- a/addons/fleet/fleet_data.xml
+++ b/addons/fleet/fleet_data.xml
@@ -449,227 +449,227 @@
       </record>
 
       <record id="model_corsa" model="fleet.vehicle.model">
-          <field name="modelname">Corsa</field>
+          <field name="name">Corsa</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astra" model="fleet.vehicle.model">
-          <field name="modelname">Astra</field>
+          <field name="name">Astra</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_agila" model="fleet.vehicle.model">
-          <field name="modelname">Agila</field>
+          <field name="name">Agila</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_combotour" model="fleet.vehicle.model">
-          <field name="modelname">Combo Tour</field>
+          <field name="name">Combo Tour</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_meriva" model="fleet.vehicle.model">
-          <field name="modelname">Meriva</field>
+          <field name="name">Meriva</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astragtc" model="fleet.vehicle.model">
-          <field name="modelname">AstraGTC</field>
+          <field name="name">AstraGTC</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafira" model="fleet.vehicle.model">
-          <field name="modelname">Zafira</field>
+          <field name="name">Zafira</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafiratourer" model="fleet.vehicle.model">
-          <field name="modelname">Zafira Tourer</field>
+          <field name="name">Zafira Tourer</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_insignia" model="fleet.vehicle.model">
-          <field name="modelname">Insignia</field>
+          <field name="name">Insignia</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_mokka" model="fleet.vehicle.model">
-          <field name="modelname">Mokka</field>
+          <field name="name">Mokka</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_antara" model="fleet.vehicle.model">
-          <field name="modelname">Antara</field>
+          <field name="name">Antara</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_ampera" model="fleet.vehicle.model">
-          <field name="modelname">Ampera</field>
+          <field name="name">Ampera</field>
           <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_a1" model="fleet.vehicle.model">
-          <field name="modelname">A1</field>
+          <field name="name">A1</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a3" model="fleet.vehicle.model">
-          <field name="modelname">A3</field>
+          <field name="name">A3</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a4" model="fleet.vehicle.model">
-          <field name="modelname">A4</field>
+          <field name="name">A4</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a5" model="fleet.vehicle.model">
-          <field name="modelname">A5</field>
+          <field name="name">A5</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a6" model="fleet.vehicle.model">
-          <field name="modelname">A6</field>
+          <field name="name">A6</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a7" model="fleet.vehicle.model">
-          <field name="modelname">A7</field>
+          <field name="name">A7</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a8" model="fleet.vehicle.model">
-          <field name="modelname">A8</field>
+          <field name="name">A8</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q3" model="fleet.vehicle.model">
-          <field name="modelname">Q3</field>
+          <field name="name">Q3</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q5" model="fleet.vehicle.model">
-          <field name="modelname">Q5</field>
+          <field name="name">Q5</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q7" model="fleet.vehicle.model">
-          <field name="modelname">Q7</field>
+          <field name="name">Q7</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_tt" model="fleet.vehicle.model">
-          <field name="modelname">TT</field>
+          <field name="name">TT</field>
           <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_serie1" model="fleet.vehicle.model">
-          <field name="modelname">Serie 1</field>
+          <field name="name">Serie 1</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie3" model="fleet.vehicle.model">
-          <field name="modelname">Serie 3</field>
+          <field name="name">Serie 3</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie5" model="fleet.vehicle.model">
-          <field name="modelname">Serie 5</field>
+          <field name="name">Serie 5</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie6" model="fleet.vehicle.model">
-          <field name="modelname">Serie 6</field>
+          <field name="name">Serie 6</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie7" model="fleet.vehicle.model">
-          <field name="modelname">Serie 7</field>
+          <field name="name">Serie 7</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriex" model="fleet.vehicle.model">
-          <field name="modelname">Serie X</field>
+          <field name="name">Serie X</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriez4" model="fleet.vehicle.model">
-          <field name="modelname">Serie Z4</field>
+          <field name="name">Serie Z4</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriem" model="fleet.vehicle.model">
-          <field name="modelname">Serie M</field>
+          <field name="name">Serie M</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriehybrid" model="fleet.vehicle.model">
-          <field name="modelname">Serie Hybrid</field>
+          <field name="name">Serie Hybrid</field>
           <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_classa" model="fleet.vehicle.model">
-          <field name="modelname">Class A</field>
+          <field name="name">Class A</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classb" model="fleet.vehicle.model">
-          <field name="modelname">Class B</field>
+          <field name="name">Class B</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classc" model="fleet.vehicle.model">
-          <field name="modelname">Class C</field>
+          <field name="name">Class C</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcl" model="fleet.vehicle.model">
-          <field name="modelname">Class CL</field>
+          <field name="name">Class CL</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcls" model="fleet.vehicle.model">
-          <field name="modelname">Class CLS</field>
+          <field name="name">Class CLS</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classe" model="fleet.vehicle.model">
-          <field name="modelname">Class E</field>
+          <field name="name">Class E</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classm" model="fleet.vehicle.model">
-          <field name="modelname">Class M</field>
+          <field name="name">Class M</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classgl" model="fleet.vehicle.model">
-          <field name="modelname">Class GL</field>
+          <field name="name">Class GL</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classglk" model="fleet.vehicle.model">
-          <field name="modelname">Class GLK</field>
+          <field name="name">Class GLK</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classr" model="fleet.vehicle.model">
-          <field name="modelname">Class R</field>
+          <field name="name">Class R</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classs" model="fleet.vehicle.model">
-          <field name="modelname">Class S</field>
+          <field name="name">Class S</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classslk" model="fleet.vehicle.model">
-          <field name="modelname">Class SLK</field>
+          <field name="name">Class SLK</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classsls" model="fleet.vehicle.model">
-          <field name="modelname">SLS</field>
+          <field name="name">SLS</field>
           <field name="brand_id" ref="brand_mercedes" />
       </record>
      </data>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 350d168294f..ed22f2f922d 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -10,7 +10,7 @@
                     <div class="oe_title">
                         <label for="modelname" class="oe_edit_only"/>
                         <h1>
-                            <field name="modelname" />
+                            <field name="name"/>
                         </h1>
                         <label for="brand_id" class="oe_edit_only"/>
                         <h2>
@@ -48,7 +48,7 @@
             <field name="arch" type="xml">
                 <tree string="Models">
                     <field name="brand_id" />
-                    <field name="modelname" />
+                    <field name="name" />
                 </tree>
             </field>
         </record>
@@ -167,10 +167,10 @@
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a vehicule status.
+                Click to create a vehicle status.
               </p><p>
                 You can customize available status to track the evolution of
-                each vehicule. Example: Active, Being Repaired, Sold.
+                each vehicle. Example: Active, Being Repaired, Sold.
               </p>
             </field>
         </record>
@@ -978,7 +978,7 @@
                             </group>
                             <group>
                                 <field name="date"/>
-                                <field name="parent_id"/>
+                                <field name="parent_id" groups="base.group_no_one"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/fleet/static/img/brand_suzuki-image.png b/addons/fleet/static/img/brand_suzuki-image.png
new file mode 100644
index 00000000000..1e00db0a04a
--- /dev/null
+++ b/addons/fleet/static/img/brand_suzuki-image.png