From 43d209104ae4bd1a04ceae26d46db751ec38969d Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 7 Dec 2012 16:58:18 +0500
Subject: [PATCH] [FIX] Corrected latest merge issue, For fleet.

bzr revid: tta@openerp.com-20121207115818-ycyrswd38ybtdn9j
---
 addons/fleet/fleet_data.xml | 90 ++++++++++++++++++-------------------
 addons/fleet/fleet_view.xml |  2 +-
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
index f3975f5a580..54be46c90fe 100644
--- a/addons/fleet/fleet_data.xml
+++ b/addons/fleet/fleet_data.xml
@@ -439,227 +439,227 @@
 
       <record id="model_corsa" model="fleet.vehicle.model">
           <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astra" model="fleet.vehicle.model">
           <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_agila" model="fleet.vehicle.model">
           <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_combotour" model="fleet.vehicle.model">
           <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_meriva" model="fleet.vehicle.model">
           <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astragtc" model="fleet.vehicle.model">
           <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafira" model="fleet.vehicle.model">
           <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafiratourer" model="fleet.vehicle.model">
           <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_insignia" model="fleet.vehicle.model">
           <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_mokka" model="fleet.vehicle.model">
           <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_antara" model="fleet.vehicle.model">
           <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_ampera" model="fleet.vehicle.model">
           <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_a1" model="fleet.vehicle.model">
           <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a3" model="fleet.vehicle.model">
           <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a4" model="fleet.vehicle.model">
           <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a5" model="fleet.vehicle.model">
           <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a6" model="fleet.vehicle.model">
           <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a7" model="fleet.vehicle.model">
           <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a8" model="fleet.vehicle.model">
           <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q3" model="fleet.vehicle.model">
           <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q5" model="fleet.vehicle.model">
           <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q7" model="fleet.vehicle.model">
           <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_tt" model="fleet.vehicle.model">
           <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_serie1" model="fleet.vehicle.model">
           <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie3" model="fleet.vehicle.model">
           <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie5" model="fleet.vehicle.model">
           <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie6" model="fleet.vehicle.model">
           <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie7" model="fleet.vehicle.model">
           <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriex" model="fleet.vehicle.model">
           <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriez4" model="fleet.vehicle.model">
           <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriem" model="fleet.vehicle.model">
           <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriehybrid" model="fleet.vehicle.model">
           <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_classa" model="fleet.vehicle.model">
           <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classb" model="fleet.vehicle.model">
           <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classc" model="fleet.vehicle.model">
           <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcl" model="fleet.vehicle.model">
           <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcls" model="fleet.vehicle.model">
           <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classe" model="fleet.vehicle.model">
           <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classm" model="fleet.vehicle.model">
           <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classgl" model="fleet.vehicle.model">
           <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classglk" model="fleet.vehicle.model">
           <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classr" model="fleet.vehicle.model">
           <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classs" model="fleet.vehicle.model">
           <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classslk" model="fleet.vehicle.model">
           <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classsls" model="fleet.vehicle.model">
           <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
      </data>
 </openerp>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index cf2a12ef33e..4d4c74fd297 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -15,7 +15,7 @@
                             </h1>
                             <label for="brand" class="oe_edit_only"/>
                             <h2>
-                                <field name="brand" on_change="on_change_brand(brand)"/>
+                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </h2>
                         </div>
                         <notebook>