From 0828aad424e0c50816af5035776fb33159d9770c Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 23 Nov 2012 17:35:53 +0530
Subject: [PATCH 1/9] [IMP] % in one line

bzr revid: shp@tinyerp.com-20121123120553-i1svfz5177fo86f1
---
 addons/sale/wizard/sale_make_invoice_advance.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 17821f519a6..2decdd60f0b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -22,9 +22,9 @@
                         <label for="amount" attrs="{'invisible': [('advance_payment_method', 'not in', ('fixed','percentage'))]}"/>
                         <div attrs="{'invisible': [('advance_payment_method', 'not in', ('fixed','percentage'))]}">
                             <field name="amount"
-                                attrs="{'required': [('advance_payment_method', 'in', ('fixed','percentage'))]}"/>
+                                attrs="{'required': [('advance_payment_method', 'in', ('fixed','percentage'))]}" class="oe_inline"/>
                             <label string="%%"
-                                attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}"/>
+                                attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}" class="oe_inline"/>
                         </div>
                     </group>
                     <div>

From e200cda4f66a6fa787344d78d29359f00e192593 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 26 Nov 2012 11:42:49 +0530
Subject: [PATCH 2/9] [IMP] fleet: made model & brand record addded through
 data instead of demo

bzr revid: cha@tinyerp.com-20121126061249-667azhwzvjm323oi
---
 addons/fleet/__openerp__.py |   3 +-
 addons/fleet/fleet_data.xml | 225 ++++++++++++++++++++++++++++++++++++
 addons/fleet/fleet_demo.xml | 225 ------------------------------------
 3 files changed, 227 insertions(+), 226 deletions(-)

diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 3a40e7dfc0a..8a4761867da 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -49,12 +49,13 @@ Main Features
     ],
     'data' : [
         'fleet_view.xml',
+        'fleet_cars.xml',
         'fleet_data.xml',
         'fleet_board_view.xml',
     ],
     'update_xml' : ['security/ir.model.access.csv'],
 
-    'demo': ['fleet_cars.xml','fleet_demo.xml'],
+    'demo': ['fleet_demo.xml'],
 
     'installable' : True,
     'application' : True,
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
index 9b8ebb19e19..f3975f5a580 100644
--- a/addons/fleet/fleet_data.xml
+++ b/addons/fleet/fleet_data.xml
@@ -436,5 +436,230 @@
       <record id="vehicle_tag_break" model="fleet.vehicle.tag" >
         <field name="name">Break</field>
       </record>
