diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a0d14e889cb..faf4e29c93c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -622,7 +622,7 @@ class account_analytic_account(osv.osv):
 
     def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
         if not invoice_on_timesheets:
-            return {}
+            return {'value': {'to_invoice': False}}
         result = {'value': {'use_timesheets': True}}
         try:
             to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f0ea2623dac..a3bf47ee62a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -868,8 +868,8 @@ class crm_lead(format_address, osv.osv):
             'res_id': int(opportunity_id),
             'view_id': False,
             'views': [(form_view or False, 'form'),
-                    (tree_view or False, 'tree'),
-                    (False, 'calendar'), (False, 'graph')],
+                      (tree_view or False, 'tree'), (False, 'kanban'),
+                      (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
         }
 
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index bee105068f3..821a4c19b83 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -5,7 +5,7 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <div name="options" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"
                            attrs="{'readonly': [('is_only_child', '=', False)]}"/>
                     <label for="event_ok"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4b1751abc50..0f50c38ae95 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -18,10 +18,9 @@
                 </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
-                        <button name="set_pending" string="Pending" type="object" states="open" />
-                        <button name="set_close" string="Contract Finished" type="object" states="open,pending" />
-                        <button name="set_open" string="Re-open project" type="object" states="pending,close" />
-                        <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
+                        <button name="set_pending" string="To Renew" type="object" states="open" />
+                        <button name="set_close" string="Close Contract" type="object" states="open,pending" />
+                        <button name="set_open" string="Set In Progress" type="object" states="pending,close,cancelled,draft" />
                         <button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 176771bfd8d..04a9972b9b0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -179,8 +179,8 @@
                                         groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
-                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="price_unit"/>
+                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>