diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml
index e6a8337204a..b0c358d8511 100644
--- a/addons/hr_expense/data/hr_expense_data.xml
+++ b/addons/hr_expense/data/hr_expense_data.xml
@@ -10,20 +10,14 @@
             <field name="alias_contact">employees</field>
         </record>
 
-
-        <!-- Resource: product.uom.categ -->
-        <record id="cat_expense" model="product.category">
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="name">Expenses</field>
-        </record>
-
+        <!-- Master Data for expense created by email -->
         <record id="product_product_fixed_cost" model="product.product">
             <field name="name">Expenses</field>
             <field name="list_price">0.0</field>
             <field name="standard_price">1.0</field>
             <field name="type">service</field>
             <field name="default_code">EXP</field>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="categ_id" ref="product.cat_expense"/>
             <field name="can_be_expensed" eval="True"/>
         </record>
 
diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index 6c5b47c12b3..85f8d875a4e 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -28,7 +28,7 @@
             <field name="default_code">CarTRA</field>
             <field name="uom_id" ref="product.product_uom_km"/>
             <field name="uom_po_id" ref="product.product_uom_km"/>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="categ_id" ref="product.cat_expense"/>
             <field name="can_be_expensed" eval="True" />
             <field name="image" type="base64" file="hr_expense/static/img/car_travel-image.jpg"/>
         </record>
@@ -39,20 +39,12 @@
             <field name="type">service</field>
             <field name="name">Air Flight</field>
             <field name="default_code">AT</field>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="categ_id" ref="product.cat_expense"/>
             <field name="can_be_expensed" eval="True" />
             <field name="image" type="base64" file="hr_expense/static/img/air_ticket-image.jpg"/>
         </record>
 
-        <record id="hotel_rent" model="product.product">
-            <field name="list_price">400.0</field>
-            <field name="standard_price">400.0</field>
-            <field name="type">service</field>
-            <field name="name">Hotel Accommodation</field>
-            <field name="default_code">HA0</field>
-            <field name="uom_id" ref="product.product_uom_day"/>
-            <field name="uom_po_id" ref="product.product_uom_day"/>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
+        <record id="product.expense_hotel" model="product.product">
             <field name="can_be_expensed" eval="True" />
             <field name="image" type="base64" file="hr_expense/static/img/hotel_rent-image.jpg"/>
         </record>
@@ -69,7 +61,7 @@
         <record id="hotel_bill_expense" model="hr.expense">
             <field name="name">Hotel Expenses</field>
             <field name="analytic_account_id" ref="analytic.analytic_nebula"/>
-            <field name="product_id" ref="hotel_rent"/>
+            <field name="product_id" ref="product.expense_hotel"/>
             <field eval="400.0" name="unit_amount"/>
             <field name="product_uom_id" ref="product.product_uom_day"/>
             <field eval="5.0" name="quantity"/>
diff --git a/addons/product/data/product_data.xml b/addons/product/data/product_data.xml
index 858b3944bfa..59f5cfb406f 100644
--- a/addons/product/data/product_data.xml
+++ b/addons/product/data/product_data.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <!--
-    Resource: product.uom.categ
-    -->
         <record id="product_category_all" model="product.category">
             <field name="name">All</field>
         </record>
@@ -11,7 +8,14 @@
             <field name="parent_id" ref="product_category_all"/>
             <field name="name">Saleable</field>
         </record>
-        
+        <record id="cat_expense" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Expenses</field>
+        </record>
+
+        <!--
+            Resource: product.uom.categ
+        -->
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml
index 2a8e9305b19..f21644a9ded 100644
--- a/addons/product/data/product_demo.xml
+++ b/addons/product/data/product_demo.xml
@@ -19,6 +19,28 @@
             <field name="name">Physical</field>
         </record>
 
