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..b08f116d414 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -105,7 +105,8 @@
                             </div>
                         </group>
                     </div>
-                    <div name="customer feature">
+                    <div name="customer feature" attrs="{'invisible': [('module_sale','=',False)]}">
+                        <field name="module_sale" invisible="1"/>
                         <separator string="Quotations and Sales Orders"/>
                         <group name="Customer">
                             <label for="id" string="Customer Features"/>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 368656224ac..f96feb6f82f 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -197,8 +197,9 @@ class crm_case_categ(osv.osv):
 
     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
-        ids = self.pool.get('ir.model').search(cr, uid, [('id', '=', object_id)])
+        context = context or {}
+        object_id = context.get('object_id', False)
+        ids = self.pool.get('ir.model').search(cr, uid, ['|',('id', '=', object_id),('model', '=', context.get('object_name', False)])
         return ids and ids[0] or False
 
     _defaults = {
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3bbdf05655e..3710df3138f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -297,7 +297,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"/>
@@ -424,6 +424,7 @@
                             <group>
                                 <field name="categ_ids"
                                     string="Categories" widget="many2many_tags"
+                                    context = "{'object_name': 'crm.lead'}"
                                     domain="[('object_id.model', '=', 'crm.lead')]"/>
 
                             </group>
@@ -532,7 +533,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)]"/>
@@ -560,7 +561,7 @@
                         <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"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index f1e0d1a8580..58ee5bc2d16 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/fleet_security.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..54be46c90fe 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_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_astra" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_combotour" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_astragtc" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafiratourer" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_mokka" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_opel" />
+      </record>
+
+      <record id="model_ampera" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_a3" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_a5" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_a7" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_q3" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_q7" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_audi" />
+      </record>
+
+      <record id="model_serie1" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie5" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie7" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriez4" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriehybrid" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classb" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcl" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classe" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classgl" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classr" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classslk" model="fleet.vehicle.model">
+          <field name="modelname">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="brand_id" ref="brand_mercedes" />
+      </record>
      </data>
 </openerp>
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index d70943f4beb..03e8bcd38f1 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_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_astra" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_combotour" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_astragtc" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafiratourer" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_mokka" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_opel" />
-      </record>
-
-      <record id="model_ampera" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a3" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a5" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_a7" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_q3" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_q7" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_audi" />
-      </record>
-
-      <record id="model_serie1" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie5" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie7" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriez4" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriehybrid" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classb" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcl" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classe" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classgl" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classr" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classslk" model="fleet.vehicle.model">
-          <field name="modelname">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="brand_id" ref="brand_mercedes" />
-      </record>
-
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
         <field name="name">In shop</field>
         <field name="sequence">1</field>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 1810cc5a938..4d4c74fd297 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_id" on_change="on_change_brand(brand_id)"/>
-                            </group>
-                            <group>
-                                <field name="modelname" />   
-                            </group>
-                        </group>
+                            </h2>
+                        </div>
                         <notebook>
                             <page string="Vendors">
                                 <field name="vendors" widget="many2many_kanban"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 161ac761aec..eb3d3a6826d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -78,13 +78,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>
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>