diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f0e6785cf6d..b1baa35e431 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -44,7 +44,7 @@
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//separator[@name="term"]' position='before'>
+                <xpath expr='//separator[@name="description"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
                     <group colspan="4" name="contract_lines" class="oe_form_group_label_border">
                         <table name="contract_data">
@@ -94,9 +94,9 @@
                             </tr> -->
                         </table>
                     </group>
-	            <group colspan="4" class="oe_form_group_label_border"> 
-	                <field name="pricelist_id" />
-	                <field name="to_invoice" widget="selection" />
+	            	<group colspan="4" class="oe_form_group_label_border"> 
+		                <field name="pricelist_id" />
+		                <field name="to_invoice" widget="selection" />
 		    	</group>
                 </xpath>
                 <!-- <notebook position="inside">
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index fe58a6ec531..0b909d2c5c0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,7 +28,7 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <separator name="term" string="Terms and Condition" colspan="4"/>
+                                <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 1ff966d62c4..90544842685 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -12,7 +12,7 @@
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 06513522a1b..78245b8db99 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -7,18 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <!-- <group name="contract" position="after">
-                    <group colspan="2" col="2" name="invoice_data">
-                        <separator colspan="2" string="Invoicing Data"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
-                        <field name="amount_max"/>
-                    </group>
-                    <group colspan="2" col="2" name="invoice_stats">
-                        <separator colspan="4" string="Invoicing Statistics"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </group> -->
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
                         <button name="set_pending" string="Pending" type="object" states="open"/>
@@ -55,7 +43,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'search_default_use_timesheets': 1, 'default_use_timesheets': 1}"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -78,9 +66,8 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
-
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" context="{'search_default_use_timesheets': 1, 'default_use_timesheets': 1}"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa815df5337..5290985096a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -109,7 +109,7 @@
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
                                     <field invisible="1" name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice" widget="selection"/>