+        <!-- Expensable products -->
+        <record id="expense_product" model="product.product">
+            <field name="name">General Expense</field>
+            <field name="list_price">14.0</field>
+            <field name="standard_price">8.0</field>
+            <field name="type">service</field>
+            <field name="default_code">EXP</field>
+            <field name="categ_id" ref="product.cat_expense"/>
+        </record>
+
+        <record id="expense_hotel" model="product.product">
+            <field name="name">Hotel Accommodation</field>
+            <field name="list_price">400.0</field>
+            <field name="standard_price">400.0</field>
+            <field name="type">service</field>
+            <field name="default_code">EXP</field>
+            <field name="uom_id" ref="product_uom_day"/>
+            <field name="uom_po_id" ref="product_uom_day"/>
+            <field name="categ_id" ref="cat_expense"/>
+        </record>
+
+        <!-- Service products -->
         <record id="service_order_01" model="product.product">
             <field name="name">Prepaid Consulting</field>
             <field name="categ_id" ref="product_category_3"/>
@@ -109,7 +131,6 @@
             <field name="description">Example of product to invoice based on delivery.</field>
         </record>
 
-
         <record id="product_product_3" model="product.product">
             <field name="name">Computer SC234</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -203,11 +224,11 @@
         <record id="product_product_4_product_template" model="product.template">
             <field name="attribute_line_ids" eval="[(6,0,[ref('product.product_attribute_line_1'), ref('product.product_attribute_line_2'), ref('product.product_attribute_line_3')])]"/>
         </record>
-        
+
         <record id="product_product_4d" model="product.product">
             <field name="active" eval="False"/>
         </record>
-        
+
         <record id="product_attribute_price_1" model="product.attribute.price">
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
             <field name="value_id" ref="product_attribute_value_2"/>
@@ -343,7 +364,7 @@
         <record id="product_product_11_product_template" model="product.template">
             <field name="attribute_line_ids" eval="[(6,0,[ref('product.product_attribute_line_4')])]"/>
         </record>
-        
+
         <record id="product_attribute_price_2" model="product.attribute.price">
             <field name="product_tmpl_id" ref="product_product_11_product_template"/>
             <field name="value_id" ref="product_attribute_value_2"/>
diff --git a/addons/sale/data/product_product_demo.xml b/addons/sale/data/product_product_demo.xml
index 3a2368966cc..a409e0d244a 100644
--- a/addons/sale/data/product_product_demo.xml
+++ b/addons/sale/data/product_product_demo.xml
@@ -135,6 +135,7 @@
 
         <record id="product.product_product_3" model="product.product">
             <field name="invoice_policy">delivery</field>
+            <field name="expense_policy">cost</field>
         </record>
 
         <record id="product.product_product_2" model="product.product">
@@ -153,5 +154,16 @@
             <field name="invoice_policy">order</field>
         </record>
 
+        <!-- Expensable products -->
+        <record id="product.expense_product" model="product.product">
+            <field name="invoice_policy">order</field>
+            <field name="expense_policy">sales_price</field>
+        </record>
+
+        <record id="product.expense_hotel" model="product.product">
+            <field name="invoice_policy">delivery</field>
+            <field name="expense_policy">cost</field>
+        </record>
+
     </data>
 </odoo>
diff --git a/addons/sale_expense/sale_expense_demo.xml b/addons/sale_expense/sale_expense_demo.xml
index 21b329c657a..dbeb2f12f36 100644
--- a/addons/sale_expense/sale_expense_demo.xml
+++ b/addons/sale_expense/sale_expense_demo.xml
@@ -12,10 +12,5 @@
             <field name="expense_policy">cost</field>
         </record>
 
-        <record id="hr_expense.hotel_rent" model="product.product">
-            <field name="invoice_policy">delivery</field>
-            <field name="expense_policy">cost</field>
-        </record>
-
     </data>
 </odoo>
diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml
index 96aadd83975..a38c493e691 100644
--- a/addons/sale_timesheet/data/sale_service_demo.xml
+++ b/addons/sale_timesheet/data/sale_service_demo.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="product.service_order_01" model="product.product">
-            <field name="service_type">timesheet</field>
-            <field name="service_tracking">project_only</field>
-        </record>
-        <record id="product.product_product_2" model="product.product">
-            <field name="name">Support Contract (on timesheet)</field>
-            <field name="service_type">timesheet</field>
-            <field name="service_tracking">project_only</field>
-        </record>
 
-        <record id="line_services" model="sale.order.line">
+        <record id="sale_line_services" model="sale.order.line">
             <field name="order_id" ref="sale.sale_order_3"/>
             <field name="name">Advance</field>
             <field name="product_id" ref="sale.advance_product_0"/>
@@ -20,6 +11,14 @@
             <field name="product_uom_qty">5.0</field>
         </record>
 
+        <!-- Projects and Stages -->
+        <record id="project_stage_fixed" model="project.task.type">
+            <field name="sequence">30</field>
+            <field name="name">Fixed</field>
+            <field name="legend_blocked">Need functional or technical help</field>
+            <field name="legend_done">Done</field>
+        </record>
+
         <record id="project_GAP" model="project.project">
             <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
             <field name="name">Internal - GAP Analysis</field>
@@ -28,10 +27,415 @@
             <field name="type_ids" eval="[(4, ref('project.project_stage_0')) ,(4,ref('project.project_stage_1')) ,(4,ref('project.project_stage_2')) ,(4,ref('project.project_stage_3'))]"/>
         </record>
 
+        <record id="project_support" model="project.project">
+            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+            <field name="name">Support</field>
+            <field name="type_ids" eval="[(4, ref('project.project_stage_data_0')), (4, ref('project.project_stage_1')), (4, ref('project_stage_fixed'))]"/>
+        </record>
+
+        <!-- Project Task -->
+        <record id="project_task_internal" model="project.task">
+            <field name="name">Internal training</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="project_id" ref="project_support"/>
+        </record>
+
+        <!-- Products -->
+        <record id="product.service_order_01" model="product.product">
+            <field name="service_type">timesheet</field>
+            <field name="service_tracking">project_only</field>
+        </record>
+
+        <record id="product.product_product_2" model="product.product">
+            <field name="name">Support Contract (on timesheet)</field>
+            <field name="service_type">timesheet</field>
+            <field name="service_tracking">project_only</field>
+        </record>
+
         <record id="product.product_product_1" model="product.product">
             <field name="service_type">timesheet</field>
             <field name="service_tracking">task_global_project</field>
             <field name="project_id" ref="project_GAP"/>
         </record>
