diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e33acaaadd5..fed9fee8725 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -42,7 +42,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="partner_id"]' position='after'>
+                <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
                 <xpath expr='//field[@name="date"]' position="after">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 32c0e39aba0..c8049ff613d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -13,11 +13,10 @@
                  </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
-                        <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_hi"/>
+                        <button name="set_pending" string="Pending" type="object" states="open"/>
                         <button name="set_close" string="Close" type="object" states="open,pending" class="oe_form_button_hi"/>
-                        <button name="set_open" string="Re-open project" type="object" states="draft"/>
-                        <button name="set_open" string="Re-open project" type="object" states="cancelled,close,pending" class="oe_form_button_hi"/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" />
+                        <button name="set_open" string="Re-open Project" type="object" states="draft,cancelled,close,pending" class="oe_form_button_hi"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
                     </header>