+
+      <record id="model_corsa" model="fleet.vehicle.model">
+          <field name="modelname">Corsa</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astra" model="fleet.vehicle.model">
+          <field name="modelname">Astra</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_agila" model="fleet.vehicle.model">
+          <field name="modelname">Agila</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_combotour" model="fleet.vehicle.model">
+          <field name="modelname">Combo Tour</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_meriva" model="fleet.vehicle.model">
+          <field name="modelname">Meriva</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astragtc" model="fleet.vehicle.model">
+          <field name="modelname">AstraGTC</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafira" model="fleet.vehicle.model">
+          <field name="modelname">Zafira</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafiratourer" model="fleet.vehicle.model">
+          <field name="modelname">Zafira Tourer</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_insignia" model="fleet.vehicle.model">
+          <field name="modelname">Insignia</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_mokka" model="fleet.vehicle.model">
+          <field name="modelname">Mokka</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_antara" model="fleet.vehicle.model">
+          <field name="modelname">Antara</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_ampera" model="fleet.vehicle.model">
+          <field name="modelname">Ampera</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_a1" model="fleet.vehicle.model">
+          <field name="modelname">A1</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a3" model="fleet.vehicle.model">
+          <field name="modelname">A3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a4" model="fleet.vehicle.model">
+          <field name="modelname">A4</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a5" model="fleet.vehicle.model">
+          <field name="modelname">A5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a6" model="fleet.vehicle.model">
+          <field name="modelname">A6</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a7" model="fleet.vehicle.model">
+          <field name="modelname">A7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a8" model="fleet.vehicle.model">
+          <field name="modelname">A8</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q3" model="fleet.vehicle.model">
+          <field name="modelname">Q3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q5" model="fleet.vehicle.model">
+          <field name="modelname">Q5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q7" model="fleet.vehicle.model">
+          <field name="modelname">Q7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_tt" model="fleet.vehicle.model">
+          <field name="modelname">TT</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_serie1" model="fleet.vehicle.model">
+          <field name="modelname">Serie 1</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie3" model="fleet.vehicle.model">
+          <field name="modelname">Serie 3</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie5" model="fleet.vehicle.model">
+          <field name="modelname">Serie 5</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie6" model="fleet.vehicle.model">
+          <field name="modelname">Serie 6</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie7" model="fleet.vehicle.model">
+          <field name="modelname">Serie 7</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriex" model="fleet.vehicle.model">
+          <field name="modelname">Serie X</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriez4" model="fleet.vehicle.model">
+          <field name="modelname">Serie Z4</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriem" model="fleet.vehicle.model">
+          <field name="modelname">Serie M</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriehybrid" model="fleet.vehicle.model">
+          <field name="modelname">Serie Hybrid</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_classa" model="fleet.vehicle.model">
+          <field name="modelname">Class A</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classb" model="fleet.vehicle.model">
+          <field name="modelname">Class B</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classc" model="fleet.vehicle.model">
+          <field name="modelname">Class C</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcl" model="fleet.vehicle.model">
+          <field name="modelname">Class CL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcls" model="fleet.vehicle.model">
+          <field name="modelname">Class CLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classe" model="fleet.vehicle.model">
+          <field name="modelname">Class E</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classm" model="fleet.vehicle.model">
+          <field name="modelname">Class M</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classgl" model="fleet.vehicle.model">
+          <field name="modelname">Class GL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classglk" model="fleet.vehicle.model">
+          <field name="modelname">Class GLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classr" model="fleet.vehicle.model">
+          <field name="modelname">Class R</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classs" model="fleet.vehicle.model">
+          <field name="modelname">Class S</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classslk" model="fleet.vehicle.model">
+          <field name="modelname">Class SLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classsls" model="fleet.vehicle.model">
+          <field name="modelname">SLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
      </data>
 </openerp>
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 4760e336dd1..d00cfd9ac3e 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -1,231 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-      <record id="model_corsa" model="fleet.vehicle.model">
-          <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_astra" model="fleet.vehicle.model">
-          <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_agila" model="fleet.vehicle.model">
-          <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_combotour" model="fleet.vehicle.model">
-          <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_meriva" model="fleet.vehicle.model">
-          <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_astragtc" model="fleet.vehicle.model">
-          <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafira" model="fleet.vehicle.model">
-          <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafiratourer" model="fleet.vehicle.model">
-          <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_insignia" model="fleet.vehicle.model">
-          <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_mokka" model="fleet.vehicle.model">
-          <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_antara" model="fleet.vehicle.model">
-          <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_ampera" model="fleet.vehicle.model">
-          <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_a1" model="fleet.vehicle.model">
-          <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a3" model="fleet.vehicle.model">
-          <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a4" model="fleet.vehicle.model">
-          <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a5" model="fleet.vehicle.model">
-          <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a6" model="fleet.vehicle.model">
-          <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a7" model="fleet.vehicle.model">
-          <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a8" model="fleet.vehicle.model">
-          <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q3" model="fleet.vehicle.model">
-          <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q5" model="fleet.vehicle.model">
-          <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q7" model="fleet.vehicle.model">
-          <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_tt" model="fleet.vehicle.model">
-          <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_serie1" model="fleet.vehicle.model">
-          <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie3" model="fleet.vehicle.model">
-          <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie5" model="fleet.vehicle.model">
-          <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie6" model="fleet.vehicle.model">
-          <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie7" model="fleet.vehicle.model">
-          <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriex" model="fleet.vehicle.model">
-          <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriez4" model="fleet.vehicle.model">
-          <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriem" model="fleet.vehicle.model">
-          <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriehybrid" model="fleet.vehicle.model">
-          <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_classa" model="fleet.vehicle.model">
-          <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classb" model="fleet.vehicle.model">
-          <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classc" model="fleet.vehicle.model">
-          <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcl" model="fleet.vehicle.model">
-          <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcls" model="fleet.vehicle.model">
-          <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classe" model="fleet.vehicle.model">
-          <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classm" model="fleet.vehicle.model">
-          <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classgl" model="fleet.vehicle.model">
-          <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classglk" model="fleet.vehicle.model">
-          <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classr" model="fleet.vehicle.model">
-          <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classs" model="fleet.vehicle.model">
-          <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classslk" model="fleet.vehicle.model">
-          <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classsls" model="fleet.vehicle.model">
-          <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
         <field name="name">In shop</field>
         <field name="sequence">1</field>