+
+        <record id="product.product_product_5c" model="product.product">
+            <field name="service_type">timesheet</field>
+        </record>
+
+        <record id="product.service_cost_01" model="product.product">
+            <field name="service_type">timesheet</field>
+        </record>
+
+        <record id="product_service_order_timesheet" model="product.product">
+            <field name="name">Support (Prepaid Hours)</field>
+            <field name="categ_id" ref="product.product_category_3"/>
+            <field name="type">service</field>
+            <field name="list_price">250.00</field>
+            <field name="standard_price">190.00</field>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
+            <field name="service_policy">ordered_timesheet</field>
+            <field name="service_tracking">task_global_project</field>
+            <field name="project_id" ref="project_support"/>
+        </record>
+
+        <record id="product_service_deliver_timesheet_1" model="product.product">
+            <field name="name">Senior Developer (Invoice on Timesheets)</field>
+            <field name="categ_id" ref="product.product_category_3"/>
+            <field name="list_price">200.00</field>
+            <field name="standard_price">150.00</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
+            <field name="service_policy">delivered_timesheet</field>
+            <field name="service_tracking">task_new_project</field>
+        </record>
+
+        <record id="product_service_deliver_timesheet_2" model="product.product">
+            <field name="name">Junior Developer (Invoice on Timesheets)</field>
+            <field name="categ_id" ref="product.product_category_3"/>
+            <field name="list_price">100.00</field>
+            <field name="standard_price">85.00</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
+            <field name="service_policy">delivered_timesheet</field>
+            <field name="service_tracking">task_new_project</field>
+        </record>
+
+        <record id="product_service_deliver_manual" model="product.product">
+            <field name="name">Milestones</field>
+            <field name="categ_id" ref="product.product_category_3"/>
+            <field name="list_price">500</field>
+            <field name="standard_price">420.00</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="service_policy">delivered_manual</field>
+            <field name="service_tracking">no</field>
+        </record>
+
+        <!-- Employee -->
+        <record id="hr.employee_root" model="hr.employee">
+            <field name="timesheet_cost">100</field>
+        </record>
+
+        <record id="hr.employee_qdp" model="hr.employee">
+            <field name="timesheet_cost">75</field>
+            <field name="parent_id" ref="hr.employee_root"/>
+        </record>
+
+        <!-- Sale Order 'sale_order_1' (Agrolait) -->
+        <record id="sale_order_1" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="client_order_ref">AGR</field>
+        </record>
+
+        <record id="sale_line_11" model="sale.order.line">
+            <field name="order_id" ref="sale_order_1"/>
+            <field name="sequence" eval="1"/>
+            <field name="product_id" ref="product_service_order_timesheet"/>
+            <field name="product_uom_qty">20</field>
+        </record>
+        <record id="sale_line_12" model="sale.order.line">
+            <field name="order_id" ref="sale_order_1"/>
+            <field name="sequence" eval="3"/>
+            <field name="product_id" ref="product_service_deliver_manual"/>
+            <field name="product_uom_qty">4</field>
+        </record>
+        <record id="sale_line_13" model="sale.order.line">
+            <field name="order_id" ref="sale_timesheet.sale_order_1"/>
+            <field name="product_id" ref="product_service_deliver_timesheet_1"/>
+            <field name="sequence" eval="2"/>
+            <field name="discount">10</field>
+            <field name="product_uom_qty">50</field>
+        </record>
+
+        <!-- Sale Order 'sale_order_2' (Delta PC) -->
+        <record id="sale_order_2" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="client_order_ref">DPC</field>
+        </record>
+
+        <record id="sale_line_21" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2"/>
+            <field name="sequence" eval="1"/>
+            <field name="product_id" ref="product_service_order_timesheet"/>
+            <field name="product_uom_qty">50</field>
+        </record>
+        <record id="sale_line_22" model="sale.order.line">
+            <field name="order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="sequence" eval="2"/>
+            <field name="product_id" ref="product_service_deliver_timesheet_2"/>
+            <field name="product_uom_qty">110</field>
+        </record>
+
+        <!-- Confirm Sale Orders -->
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_1')]]"/>
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_2')]]"/>
+
+        <!-- Timesheets on sale_order_1 -->
+        <record id="timesheet_1" model="account.analytic.line">
+            <field name="name">Uploading data</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="timesheet_2" model="account.analytic.line">
+            <field name="name">Improve Code</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="timesheet_3" model="account.analytic.line">
+            <field name="name">Add New Module</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="timesheet_4" model="account.analytic.line">
+            <field name="name">Delivery and maintenance</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+
+        <record id="timesheet_5" model="account.analytic.line">
+            <field name="name">Data Analysis with Team</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_6" model="account.analytic.line">
+            <field name="name">Client Metting</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_7" model="account.analytic.line">
+            <field name="name">Check Requirements</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_8" model="account.analytic.line">
+            <field name="name">Analysis data</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_9" model="account.analytic.line">
+            <field name="name">Code Migrate</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_10" model="account.analytic.line">
+            <field name="name">Research</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_11" model="account.analytic.line">
+            <field name="name">Development</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_12" model="account.analytic.line">
+            <field name="name">Quality  check</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_13" model="account.analytic.line">
+            <field name="name">Migrate data</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+        <record id="timesheet_14" model="account.analytic.line">
+            <field name="name">Code improved</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">1.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+        </record>
+
+        <!-- Timesheets on sale_order_2 -->
+        <record id="timesheet_15" model="account.analytic.line">
+            <field name="name">Research and Development</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+        </record>
+        <record id="timesheet_16" model="account.analytic.line">
+            <field name="name">Quality Analyst</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+        </record>
+        <record id="timesheet_17" model="account.analytic.line">
+            <field name="name">Delivery and maintenance</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+        </record>
+        <record id="timesheet_18" model="account.analytic.line">
+            <field name="name">Code Improve</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+        </record>
+
+        <record id="timesheet_19" model="account.analytic.line">
+            <field name="name">Discussion new Group</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-5)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">4.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+        </record>
+        <record id="timesheet_20" model="account.analytic.line">
+            <field name="name">Analysis Document</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-4)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">4.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+        </record>
+        <record id="timesheet_21" model="account.analytic.line">
+            <field name="name">Write specifications</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">4.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+        </record>
+        <record id="timesheet_22" model="account.analytic.line">
+            <field name="name">Requirements metting with client</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-2)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">4.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+        </record>
+
+        <!-- Non billable Timesheets in project_support -->
+        <record id="timesheet_23" model="account.analytic.line">
+            <field name="name">Update Docs</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(months=-4, days=-10)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" ref="project_task_internal"/>
+        </record>
+        <record id="timesheet_24" model="account.analytic.line">
+            <field name="name">Discussion Agreement</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(months=-4, days=-12)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" ref="project_task_internal"/>
+        </record>
+        <record id="timesheet_25" model="account.analytic.line">
+            <field name="name">Internal Discussion</field>
+            <field name="employee_id" ref="hr.employee_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(months=-4, days=-13)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" ref="project_task_internal"/>
+        </record>
+        <record id="timesheet_26" model="account.analytic.line">
+            <field name="name">Improvement the Details</field>
+            <field name="employee_id" ref="hr.employee_qdp"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(months=-4, days=-11)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">8.00</field>
+            <field name="project_id" ref="project_support"/>
+            <field name="task_id" ref="project_task_internal"/>
+        </record>
+
+        <!-- Vendor bill for sale_order_1 -->
+        <record id="account_analytic_line_inv_1" model="account.analytic.line">
+            <field name="name">[PCSC234] Computer SC234</field>
+            <field name="account_id" search="[('partner_id', '=', ref('base.res_partner_2'))]"/>
+            <field name="partner_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="amount">300.00</field>
+            <field name="product_id" ref="product.product_product_3"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="unit_amount">10.00</field>
+        </record>
+
+        <!-- Expense bill for sale_order_1 -->
+        <record id="account_analytic_line_exp_1" model="account.analytic.line">
+            <field name="name">[EXP] General Expenses</field>
+            <field name="account_id" search="[('partner_id', '=', ref('base.res_partner_2'))]"/>
+            <field name="partner_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="amount">100.00</field>
+            <field name="product_id" ref="product.expense_product"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="unit_amount">1.00</field>
+        </record>
+
+        <!-- Vendor bill for sale_order_2 -->
+        <record id="account_analytic_line_inv_2" model="account.analytic.line">
+            <field name="name">[PCSC234] Computer SC234</field>
+            <field name="account_id" search="[('partner_id', '=', ref('base.res_partner_4'))]"/>
+            <field name="partner_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="amount">400.00</field>
+            <field name="product_id" ref="product.product_product_3"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="unit_amount">15.00</field>
+        </record>
+
+        <!-- Expense bill for sale_order_2 -->
+        <record id="account_analytic_line_exp_2" model="account.analytic.line">
+            <field name="name">[HA0] Hotel Accommodation</field>
+            <field name="account_id" search="[('partner_id', '=', ref('base.res_partner_4'))]"/>
+            <field name="partner_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
+            <field name="amount">75.00</field>
+            <field name="product_id" ref="product.expense_hotel"/>
+            <field name="product_uom_id" ref="product.product_uom_day"/>
+            <field name="unit_amount">1.00</field>
+        </record>
     </data>
 </odoo>