diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 85413b464ea..2ca0e50e784 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -62,7 +62,7 @@
         </record>
         <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_integration" model="account.analytic.account">
@@ -72,12 +72,12 @@
         </record>
         <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index dce54985edd..49261234cc4 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -75,7 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{'default_type':'contract'}</field>
-            <field name="domain">[('type','=','contract'),('partner_id', '!=', False)]</field>
+            <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
         </record>
         <menuitem id="base.menu_sales" name="Sales"
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index ecedbe2d313..077aaf6179c 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -13,18 +13,15 @@
             <field name="journal_id" ref="analytic_journal"/>
         </record>
         <record id="account.analytic_administratif" model="account.analytic.account">
-             <field name="use_timesheets">True</field>
+            <field name="use_timesheets">True</field>
         </record>
          <record id="account.analytic_partners" model="account.analytic.account">
-             <field name="type">contract</field>
             <field name="use_timesheets">True</field>
         </record>
-        <record id="account.analytic_customers" model="account.analytic.account">
-            <field name="type">contract</field>
+        <record id="account.analytic_consultancy" model="account.analytic.account">
             <field name="use_timesheets">True</field>
         </record>
-        <record id="account.analytic_support_internal" model="account.analytic.account">
-            <field name="type">contract</field>
+        <record id="account.analytic_super_product_trainings" model="account.analytic.account">
             <field name="use_timesheets">True</field>
         </record>