From c6e41cadcefd4c451ef673a0af733cbba8000b69 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 26 Nov 2012 12:17:35 +0530
Subject: [PATCH 3/9] [IMP] fleet: made changes in form view of model

bzr revid: cha@tinyerp.com-20121126064735-13ex8yse56boa3xy
---
 addons/fleet/fleet_view.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 8c7ceaf8d2d..fd563a94c9c 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -8,14 +8,16 @@
                 <form string="Model" version="7.0">
                     <sheet>
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
-                        <group col="2">
-                            <group>
+                        <div class="oe_title">
+                            <label for="modelname" class="oe_edit_only"/>
+                            <h1>
+                                <field name="modelname" />
+                            </h1>
+                            <label for="brand" class="oe_edit_only"/>
+                            <h2>
                                 <field name="brand" on_change="on_change_brand(brand)"/>
-                            </group>
-                            <group>
-                                <field name="modelname" />   
-                            </group>
-                        </group>
+                            </h2>
+                        </div>
                         <notebook>
                             <page string="Vendors">
                                 <field name="vendors" widget="many2many_kanban"/>

From 3457eb9784d222b93017f35847bc44294a451367 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 26 Nov 2012 16:49:38 +0530
Subject: [PATCH 4/9] [IMP] improve Opportunity / Customer in to
 Opportunity,assign category into another opportunity,Show Sales Team from the
 opportunity filters, and invisilble labels from setting when sale module is
 not install,and improve stage field clickeable in lead view

bzr revid: shp@tinyerp.com-20121126111938-vmlqrg9fuzt1crt4
---
 addons/base_setup/res_config.py       | 1 +
 addons/base_setup/res_config_view.xml | 7 ++++---
 addons/crm/crm.py                     | 8 +++++++-
 addons/crm/crm_lead_view.xml          | 8 +++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index e7898395d62..27cc35d1308 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -60,6 +60,7 @@ class sale_config_settings(osv.osv_memory):
         'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
+        'module_sale' : fields.boolean('SALE'),
         'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index c06ff6534d7..fc41c0c2e59 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -106,13 +106,14 @@
                         </group>
                     </div>
                     <div name="customer feature">
-                        <separator string="Quotations and Sales Orders"/>
+                        <field name="module_sale" invisible="1"/>
+                        <separator string="Quotations and Sales Orders" attrs="{'invisible': [('module_sale','=',False)]}"/>
                         <group name="Customer">
-                            <label for="id" string="Customer Features"/>
+                            <label for="id" string="Customer Features" attrs="{'invisible': [('module_sale','=',False)]}"/>
                             <div name="Customer Features"/>
                         </group>
                         <group name="Sale">
-                            <label for="id" string="Sale Features"/>
+                            <label for="id" string="Sale Features" attrs="{'invisible': [('module_sale','=',False)]}"/>
                             <div name="Sale Features"/>
                         </group>
                     </div>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 368656224ac..522c0c2cda8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -194,7 +194,13 @@ class crm_case_categ(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
-
+    
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', context.get('object_name'))])
+        res['object_id'] = model_id
+        return res
+        
     def _find_object_id(self, cr, uid, context=None):
         """Finds id for case object"""
         object_id = context and context.get('object_id', False) or False
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88b2edcd665..8b977cfe293 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -137,7 +137,7 @@
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                            on_change="onchange_stage_id(stage_id)" clickable="True"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
@@ -460,6 +460,7 @@
                             <group>
                                 <field name="categ_ids"
                                     string="Categories" widget="many2many_tags"
+                                    context = "{'object_name': 'crm.lead'}"
                                     domain="[('object_id.model', '=', 'crm.lead')]"/>
 
                             </group>
@@ -568,7 +569,7 @@
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
                 <search string="Search Opportunities">
-                    <field name="name" string="Opportunity / Customer"
+                    <field name="name" string="Opportunity"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
@@ -595,9 +596,6 @@
                         <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
                     </group>
-                    <group string="Display">
-                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                    </group>
                 </search>
             </field>
         </record>

From 5de572c0051440e924418f96fefa14f4d6882c7c Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 29 Nov 2012 15:55:43 +0500
Subject: [PATCH 5/9] [IMP] Opportunity, Image show only if sales person
 linked.

bzr revid: tta@openerp.com-20121129105543-or20pf7ul2mztmuo
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8b977cfe293..fdbd7cbc987 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -333,7 +333,7 @@
                                     <div class="oe_kanban_bottom_right">
                                         <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
                                         <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar" t-if="record.user_id.value"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <t t-raw="record.message_summary.raw_value"/>

From ec5c761b7d8d28310200cbc02b77640da0ff10ff Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 29 Nov 2012 19:15:29 +0500
Subject: [PATCH 6/9] [IMP] Avoid to set to_invoice 100% when 'use timesheet'
 set.

bzr revid: tta@openerp.com-20121129141529-avzooa3gxgtpv32d
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py       | 7 -------
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index a24208d6ce0..e8b90690fdc 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,13 +77,6 @@ class account_analytic_account(osv.osv):
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
 
-    def on_change_use_timesheets(self, cr, uid, ids, use_timesheets, context=None):
-        res = {'value': {}}
-        if use_timesheets:
-            ir_model_obj = self.pool.get('ir.model.data')
-            res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
-        return res
-
     def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None):
         res = super(account_analytic_account, self).on_change_partner_id(cr, uid, ids, partner_id, name, context=context)
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 58dca6bd2d5..4b1751abc50 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -14,7 +14,7 @@
                     </group>
                  </xpath>
                 <xpath expr="//field[@name='use_timesheets']" position="replace">
-                    <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
+                    <field name="use_timesheets"/>
                 </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>

From 1a8e876957f18251209ebae37460a1c08bf9a651 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 6 Dec 2012 14:13:51 +0500
Subject: [PATCH 7/9] Make crm.lead's stage unclickable.

bzr revid: tta@openerp.com-20121206091351-r30zftxqdguvxvcl
---
 addons/crm/crm_lead_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fdbd7cbc987..1a211f90bfa 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -136,8 +136,7 @@
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)" clickable="True"/>
+                    <field name="stage_id" widget="statusbar" on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">

From b75f72f31851a0f38d13f3f29386c7fc70b1a717 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 7 Dec 2012 14:54:43 +0500
Subject: [PATCH 8/9] [IMP] When saving a note, it should come back to the
 kanban view instead of going to the page view.

bzr revid: tta@openerp.com-20121207095443-xcaflcu887bsn96u
---
 addons/note/__openerp__.py        |  3 +++
 addons/note/static/src/js/note.js | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 addons/note/static/src/js/note.js

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 797270637e2..4e22113e381 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -57,6 +57,9 @@ Notes can be found in the 'Home' menu.
     'css': [
         'static/src/css/note.css',
     ],
+    'js': [
+        'static/src/js/note.js',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/note/static/src/js/note.js b/addons/note/static/src/js/note.js
new file mode 100644
index 00000000000..9b4a12c41a8
--- /dev/null
+++ b/addons/note/static/src/js/note.js
@@ -0,0 +1,16 @@
+openerp.note = function(instance) {     
+    instance.web.FormView.include({ 
+        init: function(parent, dataset, view_id, options) {
+            this._super(parent, dataset, view_id, options);
+            this.options.views_history = parent.views_history;             
+        },
+        to_view_mode: function(){
+            var prev_view = this.options.views_history[this.options.views_history.length - 2];
+            if(this.model == 'note.note' && prev_view == 'kanban'){
+                this.do_switch_view(prev_view);
+            }else{
+                this._super();
+            }
+        },
+    });
+}

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 9/9] [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>