diff --git a/addons/hr_timesheet/data/hr_timesheet_demo.xml b/addons/hr_timesheet/data/hr_timesheet_demo.xml
index ef3de44994e..1b0de3a9b08 100644
--- a/addons/hr_timesheet/data/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/data/hr_timesheet_demo.xml
@@ -1692,220 +1692,220 @@
         <field name="amount">-90.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_1" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-60.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_2" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_2" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-60.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_3" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_3" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_4" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_4" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-90.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_5" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_5" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-17)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-90.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_6" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_6" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-22)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_7" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_7" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-24)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_8" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_8" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-27)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_9" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_9" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_chs"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-30)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_10" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_10" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-31)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_11" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-33)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-60.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_12" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-35)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-90.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_13" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-37)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_14" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_14" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-38)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_15" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_15" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_chs"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-43)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-90.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_16" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-45)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_17" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-46)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_18" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_18" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-49)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_19" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_19" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-51)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_20" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-57)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-30.0</field>
     </record>
 
-    <record id="project_task_9_account_analytic_line_21" model="account.analytic.line">
+    <record id="project_task_8_account_analytic_line_21" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_hne"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-60)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_9"/>
+        <field name="task_id" ref="project.project_task_8"/>
         <field name="amount">-60.0</field>
     </record>
 
     <record id="project_task_10_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1915,7 +1915,7 @@
     <record id="project_task_10_account_analytic_line_2" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1925,7 +1925,7 @@
     <record id="project_task_10_account_analytic_line_3" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1935,7 +1935,7 @@
     <record id="project_task_10_account_analytic_line_4" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1945,7 +1945,7 @@
     <record id="project_task_10_account_analytic_line_5" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-11)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1955,7 +1955,7 @@
     <record id="project_task_10_account_analytic_line_6" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1965,7 +1965,7 @@
     <record id="project_task_10_account_analytic_line_7" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1975,7 +1975,7 @@
     <record id="project_task_10_account_analytic_line_8" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1985,7 +1985,7 @@
     <record id="project_task_10_account_analytic_line_9" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-18)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -1995,7 +1995,7 @@
     <record id="project_task_10_account_analytic_line_10" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-20)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2005,7 +2005,7 @@
     <record id="project_task_10_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-21)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2015,7 +2015,7 @@
     <record id="project_task_10_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-25)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2025,7 +2025,7 @@
     <record id="project_task_10_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-28)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2035,7 +2035,7 @@
     <record id="project_task_10_account_analytic_line_14" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-32)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2045,7 +2045,7 @@
     <record id="project_task_10_account_analytic_line_15" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-34)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2055,7 +2055,7 @@
     <record id="project_task_10_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-39)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2065,7 +2065,7 @@
     <record id="project_task_10_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-54)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2075,7 +2075,7 @@
     <record id="project_task_10_account_analytic_line_18" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-55)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2085,7 +2085,7 @@
     <record id="project_task_10_account_analytic_line_19" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-55)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2095,7 +2095,7 @@
     <record id="project_task_10_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_hne"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-57)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2105,7 +2105,7 @@
     <record id="project_task_10_account_analytic_line_21" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-58)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2115,7 +2115,7 @@
     <record id="project_task_10_account_analytic_line_22" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-58)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_10"/>
@@ -2125,7 +2125,7 @@
     <record id="project_task_11_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2135,7 +2135,7 @@
     <record id="project_task_11_account_analytic_line_2" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2145,7 +2145,7 @@
     <record id="project_task_11_account_analytic_line_3" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_niv"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2155,7 +2155,7 @@
     <record id="project_task_11_account_analytic_line_4" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-9)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2165,7 +2165,7 @@
     <record id="project_task_11_account_analytic_line_5" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-9)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2175,7 +2175,7 @@
     <record id="project_task_11_account_analytic_line_6" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-18)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2185,7 +2185,7 @@
     <record id="project_task_11_account_analytic_line_7" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-19)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2195,7 +2195,7 @@
     <record id="project_task_11_account_analytic_line_8" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_hne"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-21)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2205,7 +2205,7 @@
     <record id="project_task_11_account_analytic_line_9" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-26)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2215,7 +2215,7 @@
     <record id="project_task_11_account_analytic_line_10" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-27)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2225,7 +2225,7 @@
     <record id="project_task_11_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-32)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2235,7 +2235,7 @@
     <record id="project_task_11_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-38)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2245,7 +2245,7 @@
     <record id="project_task_11_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-39)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2255,7 +2255,7 @@
     <record id="project_task_11_account_analytic_line_14" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-44)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2265,7 +2265,7 @@
     <record id="project_task_11_account_analytic_line_15" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-45)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2275,7 +2275,7 @@
     <record id="project_task_11_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-47)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2285,7 +2285,7 @@
     <record id="project_task_11_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-48)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2295,7 +2295,7 @@
     <record id="project_task_11_account_analytic_line_18" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-54)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2305,7 +2305,7 @@
     <record id="project_task_11_account_analytic_line_19" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-54)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2315,7 +2315,7 @@
     <record id="project_task_11_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-59)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_11"/>
@@ -2325,7 +2325,7 @@
     <record id="project_task_12_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2345,7 +2345,7 @@
     <record id="project_task_12_account_analytic_line_3" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-9)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2355,7 +2355,7 @@
     <record id="project_task_12_account_analytic_line_4" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2365,7 +2365,7 @@
     <record id="project_task_12_account_analytic_line_5" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2375,7 +2375,7 @@
     <record id="project_task_12_account_analytic_line_6" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2385,7 +2385,7 @@
     <record id="project_task_12_account_analytic_line_7" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-16)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2395,7 +2395,7 @@
     <record id="project_task_12_account_analytic_line_8" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-19)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2405,7 +2405,7 @@
     <record id="project_task_12_account_analytic_line_9" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-20)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2415,7 +2415,7 @@
     <record id="project_task_12_account_analytic_line_10" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-22)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2425,7 +2425,7 @@
     <record id="project_task_12_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-23)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2435,7 +2435,7 @@
     <record id="project_task_12_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-24)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2445,7 +2445,7 @@
     <record id="project_task_12_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-24)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2455,7 +2455,7 @@
     <record id="project_task_12_account_analytic_line_14" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-27)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2465,7 +2465,7 @@
     <record id="project_task_12_account_analytic_line_15" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-36)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2475,7 +2475,7 @@
     <record id="project_task_12_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-37)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2485,7 +2485,7 @@
     <record id="project_task_12_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-40)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2495,7 +2495,7 @@
     <record id="project_task_12_account_analytic_line_18" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-41)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2505,7 +2505,7 @@
     <record id="project_task_12_account_analytic_line_19" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-42)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2515,7 +2515,7 @@
     <record id="project_task_12_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_vad"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-42)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2525,7 +2525,7 @@
     <record id="project_task_12_account_analytic_line_21" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-46)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2535,7 +2535,7 @@
     <record id="project_task_12_account_analytic_line_22" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-48)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2545,7 +2545,7 @@
     <record id="project_task_12_account_analytic_line_23" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-48)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2555,7 +2555,7 @@
     <record id="project_task_12_account_analytic_line_24" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-56)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2565,7 +2565,7 @@
     <record id="project_task_12_account_analytic_line_25" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-56)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2575,7 +2575,7 @@
     <record id="project_task_12_account_analytic_line_26" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-59)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
@@ -2585,17 +2585,167 @@
     <record id="project_task_12_account_analytic_line_27" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-60)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_12"/>
         <field name="amount">-30.0</field>
     </record>
 
+        <record id="project_task_19_account_analytic_line_1" model="account.analytic.line">
+        <field name="name">Requirements analysis</field>
+        <field name="employee_id" ref="hr.employee_hne"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">3</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-90.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_2" model="account.analytic.line">
+        <field name="name">Call</field>
+        <field name="employee_id" ref="hr.employee_jgo"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">3</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-90.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_3" model="account.analytic.line">
+        <field name="name">Design</field>
+        <field name="employee_id" ref="hr.employee_fme"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_4" model="account.analytic.line">
+        <field name="name">Quality analysis</field>
+        <field name="employee_id" ref="hr.employee_al"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-11)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_5" model="account.analytic.line">
+        <field name="name">Presentation</field>
+        <field name="employee_id" ref="hr.employee_han"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_6" model="account.analytic.line">
+        <field name="name">Call</field>
+        <field name="employee_id" ref="hr.employee_lur"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_7" model="account.analytic.line">
+        <field name="name">Delivery</field>
+        <field name="employee_id" ref="hr.employee_fme"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_8" model="account.analytic.line">
+        <field name="name">Requirements analysis</field>
+        <field name="employee_id" ref="hr.employee_ngh"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_9" model="account.analytic.line">
+        <field name="name">Call</field>
+        <field name="employee_id" ref="hr.employee_mit"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_10" model="account.analytic.line">
+        <field name="name">Delivery</field>
+        <field name="employee_id" ref="hr.employee_al"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_11" model="account.analytic.line">
+        <field name="name">Presentation</field>
+        <field name="employee_id" ref="hr.employee_qdp"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_12" model="account.analytic.line">
+        <field name="name">Sprint</field>
+        <field name="employee_id" ref="hr.employee_fpi"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-60.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_13" model="account.analytic.line">
+        <field name="name">On Site Visit</field>
+        <field name="employee_id" ref="hr.employee_jod"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_14" model="account.analytic.line">
+        <field name="name">Call</field>
+        <field name="employee_id" ref="hr.employee_jgo"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-9)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
+    <record id="project_task_19_account_analytic_line_15" model="account.analytic.line">
+        <field name="name">Sprint</field>
+        <field name="employee_id" ref="hr.employee_jth"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-9)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">1</field>
+        <field name="project_id" ref="project.project_project_2"/>
+        <field name="task_id" ref="project.project_task_19"/>
+        <field name="amount">-30.0</field>
+    </record>
+
     <record id="project_task_20_account_analytic_line_1" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_vad"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2615,7 +2765,7 @@
     <record id="project_task_20_account_analytic_line_3" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2625,7 +2775,7 @@
     <record id="project_task_20_account_analytic_line_4" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-3)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2635,7 +2785,7 @@
     <record id="project_task_20_account_analytic_line_5" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2645,7 +2795,7 @@
     <record id="project_task_20_account_analytic_line_6" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2655,7 +2805,7 @@
     <record id="project_task_20_account_analytic_line_7" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2665,7 +2815,7 @@
     <record id="project_task_20_account_analytic_line_8" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-16)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2675,7 +2825,7 @@
     <record id="project_task_20_account_analytic_line_9" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-17)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2685,7 +2835,7 @@
     <record id="project_task_20_account_analytic_line_10" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_vad"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-23)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2695,7 +2845,7 @@
     <record id="project_task_20_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-25)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2705,7 +2855,7 @@
     <record id="project_task_20_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-26)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2715,7 +2865,7 @@
     <record id="project_task_20_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-31)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2725,7 +2875,7 @@
     <record id="project_task_20_account_analytic_line_14" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-34)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2735,7 +2885,7 @@
     <record id="project_task_20_account_analytic_line_15" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-35)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2745,7 +2895,7 @@
     <record id="project_task_20_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-36)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2755,7 +2905,7 @@
     <record id="project_task_20_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Sprint</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-37)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2765,7 +2915,7 @@
     <record id="project_task_20_account_analytic_line_18" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_stw"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-40)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=0)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2775,7 +2925,7 @@
     <record id="project_task_20_account_analytic_line_19" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-42)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2785,7 +2935,7 @@
     <record id="project_task_20_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-44)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2795,7 +2945,7 @@
     <record id="project_task_20_account_analytic_line_21" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_hne"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-47)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2805,7 +2955,7 @@
     <record id="project_task_20_account_analytic_line_22" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-49)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2815,7 +2965,7 @@
     <record id="project_task_20_account_analytic_line_23" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-49)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2825,7 +2975,7 @@
     <record id="project_task_20_account_analytic_line_24" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-56)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
@@ -2835,287 +2985,18 @@
     <record id="project_task_20_account_analytic_line_25" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-59)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_20"/>
         <field name="amount">-60.0</field>
     </record>
 
-    <record id="project_task_21_account_analytic_line_1" model="account.analytic.line">
-        <field name="name">Presentation</field>
-        <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-4)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_2" model="account.analytic.line">
-        <field name="name">Training</field>
-        <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_3" model="account.analytic.line">
-        <field name="name">Requirements analysis</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_4" model="account.analytic.line">
-        <field name="name">Training</field>
-        <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-10)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_5" model="account.analytic.line">
-        <field name="name">Training</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-11)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_6" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-12)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_7" model="account.analytic.line">
-        <field name="name">Quality analysis</field>
-        <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_8" model="account.analytic.line">
-        <field name="name">Design</field>
-        <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-17)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_9" model="account.analytic.line">
-        <field name="name">Quality analysis</field>
-        <field name="employee_id" ref="hr.employee_chs"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-18)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_10" model="account.analytic.line">
-        <field name="name">Sprint</field>
-        <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-23)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_11" model="account.analytic.line">
-        <field name="name">On Site Visit</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-26)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">3</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-90.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_12" model="account.analytic.line">
-        <field name="name">Sprint</field>
-        <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-29)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_13" model="account.analytic.line">
-        <field name="name">Training</field>
-        <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-30)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_14" model="account.analytic.line">
-        <field name="name">Presentation</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-30)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_15" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-33)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">3</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-90.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_16" model="account.analytic.line">
-        <field name="name">Design</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-33)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_17" model="account.analytic.line">
-        <field name="name">Requirements analysis</field>
-        <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-38)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_18" model="account.analytic.line">
-        <field name="name">Delivery</field>
-        <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-43)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_19" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-46)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_20" model="account.analytic.line">
-        <field name="name">Design</field>
-        <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-50)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_21" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-50)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_22" model="account.analytic.line">
-        <field name="name">Requirements analysis</field>
-        <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-52)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_23" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-52)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">3</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-90.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_24" model="account.analytic.line">
-        <field name="name">Quality analysis</field>
-        <field name="employee_id" ref="hr.employee_admin"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-53)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_25" model="account.analytic.line">
-        <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-55)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_26" model="account.analytic.line">
-        <field name="name">Presentation</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-57)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_21_account_analytic_line_27" model="account.analytic.line">
-        <field name="name">Quality analysis</field>
-        <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-60)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_21"/>
-        <field name="amount">-30.0</field>
-    </record>
 
     <record id="project_task_22_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_chs"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-2)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3125,7 +3006,7 @@
     <record id="project_task_22_account_analytic_line_2" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3135,7 +3016,7 @@
     <record id="project_task_22_account_analytic_line_3" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-8)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-15)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3165,7 +3046,7 @@
     <record id="project_task_22_account_analytic_line_6" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-16)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3175,7 +3056,7 @@
     <record id="project_task_22_account_analytic_line_7" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-20)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3185,7 +3066,7 @@
     <record id="project_task_22_account_analytic_line_8" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jve"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-21)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3195,7 +3076,7 @@
     <record id="project_task_22_account_analytic_line_9" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-22)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3205,7 +3086,7 @@
     <record id="project_task_22_account_analytic_line_10" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-25)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3215,7 +3096,7 @@
     <record id="project_task_22_account_analytic_line_11" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-28)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3225,7 +3106,7 @@
     <record id="project_task_22_account_analytic_line_12" model="account.analytic.line">
         <field name="name">Design</field>
         <field name="employee_id" ref="hr.employee_niv"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-31)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3235,7 +3116,7 @@
     <record id="project_task_22_account_analytic_line_13" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-34)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3245,7 +3126,7 @@
     <record id="project_task_22_account_analytic_line_14" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-39)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3255,7 +3136,7 @@
     <record id="project_task_22_account_analytic_line_15" model="account.analytic.line">
         <field name="name">Quality analysis</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-40)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3265,7 +3146,7 @@
     <record id="project_task_22_account_analytic_line_16" model="account.analytic.line">
         <field name="name">Training</field>
         <field name="employee_id" ref="hr.employee_jep"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-41)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3275,7 +3156,7 @@
     <record id="project_task_22_account_analytic_line_17" model="account.analytic.line">
         <field name="name">Delivery</field>
         <field name="employee_id" ref="hr.employee_chs"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-41)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3285,7 +3166,7 @@
     <record id="project_task_22_account_analytic_line_18" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_jog"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-44)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3295,7 +3176,7 @@
     <record id="project_task_22_account_analytic_line_19" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-47)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-14)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3305,7 +3186,7 @@
     <record id="project_task_22_account_analytic_line_20" model="account.analytic.line">
         <field name="name">Presentation</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-50)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3315,7 +3196,7 @@
     <record id="project_task_22_account_analytic_line_21" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-51)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3325,7 +3206,7 @@
     <record id="project_task_22_account_analytic_line_22" model="account.analytic.line">
         <field name="name">Requirements analysis</field>
         <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-52)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">3</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3335,7 +3216,7 @@
     <record id="project_task_22_account_analytic_line_23" model="account.analytic.line">
         <field name="name">On Site Visit</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-58)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-13)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
         <field name="project_id" ref="project.project_project_2"/>
         <field name="task_id" ref="project.project_task_22"/>
@@ -3592,154 +3473,50 @@
         <field name="amount">-60.0</field>
     </record>
 
-    <record id="project_task_26_account_analytic_line_1" model="account.analytic.line">
-        <field name="name">Requirements analysis</field>
-        <field name="employee_id" ref="hr.employee_hne"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-5)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">3</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-90.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_2" model="account.analytic.line">
+    <record id="project_task_27_account_analytic_line_1" model="account.analytic.line">
         <field name="name">Call</field>
-        <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-6)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">3</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-90.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_3" model="account.analytic.line">
-        <field name="name">Design</field>
-        <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-11)).strftime('%Y-%m-%d')"/>
+        <field name="employee_id" ref="hr.employee_hne"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
+        <field name="project_id" ref="project.project_project_1"/>
+        <field name="task_id" ref="project.project_task_27"/>
         <field name="amount">-30.0</field>
     </record>
-
-    <record id="project_task_26_account_analytic_line_4" model="account.analytic.line">
-        <field name="name">Quality analysis</field>
-        <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-19)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_5" model="account.analytic.line">
-        <field name="name">Presentation</field>
-        <field name="employee_id" ref="hr.employee_han"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-28)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_6" model="account.analytic.line">
+    <record id="project_task_27_account_analytic_line_2" model="account.analytic.line">
         <field name="name">Call</field>
         <field name="employee_id" ref="hr.employee_lur"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-29)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_7" model="account.analytic.line">
-        <field name="name">Delivery</field>
-        <field name="employee_id" ref="hr.employee_fme"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-29)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-7)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
+        <field name="project_id" ref="project.project_project_1"/>
+        <field name="task_id" ref="project.project_task_27"/>
         <field name="amount">-30.0</field>
     </record>
-
-    <record id="project_task_26_account_analytic_line_8" model="account.analytic.line">
-        <field name="name">Requirements analysis</field>
+    <record id="project_task_29_account_analytic_line_1" model="account.analytic.line">
+        <field name="name">Meeting</field>
         <field name="employee_id" ref="hr.employee_ngh"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-32)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() - relativedelta(weeks=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
+        <field name="project_id" ref="project.project_project_1"/>
+        <field name="task_id" ref="project.project_task_29"/>
         <field name="amount">-60.0</field>
     </record>
-
-    <record id="project_task_26_account_analytic_line_9" model="account.analytic.line">
-        <field name="name">Call</field>
+    <record id="project_task_34_account_analytic_line_1" model="account.analytic.line">
+        <field name="name">Summary Writing</field>
         <field name="employee_id" ref="hr.employee_mit"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-35)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_10" model="account.analytic.line">
-        <field name="name">Delivery</field>
-        <field name="employee_id" ref="hr.employee_al"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-36)).strftime('%Y-%m-%d')"/>
+        <field name="date" eval="(DateTime.now() - relativedelta(weeks=2)).strftime('%Y-%m-%d')"/>
         <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
+        <field name="project_id" ref="project.project_project_1"/>
+        <field name="task_id" ref="project.project_task_34"/>
         <field name="amount">-60.0</field>
     </record>
-
-    <record id="project_task_26_account_analytic_line_11" model="account.analytic.line">
-        <field name="name">Presentation</field>
-        <field name="employee_id" ref="hr.employee_qdp"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-43)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_12" model="account.analytic.line">
-        <field name="name">Sprint</field>
-        <field name="employee_id" ref="hr.employee_fpi"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-45)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">2</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-60.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_13" model="account.analytic.line">
-        <field name="name">On Site Visit</field>
-        <field name="employee_id" ref="hr.employee_jod"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-51)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_14" model="account.analytic.line">
-        <field name="name">Call</field>
+    <record id="project_task_35_account_analytic_line_1" model="account.analytic.line">
+        <field name="name">Preparation</field>
         <field name="employee_id" ref="hr.employee_jgo"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-53)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-30.0</field>
-    </record>
-
-    <record id="project_task_26_account_analytic_line_15" model="account.analytic.line">
-        <field name="name">Sprint</field>
-        <field name="employee_id" ref="hr.employee_jth"/>
-        <field name="date" eval="(DateTime.now() + relativedelta(days=-53)).strftime('%Y-%m-%d')"/>
-        <field name="unit_amount">1</field>
-        <field name="project_id" ref="project.project_project_2"/>
-        <field name="task_id" ref="project.project_task_26"/>
-        <field name="amount">-30.0</field>
+        <field name="date" eval="(DateTime.now() - relativedelta(weeks=2)).strftime('%Y-%m-%d')"/>
+        <field name="unit_amount">2</field>
+        <field name="project_id" ref="project.project_project_1"/>
+        <field name="task_id" ref="project.project_task_35"/>
+        <field name="amount">-60.0</field>
     </record>
 
     <!-- Projects -->
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index f5fff81552c..ee49fd01dfa 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -51,7 +51,10 @@
         'wizard/project_delete_wizard_views.xml',
         'wizard/project_task_type_delete_views.xml',
     ],
-    'demo': ['data/project_demo.xml'],
+    'demo': [
+        'data/mail_template_demo.xml',
+        'data/project_demo.xml',
+    ],
     'test': [
     ],
     'installable': True,
diff --git a/addons/project/data/mail_template_demo.xml b/addons/project/data/mail_template_demo.xml
new file mode 100644
index 00000000000..caab48d3b05
--- /dev/null
+++ b/addons/project/data/mail_template_demo.xml
@@ -0,0 +1,24 @@
+<odoo>
+    <data>        
+        <record id="project_done_email_template" model="mail.template">
+            <field name="name">Project: Project Completed</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="subject">Project status - {{ object.name }}</field>
+            <field name="email_from">{{ (object.partner_id.email_formatted if object.partner_id else user.email_formatted) }}</field>
+            <field name="partner_to" >{{ object.partner_id.id }}</field>
+            <field name="body_html" type="html">
+<div>
+    Dear <t t-out="object.partner_id.name or 'customer'">Brandon Freeman</t>,<br/>
+    It is my pleasure to let you know that we have successfully completed the project "<strong t-out="object.name or ''">Renovations</strong>".
+    <t t-if="user.signature">
+        <br />
+        <t t-out="user.signature or ''">--<br/>Mitchell Admin</t>
+    </t>
+</div>
+<br/><span style="margin: 0px 0px 0px 0px; font-size: 12px; opacity: 0.5; color: #454748;">You are receiving this email because your project has been moved to the stage <b t-out="object.stage_id.name or ''">Done</b></span>
+            </field>
+            <field name="lang">{{ object.partner_id.lang }}</field>
+            <field name="auto_delete" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml
index 6a06b856964..8c114cc88a6 100644
--- a/addons/project/data/project_demo.xml
+++ b/addons/project/data/project_demo.xml
@@ -4,13 +4,13 @@
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('group_project_manager'))]"/>
+            <field name="groups_id" eval="[Command.link(ref('group_project_manager'))]"/>
         </record>
 
         <!-- Groups : Add subtasks, recurring tasks and task dependencies by default -->
         <record id="base.group_user" model="res.groups">
             <field name="implied_ids"
-                   eval="[(4, ref('group_subtask_project')), (4, ref('group_project_recurring_tasks')), (4, ref('group_project_task_dependencies'))]"/>
+                   eval="[Command.link(ref('group_subtask_project')), Command.link(ref('group_project_recurring_tasks')), Command.link(ref('group_project_task_dependencies'))]"/>
         </record>
 
         <!-- Categories -->
@@ -47,6 +47,11 @@
             <field name="name">Renovations</field>
         </record>
 
+        <!-- Stage templates -->
+        <record id="project.project_project_stage_2" model="project.project.stage">
+            <field name="mail_template_id" ref="project.project_done_email_template"/>
+        </record>
+
         <!-- Task Stages -->
         <record id="project_stage_0" model="project.task.type">
             <field name="sequence">1</field>
@@ -67,46 +72,64 @@
         </record>
         <record id="project_stage_3" model="project.task.type">
             <field name="sequence">30</field>
-            <field name="name">Cancelled</field>
+            <field name="name">Canceled</field>
             <field name="legend_done">Ready to reopen</field>
             <field name="fold" eval="True"/>
         </record>
 
         <record id="project_project_1" model="project.project">
-            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+            <field name="date_start" eval="DateTime.today() - relativedelta(weeks=9)"/>
+            <field name="date" eval="DateTime.today() + relativedelta(weekday=4,weeks=1)"/>
             <field name="name">Office Design</field>
             <field name="color">3</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="type_ids" eval="[(4, ref('project_stage_0')), (4, ref('project_stage_1')), (4, ref('project_stage_2')), (4, ref('project_stage_3'))]"/>
+            <field name="type_ids" eval="[Command.link(ref('project_stage_0')), Command.link(ref('project_stage_1')), Command.link(ref('project_stage_2')), Command.link(ref('project_stage_3'))]"/>
             <field name="partner_id" ref="base.partner_demo_portal"/>
             <field name="privacy_visibility">portal</field>
-            <field name="favorite_user_ids" eval="[(4, ref('base.user_admin'))]"/>
-            <field name="tag_ids" eval="[(4, ref('project.project_tags_05'))]"/>
+            <field name="favorite_user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="tag_ids" eval="[Command.link(ref('project.project_tags_05'))]"/>
             <field name="stage_id" ref="project.project_project_stage_1"/>
             <field name="analytic_account_id" ref="project.analytic_office_design"/>
         </record>
+        <record id="project_1_follower_admin" model="mail.followers">
+            <field name="res_model">project.project</field>
+            <field name="res_id" ref="project_project_1"/>
+            <field name="partner_id" ref="base.partner_admin"/>
+        </record>
 
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="privacy_visibility">followers</field>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="type_ids" eval="[(4, ref('project_stage_0')), (4, ref('project_stage_1')), (4, ref('project_stage_2')), (4, ref('project_stage_3'))]"/>
-            <field name="favorite_user_ids" eval="[(4, ref('base.user_admin'))]"/>
-            <field name="tag_ids" eval="[(4, ref('project.project_tags_04'))]"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="type_ids" eval="[Command.link(ref('project_stage_0')), Command.link(ref('project_stage_1')), Command.link(ref('project_stage_2')), Command.link(ref('project_stage_3'))]"/>
+            <field name="favorite_user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="tag_ids" eval="[Command.link(ref('project.project_tags_04'))]"/>
             <field name="stage_id" ref="project.project_project_stage_1"/>
             <field name="analytic_account_id" ref="project.analytic_research_development"/>
         </record>
+        <record id="project_2_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_project_2"/>
+            <field name="res_model_id" ref="project.model_project_project"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_meeting"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=13)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Examine project status</field>
+            <field name="create_uid" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_admin"/>
+        </record>
 
         <record id="project_project_3" model="project.project">
-            <field name="date_start" eval="(DateTime.today() + relativedelta(months=1)).strftime('%Y-%m-%d 10:00:00')"/>
+            <field name="date_start" eval="(DateTime.today() + relativedelta(months=-2)).strftime('%Y-%m-%d 10:00:00')"/>
+            <field name="date" eval="(DateTime.today() + relativedelta(days=-5)).strftime('%Y-%m-%d 17:00:00')"/>
             <field name="name">Renovations</field>
+            <field name="description">Renovation work at the YourCompany headquarters.</field>
             <field name="color">4</field>
             <field name="user_id" ref="base.user_admin"/>
-            <field name="type_ids" eval="[(4, ref('project_stage_0')), (4, ref('project_stage_1')), (4, ref('project_stage_2')), (4, ref('project_stage_3'))]"/>
-            <field name="favorite_user_ids" eval="[(4, ref('base.user_admin'))]"/>
-            <field name="tag_ids" eval="[(4, ref('project_tags_04')), (4, ref('project_tags_02'))]"/>
+            <field name="type_ids" eval="[Command.link(ref('project_stage_0')), Command.link(ref('project_stage_1')), Command.link(ref('project_stage_2')), Command.link(ref('project_stage_3'))]"/>
+            <field name="favorite_user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="tag_ids" eval="[Command.link(ref('project_tags_04')), Command.link(ref('project_tags_02'))]"/>
             <field name="stage_id" ref="project.project_project_stage_2"/>
             <field name="analytic_account_id" ref="project.analytic_renovations"/>
+            <field name="privacy_visibility">employees</field>
         </record>
 
         <!-- Personal Stages: Mitchell Admin-->
@@ -190,17 +213,27 @@
         <!-- Tasks -->
         <record id="project_task_1" model="project.task">
             <field name="planned_hours" eval="40.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Meeting Room Furnitures</field>
-            <field name="stage_id" ref="project_stage_0"/>
+            <field name="stage_id" ref="project_stage_1"/>
             <field name="color">3</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
+        <record id="project_task_1_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_task_1"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_todo"/>
+            <field name="date_deadline" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Check furniture</field>
+            <field name="create_uid" ref="base.user_demo"/>
+            <field name="user_id" ref="base.user_demo"/>
+        </record>
+
         <record id="project_task_2" model="project.task">
             <field name="planned_hours" eval="32.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Lunch Room: kitchen</field>
@@ -236,24 +269,21 @@
         <record id="project_task_2_mail_message_2_track_1" model="mail.tracking.value">
             <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
             <field name="field_desc">Stage</field>
-            <field name="old_value_char">In Prpgress</field>
+            <field name="old_value_char">In Progress</field>
             <field name="new_value_char">Done</field>
             <field name="field_type">many2one</field>
             <field name="old_value_integer">2</field>
             <field name="new_value_integer">3</field>
             <field name="mail_message_id" ref="project_task_2_mail_message_2"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_2')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
-        </function>
 
         <record id="project_task_3" model="project.task">
             <field name="planned_hours" eval="10.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Noise Reduction</field>
+            <field name="description">Installation of acoustic ceiling clouds and wall panels.</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
             <field name="stage_id" ref="project_stage_2"/>
             <field name="color">4</field>
@@ -295,14 +325,10 @@
             <field name="new_value_integer">3</field>
             <field name="mail_message_id" ref="project_task_3_mail_message_2"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_3')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
-        </function>
 
         <record id="project_task_4" model="project.task">
             <field name="planned_hours" eval="60.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Black Chairs for managers</field>
@@ -310,14 +336,10 @@
             <field name="date_deadline" eval="time.strftime('%Y-%m-19')"/>
             <field name="color">5</field>
             <field name="stage_id" ref="project_stage_1"/>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_01')])]"/>
+            <field name="kanban_state">blocked</field>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_01')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_4')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_3')}"/>
-        </function>
         <record id="project_task_4_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_4"/>
@@ -336,10 +358,29 @@
             <field name="new_value_integer">2</field>
             <field name="mail_message_id" ref="project_task_4_mail_message_1"/>
         </record>
+        <record id="project_task_4_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_4"/>
+            <field name="body">Hello Admin,
+                Can we discuss this? Having nicer chairs for managers doesn't sit right with me.
+            </field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=3)).strftime('%Y-%m-%d 09:43:27')"/>
+        </record>
+        <record id="project_task_4_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_4"/>
+            <field name="parent_id" ref="project_task_4_message_1"/>
+            <field name="body">We have already discussed, and I stand by my decision.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=3)).strftime('%Y-%m-%d 11:52:03')"/>
+        </record>
 
         <record id="project_task_5" model="project.task">
             <field name="planned_hours" eval="76.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Room 1: Decoration</field>
@@ -347,14 +388,9 @@
             <field name="priority">0</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
             <field name="stage_id" ref="project_stage_1"/>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_01')])]"/>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_01')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_5')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
-        </function>
         <record id="project_task_5_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_5"/>
@@ -373,20 +409,26 @@
             <field name="new_value_integer">2</field>
             <field name="mail_message_id" ref="project_task_5_mail_message_1"/>
         </record>
+        <record id="project_task_5_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_task_5"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(hours=2)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Call Joel Willis</field>
+            <field name="create_uid" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_admin"/>
+        </record>
 
         <record id="project_task_6" model="project.task">
             <field name="planned_hours" eval="24.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Room 2: Decoration</field>
             <field name="stage_id" ref="project_stage_1"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=6)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_6')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
-        </function>
         <record id="project_task_6_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_6"/>
@@ -408,17 +450,15 @@
 
         <record id="project_task_7" model="project.task">
             <field name="planned_hours" eval="15.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Energy Certificate</field>
             <field name="stage_id" ref="project_stage_1"/>
+            <field name="kanban_state">blocked</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=2)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_7')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
-        </function>
         <record id="project_task_7_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_7"/>
@@ -437,31 +477,32 @@
             <field name="new_value_integer">2</field>
             <field name="mail_message_id" ref="project_task_7_mail_message_1"/>
         </record>
+        <record id="project_task_7_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_task_7"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(hours=3)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Follow-up email</field>
+            <field name="create_uid" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_admin"/>
+        </record>
 
         <record id="project_task_22" model="project.task">
             <field name="planned_hours">12.0</field>
-            <field name="stage_id" ref="project_stage_1"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
+            <field name="stage_id" ref="project_stage_2"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Customer analysis + Architecture</field>
             <field name="color">7</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_22')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
-        </function>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_22')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_1')}"/>
-        </function>
         <record id="project_task_22_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_22"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=2)"/>
+            <field name="date" eval="DateTime.now() - relativedelta(weeks=16)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
         <record id="project_task_22_mail_message_1_track_1" model="mail.tracking.value">
@@ -474,50 +515,152 @@
             <field name="new_value_integer">2</field>
             <field name="mail_message_id" ref="project_task_22_mail_message_1"/>
         </record>
+        <record id="project_task_22_mail_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_22"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-16, days=4)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_22_mail_message_2_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">In Progress</field>
+            <field name="new_value_char">Done</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">2</field>
+            <field name="new_value_integer">3</field>
+            <field name="mail_message_id" ref="project_task_22_mail_message_2"/>
+        </record>
+
+        <record id="project_task_19" model="project.task">
+            <field name="planned_hours">24.0</field>
+            <field name="stage_id" ref="project_stage_2"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Basic outline</field>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_02')])]"/>
+            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_22'))]"/>
+        </record>
+        <record id="project_task_19_mail_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_19"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() - relativedelta(weeks=15)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_19_mail_message_1_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">New</field>
+            <field name="new_value_char">In Progress</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">1</field>
+            <field name="new_value_integer">2</field>
+            <field name="mail_message_id" ref="project_task_19_mail_message_1"/>
+        </record>
+        <record id="project_task_19_mail_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_19"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() - relativedelta(weeks=14)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_19_mail_message_2_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">In Progress</field>
+            <field name="new_value_char">Done</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">2</field>
+            <field name="new_value_integer">3</field>
+            <field name="mail_message_id" ref="project_task_19_mail_message_2"/>
+        </record>
 
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Planning and budget</field>
-            <field name="stage_id" ref="project_stage_0"/>
+            <field name="stage_id" ref="project_stage_1"/>
             <field name="color">6</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_22'))]"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_19'))]"/>
+            <field name="date_deadline" eval="DateTime.now() - relativedelta(days=4)"/>
+        </record>
+        <record id="project_task_12_mail_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_12"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-14, days=1)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_12_mail_message_1_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">New</field>
+            <field name="new_value_char">In Progress</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">1</field>
+            <field name="new_value_integer">2</field>
+            <field name="mail_message_id" ref="project_task_12_mail_message_1"/>
+        </record>
+        <record id="project_task_12_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_12"/>
+            <field name="body">Hello Demo,
+There is a change in customer requirement.
+Can you check the document from customer again.
+Thanks,</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weeks=-9, days=2)).strftime('%Y-%m-%d 11:23:17')"/>
+        </record>
+        <record id="project_task_12_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_12"/>
+            <field name="parent_id" ref="project_task_12_message_1"/>
+            <field name="body">Ok, I have checked the mail,
+I will update the document and let you know.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weeks=-9, days=2)).strftime('%Y-%m-%d 12:04:58')"/>
+        </record>
+        <record id="project_task_12_message_3" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_12"/>
+            <field name="parent_id" ref="project_task_12_message_2"/>
+            <field name="body">Fine!
+Send it ASAP, its urgent.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weeks=-9, days=2)).strftime('%Y-%m-%d 12:15:26')"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_12')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_2')}"/>
-        </function>
 
         <record id="project_task_8" model="project.task">
             <field name="planned_hours" eval="22.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">New portal system</field>
             <field name="priority">0</field>
             <field name="stage_id" ref="project_stage_2"/>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project.project_tags_02')])]"/>
+            <field name="tag_ids" eval="[Command.set([ref('project.project_tags_02')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_12'))]"/>
         </record>
         <record id="project_task_8_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_8"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(days=3)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_8_mail_message_2" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_8"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(days=1)"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-12, days=5)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
         <record id="project_task_8_mail_message_1_track_1" model="mail.tracking.value">
@@ -530,6 +673,14 @@
             <field name="new_value_integer">2</field>
             <field name="mail_message_id" ref="project_task_8_mail_message_1"/>
         </record>
+        <record id="project_task_8_mail_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_8"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-9, days=3)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
         <record id="project_task_8_mail_message_2_track_1" model="mail.tracking.value">
             <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
             <field name="field_desc">Stage</field>
@@ -540,32 +691,26 @@
             <field name="new_value_integer">3</field>
             <field name="mail_message_id" ref="project_task_8_mail_message_2"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_8')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
-        </function>
 
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Social network integration</field>
+            <field name="description">Facebook and Twitter integration</field>
             <field name="kanban_state">blocked</field>
             <field name="stage_id" ref="project_stage_1"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_12'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=5)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_10')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_4')}"/>
-        </function>
         <record id="project_task_10_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_10"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4, days=5)"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-12, days=6)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
         <record id="project_task_10_mail_message_1_track_1" model="mail.tracking.value">
@@ -581,27 +726,25 @@
 
         <record id="project_task_11" model="project.task">
             <field name="planned_hours" eval="16.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">User interface improvements</field>
-            <field name="tag_ids" eval="[(6, 0, [
+            <field name="tag_ids" eval="[Command.set([
                     ref('project.project_tags_01'),
                     ref('project.project_tags_03')])]"/>
             <field name="stage_id" ref="project_stage_1"/>
+            <field name="kanban_state">done</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_12'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=1)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_11')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
-        </function>
         <record id="project_task_11_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_11"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4)"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-11)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
         <record id="project_task_11_mail_message_1_track_1" model="mail.tracking.value">
@@ -615,42 +758,64 @@
             <field name="mail_message_id" ref="project_task_11_mail_message_1"/>
         </record>
 
+        <record id="project_task_13" model="project.task">
+            <field name="planned_hours" eval="20.0"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="stage_id" ref="project_stage_3"/>
+            <field name="priority">0</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Code Documentation</field>
+            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="active" eval="False"/>
+        </record>
+
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
             <field name="user_ids" eval="False"/>
-            <field name="stage_id" ref="project_stage_0"/>
+            <field name="stage_id" ref="project_stage_1"/>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Create new components</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_12'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=4)"/>
+        </record>
+        <record id="project_task_20_mail_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_20"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() + relativedelta(weeks=-11, days=3)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_20_mail_message_1_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">New</field>
+            <field name="new_value_char">In Progress</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">1</field>
+            <field name="new_value_integer">2</field>
+            <field name="mail_message_id" ref="project_task_20_mail_message_1"/>
         </record>
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
-            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
-            <field name="stage_id" ref="project_stage_1"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
+            <field name="stage_id" ref="project_stage_0"/>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Usability review</field>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_03')])]"/>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_03')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
             <field name="depend_on_ids"
-                   eval="[(4, ref('project.project_task_8')), (4, ref('project.project_task_10')), (4, ref('project.project_task_11')), (4, ref('project.project_task_20'))]"/>
+                   eval="[Command.link(ref('project.project_task_8')), Command.link(ref('project.project_task_10')), Command.link(ref('project.project_task_11')), Command.link(ref('project.project_task_20'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=9)"/>
         </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_21')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_3')}"/>
-        </function>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_21')), ('user_id', '=', ref('base.user_demo'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_demo_2')}"/>
-        </function>
         <record id="project_task_21_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
             <field name="res_id" ref="project.project_task_21"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=1)"/>
+            <field name="date" eval="DateTime.now() - relativedelta(weeks=10)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
         <record id="project_task_21_mail_message_1_track_1" model="mail.tracking.value">
@@ -666,51 +831,15 @@
 
         <record id="project_task_9" model="project.task">
             <field name="planned_hours" eval="18.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Document management</field>
             <field name="stage_id" ref="project_stage_0"/>
+            <field name="kanban_state">done</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_21'))]"/>
-        </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_9')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
-        </function>
-
-        <record id="project_task_19" model="project.task">
-            <field name="planned_hours">24.0</field>
-            <field name="stage_id" ref="project_stage_1"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
-            <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Basic outline</field>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_02')])]"/>
-            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_22'))]"/>
-        </record>
-        <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_19')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
-        </function>
-        <record id="project_task_19_mail_message_1" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_19"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_19_mail_message_1_track_1" model="mail.tracking.value">
-            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
-            <field name="field_desc">Stage</field>
-            <field name="old_value_char">New</field>
-            <field name="new_value_char">In Progress</field>
-            <field name="field_type">many2one</field>
-            <field name="old_value_integer">1</field>
-            <field name="new_value_integer">2</field>
-            <field name="mail_message_id" ref="project_task_19_mail_message_1"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_21'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=15)"/>
         </record>
 
         <record id="project_task_24" model="project.task">
@@ -721,8 +850,8 @@
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Modifications asked by the customer</field>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_00')])]"/>
+            <field name="description">Modifications to the kitchen of the lunch room</field>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_00')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
         <record id="project_task_24_mail_message_1" model="mail.message">
@@ -768,7 +897,7 @@
             <field name="user_ids" eval="False"/>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Office planning</field>
-            <field name="stage_id" ref="project_stage_0"/>
+            <field name="stage_id" ref="project_stage_2"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
 
@@ -778,153 +907,276 @@
             <field name="user_ids" eval="False"/>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Unit Testing</field>
-            <field name="stage_id" ref="project_stage_2"/>
+            <field name="description">The most important part!</field>
+            <field name="stage_id" ref="project_stage_0"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-            <field name="depend_on_ids" eval="[(4, ref('project.project_task_21'))]"/>
-        </record>
-        <record id="project_task_26_mail_message_1" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_26"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_26_mail_message_2" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_26"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=3)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_26_mail_message_1_track_1" model="mail.tracking.value">
-            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
-            <field name="field_desc">Stage</field>
-            <field name="old_value_char">New</field>
-            <field name="new_value_char">In Progress</field>
-            <field name="field_type">many2one</field>
-            <field name="old_value_integer">1</field>
-            <field name="new_value_integer">2</field>
-            <field name="mail_message_id" ref="project_task_26_mail_message_1"/>
-        </record>
-        <record id="project_task_26_mail_message_2_track_1" model="mail.tracking.value">
-            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
-            <field name="field_desc">Stage</field>
-            <field name="old_value_char">In Progress</field>
-            <field name="new_value_char">Done</field>
-            <field name="field_type">many2one</field>
-            <field name="old_value_integer">2</field>
-            <field name="new_value_integer">3</field>
-            <field name="mail_message_id" ref="project_task_26_mail_message_2"/>
+            <field name="depend_on_ids" eval="[Command.link(ref('project.project_task_21'))]"/>
+            <field name="date_deadline" eval="DateTime.now() + relativedelta(days=15)"/>
         </record>
 
         <record id="project_task_30" model="project.task">
             <field name="planned_hours" eval="40.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Entry Hall</field>
             <field name="stage_id" ref="project_stage_2"/>
             <field name="color">3</field>
         </record>
+
         <record id="project_task_31" model="project.task">
             <field name="planned_hours" eval="10.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Check Lift</field>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
+            <field name="date_deadline" eval="DateTime.today() + relativedelta(days=-10)"/>
             <field name="stage_id" ref="project_stage_2"/>
             <field name="color">4</field>
         </record>
+        <record id="project_task_31_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_31"/>
+            <field name="body">The elevator's state leaves much to be desired on many levels, we might need to take steps to repair it.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(weeks=3)).strftime('%Y-%m-%d 09:42:13')"/>
+        </record>
+        <record id="project_task_31_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_31"/>
+            <field name="parent_id" ref="project_task_31_message_1"/>
+            <field name="body">This is not very uplifting, it would probably raise the expenses by a lot. 😕</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(weeks=3)).strftime('%Y-%m-%d 10:23:48')"/>
+        </record>
+        <record id="project_task_31_message_3" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_31"/>
+            <field name="parent_id" ref="project_task_31_message_2"/>
+            <field name="body">I know, it's driving me up the wall.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(weeks=3)).strftime('%Y-%m-%d 10:57:04')"/>
+        </record>
+
         <record id="project_task_32" model="project.task">
             <field name="planned_hours" eval="24.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Room 1: Paint</field>
+            <field name="description">Repaint the walls with the hex color #0FF1CE</field>
             <field name="kanban_state">done</field>
             <field name="priority">0</field>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
+            <field name="date_deadline" eval="DateTime.today() - relativedelta(days=5)"/>
             <field name="stage_id" ref="project_stage_2"/>
-            <field name="tag_ids" eval="[(6, 0, [ref('project_tags_01')])]"/>
+            <field name="tag_ids" eval="[Command.set([ref('project_tags_01')])]"/>
         </record>
+
         <record id="project_task_33" model="project.task">
             <field name="planned_hours" eval="76.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Bathroom</field>
             <field name="stage_id" ref="project_stage_2"/>
         </record>
+
+        <record id="project_task_37" model="project.task">
+            <field name="planned_hours" eval="40.0"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+            <field name="priority">1</field>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Room 2: Paint</field>
+            <field name="stage_id" ref="project_stage_3"/>
+            <field name="active">False</field>
+        </record>
+
+        <function model="project.project" name="message_subscribe"
+            eval="[ref('project.project_project_1')], [ref('base.partner_demo_portal')]"/>
+
+        <!-- Private tasks -->
+        <record id="project_private_task_1" model="project.task">
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="project_id"/>
+            <field name="name">Buy a gift for Marc Demo's birthday</field>
+        </record>
+        <record id="project_private_task_2" model="project.task">
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+            <field name="project_id"/>
+            <field name="name">Change left screen cable</field>
+        </record>
+        <record id="project_private_task_3" model="project.task">
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+            <field name="project_id"/>
+            <field name="name">Clean kitchen fridge</field>
+        </record>
+        <record id="project_private_task_4" model="project.task">
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+            <field name="project_id"/>
+            <field name="name">Check employees lunch accounts</field>
+        </record>
+
+
+        <!-- Tasks personal stages -->
+        <!-- Admin -->
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_9')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_0')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_5')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_1')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_12')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_private_task_2')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_private_task_1')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_3')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_6')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_7')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_11')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_21')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_4')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_3')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_8')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_19')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_22')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_31')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_32')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
+        </function>
         <function model="project.task.stage.personal" name="write">
             <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_33')), ('user_id', '=', ref('base.user_admin'))]"/>
             <value eval="{'stage_id': ref('project_personal_stage_admin_5')}"/>
         </function>
 
-        <record id="message_task_1" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project_task_22"/>
-            <field name="body">Hello Demo,
-There is a change in customer requirement.
-Can you check the document from customer again.
-Thanks,</field>
-            <field name="message_type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
-        </record>
-        <record id="message_task_2" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project_task_22"/>
-            <field name="parent_id" ref="message_task_1"/>
-            <field name="body">Ok, I have checked the mail,
-I will update the document and let you know.</field>
-            <field name="message_type">comment</field>
-            <field name="author_id" ref="base.partner_demo"/>
-        </record>
-        <record id="message_task_3" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project_task_22"/>
-            <field name="parent_id" ref="message_task_2"/>
-            <field name="body">Fine!
-Send it ASAP, its urgent.</field>
-            <field name="message_type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
-        </record>
-
-        <function model="project.project" name="message_subscribe"
-            eval="[ref('project.project_project_1')], [ref('base.partner_demo_portal')]"/>
+        <!-- Demo -->
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_1')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_1')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_private_task_4')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_1')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_12')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_private_task_3')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_4')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_3')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_21')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_3')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_10')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_4')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_2')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_8')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_22')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_30')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_37')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project_personal_stage_demo_6')}"/>
+        </function>
 
 
         <!-- Rating Demo Data -->
         <record id="rating_task_1" model="rating.rating">
             <field name="res_model_id" ref="project.model_project_task"/>
             <field name="rated_partner_id" ref="base.partner_root"/>
-            <field name="partner_id" ref="base.partner_demo"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
             <field name="res_id" ref="project.project_task_3"/>
         </record>
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_3')], 5, None, 'Good Job')"/>
+
         <record id="rating_task_2" model="rating.rating">
             <field name="res_model_id" ref="project.model_project_task"/>
             <field name="rated_partner_id" ref="base.partner_demo"/>
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="res_id" ref="project.project_task_8"/>
         </record>
-        <record id="rating_task_5" model="rating.rating">
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_8')], 1, 'Not as good as expected')"/>
+
+        <record id="rating_task_3" model="rating.rating">
             <field name="res_model_id" ref="project.model_project_task"/>
             <field name="rated_partner_id" ref="base.partner_root"/>
-            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
             <field name="res_id" ref="project.project_task_24"/>
         </record>
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_24')], 5, None, 'Exactly what I asked for, thank you!')"/>
+
+        <record id="rating_task_4" model="rating.rating">
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="rated_partner_id" ref="base.partner_root"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field name="res_id" ref="project.project_task_2"/>
+        </record>
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_2')], 1, None, 'There must have been some miscomunication, because the result is not quite what I had in mind. I would like to request some modifications.')"/>
+
 
         <!-- add the email template as value for the project stage 2 -->
         <record id="project.project_stage_2" model="project.task.type">
             <field name="rating_template_id" ref="rating_project_request_email_template"/>
         </record>
 
-        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_3')], 5, None, 'Good Job')"/>
-        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_24')], 5, None, 'Great work')"/>
-        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_8')], 1, None, 'Not as good as expected')"/>
-
         <record id="project_milestone_1" model="project.milestone">
             <field name="is_reached" eval="True"/>
             <field name="deadline" eval="time.strftime('%Y-%m-10')"/>
diff --git a/addons/project_hr_expense/__manifest__.py b/addons/project_hr_expense/__manifest__.py
index 563207c5e81..ac7a50435f5 100644
--- a/addons/project_hr_expense/__manifest__.py
+++ b/addons/project_hr_expense/__manifest__.py
@@ -12,7 +12,9 @@
     'data': [
         'views/project_project_views.xml',
     ],
-    'demo': [],
+    'demo': [
+        'data/project_hr_expense_demo.xml',
+    ],
     'installable': True,
     'auto_install': True,
     'license': 'OEEL-1',
diff --git a/addons/project_hr_expense/data/project_hr_expense_demo.xml b/addons/project_hr_expense/data/project_hr_expense_demo.xml
new file mode 100644
index 00000000000..31038365c74
--- /dev/null
+++ b/addons/project_hr_expense/data/project_hr_expense_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="hr_expense.travel_admin_by_car_expense" model="hr.expense">
+            <field name="analytic_account_id" ref="project.analytic_office_design"/>
+        </record>
+        <record id="hr_expense.travel_demo_by_car_expense" model="hr.expense">
+            <field name="analytic_account_id" ref="project.analytic_office_design"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/project_mrp/__manifest__.py b/addons/project_mrp/__manifest__.py
index 41f15b7a6bb..757f323ebf4 100644
--- a/addons/project_mrp/__manifest__.py
+++ b/addons/project_mrp/__manifest__.py
@@ -11,6 +11,9 @@
     'data': [
         'views/project_views.xml',
     ],
+    'demo': [
+        'data/project_mrp_demo.xml',
+    ],
     'application': False,
     'auto_install': True,
     'license': 'LGPL-3',
diff --git a/addons/project_mrp/data/project_mrp_demo.xml b/addons/project_mrp/data/project_mrp_demo.xml
new file mode 100644
index 00000000000..0dda83a3947
--- /dev/null
+++ b/addons/project_mrp/data/project_mrp_demo.xml
@@ -0,0 +1,7 @@
+<odoo>
+    <data noupdate="1">
+        <record id="mrp.mrp_production_3" model="mrp.production">
+            <field name="analytic_account_id" ref="project.analytic_office_design"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/project_purchase/__manifest__.py b/addons/project_purchase/__manifest__.py
index 02568373a60..60aadfaccba 100644
--- a/addons/project_purchase/__manifest__.py
+++ b/addons/project_purchase/__manifest__.py
@@ -11,6 +11,9 @@
     'data': [
         'views/project_views.xml',
     ],
+    'demo': [
+        'data/project_purchase_demo.xml',
+    ],
     'application': False,
     'auto_install': True,
     'license': 'LGPL-3',
diff --git a/addons/project_purchase/data/project_purchase_demo.xml b/addons/project_purchase/data/project_purchase_demo.xml
new file mode 100644
index 00000000000..bfae67acce3
--- /dev/null
+++ b/addons/project_purchase/data/project_purchase_demo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="purchase.order.line" name="write">
+            <value model="purchase.order.line" search="[('product_id', 'in', [ref('product.product_delivery_01'), ref('product.product_product_27')]), ('order_id', '=', ref('purchase.purchase_order_1'))]"/>
+            <value eval="{'account_analytic_id': ref('project.analytic_office_design')}"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml
index 4ceb33c918b..17d93179c0a 100644
--- a/addons/sale_timesheet/data/sale_service_demo.xml
+++ b/addons/sale_timesheet/data/sale_service_demo.xml
@@ -11,6 +11,14 @@
             <field name="product_uom_qty">5.0</field>
         </record>
 
+        <!-- Project Template -->
+        <record id="so_template_project" model="project.project">
+            <field name="name">Sales Order</field>
+            <field name="active">False</field>
+            <field name="type_ids" eval="[Command.link(ref('project.project_stage_0')), Command.link(ref('project.project_stage_1')), Command.link(ref('project.project_stage_2'))]"/>
+            <field name="description">This project is used as a template for projects created from sales orders.</field>
+        </record>
+
         <!-- Projects and Analytic Account -->
         <record id="account_analytic_account_project_support" model="account.analytic.account">
             <field name="name">After-Sales Services</field>
@@ -21,15 +29,25 @@
         <record id="project_support" model="project.project">
             <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
             <field name="name">After-Sales Services</field>
+            <field name="description">Services provided to customers who have purchased products.</field>
+            <field name="user_id" eval=""/>
             <field name="analytic_account_id" ref="account_analytic_account_project_support"/>
-            <field name="allow_billable" eval="True"/>
-            <field name="type_ids" eval="[(4, ref('project.project_stage_0')), (4, ref('project.project_stage_1')), (4, ref('project.project_stage_2'))]"/>
+            <field name="allow_billable" eval="True" />
+            <field name="type_ids" eval="[Command.link(ref('project.project_stage_0')), Command.link(ref('project.project_stage_1')), Command.link(ref('project.project_stage_2'))]"/>
+            <field name="label_tasks">Services</field>
+            <field name="privacy_visibility">followers</field>
+        </record>
+
+        <record id="support_follower_admin" model="mail.followers">
+            <field name="res_model">project.project</field>
+            <field name="res_id" ref="project_support"/>
+            <field name="partner_id" ref="base.partner_admin"/>
         </record>
 
         <!-- Project Task -->
         <record id="project_task_internal" model="project.task">
             <field name="name">Internal training</field>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
         </record>
@@ -56,6 +74,7 @@
             <field name="service_policy">ordered_timesheet</field>
             <field name="service_tracking">task_global_project</field>
             <field name="project_id" ref="project_support"/>
+            <field name="service_upsell_threshold">0.8</field>
         </record>
 
         <record id="product_service_deliver_timesheet_1" model="product.product">
@@ -68,6 +87,7 @@
             <field name="uom_po_id" ref="uom.product_uom_hour"/>
             <field name="service_policy">delivered_timesheet</field>
             <field name="service_tracking">task_in_project</field>
+            <field name="project_template_id" ref="so_template_project"/>
         </record>
 
         <record id="product_service_deliver_timesheet_2" model="product.product">
@@ -80,6 +100,7 @@
             <field name="uom_po_id" ref="uom.product_uom_hour"/>
             <field name="service_policy">delivered_timesheet</field>
             <field name="service_tracking">task_in_project</field>
+            <field name="project_template_id" ref="so_template_project"/>
         </record>
 
         <record id="product_service_deliver_manual" model="product.product">
@@ -94,14 +115,13 @@
             <field name="service_tracking">no</field>
         </record>
 
-        <!-- Sales orders -->
+        <!-- Sales order 'sale_order_1' (AGR) -->
         <record id="sale_order_1" model="sale.order">
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="client_order_ref">AGR</field>
             <field name="user_id" ref="base.user_admin"/>
-            <field name="tag_ids" eval="[(4, ref('sales_team.categ_oppor6'))]"/>
+            <field name="tag_ids" eval="[Command.link(ref('sales_team.categ_oppor6'))]"/>
         </record>
-
         <record id="sale_line_11" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
             <field name="sequence" eval="1"/>
@@ -119,7 +139,35 @@
             <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>
+            <field name="product_uom_qty">25</field>
+        </record>
+        <record id="sale_line_14" 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="price_unit">220</field>
+            <field name="product_uom_qty">15</field>
+        </record>
+        <record id="sale_line_15" 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="price_unit">230</field>
+            <field name="product_uom_qty">20</field>
+        </record>
+        <record id="sale_line_16" model="sale.order.line">
+            <field name="order_id" ref="sale_timesheet.sale_order_1"/>
+            <field name="product_id" ref="product_service_deliver_timesheet_2"/>
+            <field name="sequence" eval="2"/>
+            <field name="price_unit">120</field>
+            <field name="product_uom_qty">10</field>
+        </record>
+        <record id="sale_line_17" model="sale.order.line">
+            <field name="order_id" ref="sale_timesheet.sale_order_1"/>
+            <field name="product_id" ref="product_service_deliver_timesheet_2"/>
+            <field name="sequence" eval="2"/>
+            <field name="price_unit">110</field>
+            <field name="product_uom_qty">10</field>
         </record>
 
         <!-- Sale Order 'sale_order_2' (Delta PC) -->
@@ -127,7 +175,7 @@
             <field name="partner_id" ref="base.res_partner_4"/>
             <field name="client_order_ref">DPC</field>
             <field name="user_id" ref="base.user_admin"/>
-            <field name="tag_ids" eval="[(4, ref('sales_team.categ_oppor4')), (4, ref('sales_team.categ_oppor7'))]"/>
+            <field name="tag_ids" eval="[Command.link(ref('sales_team.categ_oppor3')), Command.link(ref('sales_team.categ_oppor5'))]"/>
         </record>
 
         <record id="sale_line_21" model="sale.order.line">
@@ -140,12 +188,33 @@
             <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">10</field>
+            <field name="product_uom_qty">20</field>
+        </record>
+
+        <!-- Sale Order 'sale_order_3' (DECO) -->
+        <record id="sale_order_3" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="client_order_ref">DECO</field>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="tag_ids" eval="[Command.link(ref('sales_team.categ_oppor7'))]"/>
+        </record>
+
+        <record id="sale_line_31" model="sale.order.line">
+            <field name="order_id" ref="sale_order_3"/>
+            <field name="sequence" eval="1"/>
+            <field name="product_id" ref="product_service_order_timesheet"/>
+            <field name="product_uom_qty">5</field>
+        </record>
+        <record id="sale_line_32" model="sale.order.line">
+            <field name="order_id" ref="sale_timesheet.sale_order_3"/>
+            <field name="sequence" eval="2"/>
+            <field name="product_id" ref="product_service_deliver_timesheet_1"/>
+            <field name="product_uom_qty">15</field>
         </record>
 
         <!-- Activity of sales order -->
         <record id="sale_timesheet_activity_1" model="mail.activity">
-            <field name="res_id" ref="sale_timesheet.sale_order_1"/>
+            <field name="res_id" ref="sale_timesheet.sale_order_2"/>
             <field name="res_model_id" ref="sale.model_sale_order"/>
             <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
@@ -157,54 +226,319 @@
         <!-- 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')]]"/>
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_3')]]"/>
+
+        <!-- Change order dates -->
+        <record id="sale_order_1" model="sale.order">
+            <field name="date_order" eval="datetime.now() + relativedelta(weekday=0, weeks=-3)"/>
+        </record>
+        <record id="sale_order_2" model="sale.order">
+            <field name="date_order" eval="datetime.now() + relativedelta(weekday=0, weeks=-5)"/>
+        </record>
+        <record id="sale_order_3" model="sale.order">
+            <field name="date_order" eval="datetime.now() + relativedelta(weekday=0, weeks=-1)"/>
+        </record>
+
+        <!-- Make DPC project off-track -->
+        <record id="project_update_dpc" model="project.update">
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <field name="name">Weekly review</field>
+            <field name="user_id" eval="ref('base.user_admin')"/>
+            <field name="progress" eval="5"/>
+            <field name="status">off_track</field>
+        </record>
+
+        <!-- Share AGR in portal -->
+        <record id="agr_follower_portal" model="mail.followers">
+            <field name="res_model">project.project</field>
+            <field name="res_id" model="project.project" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+        </record>
+        <record id="agr_collaborator" model="project.collaborator">
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+        </record>
+
+        <!-- SOL tasks -->
+        <record id="arg_task_1" model="project.task">
+            <field name="name">Kitchen Assembly</field>
+            <field name="sale_line_id" ref="sale_line_12"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+        </record>
+
+        <!-- Assign AGR & DPC to admin, clear description and set dates -->
+        <function model="project.project" name="write">
+            <value model="project.project" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <value eval="{
+                'user_id': ref('base.user_admin'),
+                'description': None,
+                'date_start': datetime.now() + relativedelta(weekday=0, weeks=-3),
+                'date': datetime.now() + relativedelta(weekday=0,weeks=5),
+            }"/>
+        </function>
+
+        <function model="project.project" name="write">
+            <value model="project.project" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <value eval="{
+                'user_id': ref('base.user_admin'),
+                'description': None,
+                'date_start': datetime.now() + relativedelta(weekday=0,weeks=-5),
+                'date': datetime.now() + relativedelta(weekday=0,weeks=3),
+            }"/>
+        </function>
+
+        <!-- Assign DECO & to demo, clear description and set dates -->
+        <function model="project.project" name="write">
+            <value model="project.project" search="[('sale_line_id', '=', ref('sale_line_32'))]"/>
+            <value eval="{
+                'user_id': ref('base.user_demo'),
+                'description': None,
+                'date_start': datetime.now() + relativedelta(weekday=0),
+                'date': datetime.now() + relativedelta(weekday=0,weeks=2),
+            }"/>
+        </function>
 
         <!-- Add project to favorite list of admin -->
         <function model="project.project" name="write">
             <value model="project.project" eval="obj().search([('sale_line_id', '=', ref('sale_line_13'))]).ids"/>
-            <value eval="{'favorite_user_ids': [(4, ref('base.user_admin'))]}"/>
+            <value eval="{'favorite_user_ids': [Command.link(ref('base.user_admin'))]}"/>
         </function>
 
-        <!-- Assign sale order's task to admin -->
+        <!-- Assign sale order 1's tasks -->
         <function model="project.task" name="write">
             <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_13'))]).ids"/>
-            <value eval="{'user_ids': [(4, ref('base.user_admin'))]}"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_14'))]).ids"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_15'))]).ids"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_16'))]).ids"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_17'))]).ids"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}"/>
+        </function>
+
+        <!-- Assign sale order 2's task to demo -->
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_demo'))]}"/>
+        </function>
+
+        <!-- Tasks progress -->
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_1')}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_1')}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_2')}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_16'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_1')}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_1')}"/>
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_22'))]"/>
+            <value eval="{'stage_id': ref('project.project_stage_1')}"/>
+        </function>
+
+        <!-- Personal stages for SOL tasks -->
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id.sale_line_id', '=', ref('sale_line_13')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_admin_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id.sale_line_id', '=', ref('sale_line_22')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_demo_1')}"/>
+        </function>
+
+        <!-- Activities for SOL tasks -->
+        <record id="project_task_agr_activity_1" model="mail.activity">
+            <field name="res_id" model="project.task" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_upload_document"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Upload new plans</field>
+            <field name="create_uid" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_admin"/>
+        </record>
+
+        <!-- Assign Support tasks to admin -->
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_11'))]"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}" />
+        </function>
+        <function model="project.task" name="write">
+            <value model="project.task" search="[('sale_line_id', '=', ref('sale_line_21'))]"/>
+            <value eval="{'user_ids': [Command.link(ref('base.user_admin'))]}" />
+        </function>
+
+        <!-- Project activities -->
+        <record id="project_agr_activity_1" model="mail.activity">
+            <field name="res_id" model="project.project" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <field name="res_model_id" ref="project.model_project_project"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Review progress with the customer</field>
+            <field name="create_uid" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_admin"/>
+        </record>
+
+        <!-- AGR SOL/Employee map -->
+        <function model="project.project" name="write">
+            <value model="project.project" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+            <value eval="{'sale_line_employee_ids': [
+                Command.create({
+                    'employee_id': ref('hr.employee_admin'),
+                    'sale_line_id': ref('sale_line_11'),
+                    'cost': 220,
+                }),
+                Command.create({
+                    'employee_id': ref('hr.employee_al'),
+                    'sale_line_id': ref('sale_line_13'),
+                    'cost': 150,
+                }),
+                Command.create({
+                    'employee_id': ref('hr.employee_fme'),
+                    'sale_line_id': ref('sale_line_14'),
+                    'cost': 165,
+                }),
+                Command.create({
+                    'employee_id': ref('hr.employee_hne'),
+                    'sale_line_id': ref('sale_line_15'),
+                    'cost': 175,
+                }),
+                Command.create({
+                    'employee_id': ref('hr.employee_han'),
+                    'sale_line_id': ref('sale_line_16'),
+                    'cost': 90,
+                }),
+                Command.create({
+                    'employee_id': ref('hr.employee_jve'),
+                    'sale_line_id': ref('sale_line_17'),
+                    'cost': 85,
+                }),
+            ]}"/>
         </function>
 
         <!-- Timesheets on sale_order_1 -->
-        <record id="timesheet_1" model="account.analytic.line">
+        <record id="sale_line_13_task_timesheet_1" model="account.analytic.line">
             <field name="name">Design</field>
-            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="employee_id" ref="hr.employee_jth"/>
             <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">
+        <record id="sale_line_13_task_timesheet_2" model="account.analytic.line">
             <field name="name">Fine tuning</field>
-            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="employee_id" ref="hr.employee_jth"/>
             <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">
+        <record id="sale_line_13_task_timesheet_3" model="account.analytic.line">
             <field name="name">Assembling</field>
-            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="employee_id" ref="hr.employee_jth"/>
             <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">
+        <record id="sale_line_13_task_timesheet_4" model="account.analytic.line">
             <field name="name">Delivery</field>
-            <field name="employee_id" ref="hr.employee_admin"/>
+            <field name="employee_id" ref="hr.employee_jth"/>
             <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">
+        <record id="sale_line_15_task_timesheet_1" model="account.analytic.line">
+            <field name="name">On Site Visit</field>
+            <field name="employee_id" ref="hr.employee_hne"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">4.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_15_task_timesheet_2" model="account.analytic.line">
+            <field name="name">Planning</field>
+            <field name="employee_id" ref="hr.employee_hne"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">3.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_15_task_timesheet_3" model="account.analytic.line">
+            <field name="name">Building</field>
+            <field name="employee_id" ref="hr.employee_hne"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_15_task_timesheet_4" model="account.analytic.line">
+            <field name="name">Delivery</field>
+            <field name="employee_id" ref="hr.employee_hne"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">3.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_15_task_timesheet_5" model="account.analytic.line">
+            <field name="name">Quality Check</field>
+            <field name="employee_id" ref="hr.employee_hne"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=5,weeks=-3)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">5.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_15'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+
+        <record id="sale_line_16_task_timesheet_1" model="account.analytic.line">
+            <field name="name">Requirement Analysis</field>
+            <field name="employee_id" ref="hr.employee_han"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-1)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">2.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_16'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_16_task_timesheet_2" model="account.analytic.line">
+            <field name="name">Research</field>
+            <field name="employee_id" ref="hr.employee_han"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-1)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">3.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_16'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+        <record id="sale_line_16_task_timesheet_3" model="account.analytic.line">
+            <field name="name">Quality Check</field>
+            <field name="employee_id" ref="hr.employee_han"/>
+            <field name="date" eval="(DateTime.now() + relativedelta(weekday=2,weeks=-1)).strftime('%Y-%m-%d')"/>
+            <field name="unit_amount">2.00</field>
+            <field name="task_id" search="[('sale_line_id', '=', ref('sale_line_16'))]"/>
+            <field name="project_id" search="[('sale_line_id', '=', ref('sale_line_13'))]"/>
+        </record>
+
+        <record id="sale_line_11_task_timesheet_1" model="account.analytic.line">
             <field name="name">Requirements analysis</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-2)).strftime('%Y-%m-%d')"/>
@@ -212,7 +546,7 @@
             <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">
+        <record id="sale_line_11_task_timesheet_2" model="account.analytic.line">
             <field name="name">Client meeting</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-2)).strftime('%Y-%m-%d')"/>
@@ -220,15 +554,15 @@
             <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">
+        <record id="sale_line_11_task_timesheet_3" model="account.analytic.line">
             <field name="name">Requirements check</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="unit_amount">3.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">
+        <record id="sale_line_11_task_timesheet_4" model="account.analytic.line">
             <field name="name">Requirements analysis</field>
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-2)).strftime('%Y-%m-%d')"/>
@@ -236,39 +570,39 @@
             <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">
+        <record id="sale_line_11_task_timesheet_5" model="account.analytic.line">
             <field name="name">Building</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-2)).strftime('%Y-%m-%d')"/>
-            <field name="unit_amount">1.00</field>
+            <field name="unit_amount">2.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">
+        <record id="sale_line_11_task_timesheet_6" model="account.analytic.line">
             <field name="name">Research</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-3)).strftime('%Y-%m-%d')"/>
-            <field name="unit_amount">1.00</field>
+            <field name="unit_amount">3.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">
+        <record id="sale_line_11_task_timesheet_7" model="account.analytic.line">
             <field name="name">Assembling</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=1,weeks=-3)).strftime('%Y-%m-%d')"/>
-            <field name="unit_amount">1.00</field>
+            <field name="unit_amount">2.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">
+        <record id="sale_line_11_task_timesheet_8" 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="unit_amount">2.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">
+        <record id="sale_line_11_task_timesheet_9" model="account.analytic.line">
             <field name="name">Assembling</field>
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=3,weeks=-3)).strftime('%Y-%m-%d')"/>
@@ -276,50 +610,50 @@
             <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">
+        <record id="sale_line_11_task_timesheet_10" model="account.analytic.line">
             <field name="name">Wood chopping</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=4,weeks=-3)).strftime('%Y-%m-%d')"/>
-            <field name="unit_amount">1.00</field>
+            <field name="unit_amount">2.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">
+        <record id="sale_line_22_task_timesheet_1" 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="unit_amount">4.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">
+        <record id="sale_line_22_task_timesheet_2" model="account.analytic.line">
             <field name="name">Quality analysis</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="unit_amount">2.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">
+        <record id="sale_line_22_task_timesheet_3" model="account.analytic.line">
             <field name="name">Repair</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="unit_amount">1.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">
+        <record id="sale_line_22_task_timesheet_4" model="account.analytic.line">
             <field name="name">Initial design improvement</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="unit_amount">2.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">
+        <record id="sale_line_21_task_timesheet_1" model="account.analytic.line">
             <field name="name">Knowledge transfer</field>
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-5)).strftime('%Y-%m-%d')"/>
@@ -327,7 +661,7 @@
             <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">
+        <record id="sale_line_21_task_timesheet_2" model="account.analytic.line">
             <field name="name">Document analysis</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-4)).strftime('%Y-%m-%d')"/>
@@ -335,7 +669,7 @@
             <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">
+        <record id="sale_line_21_task_timesheet_3" model="account.analytic.line">
             <field name="name">Design analysis</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-3)).strftime('%Y-%m-%d')"/>
@@ -343,7 +677,7 @@
             <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">
+        <record id="sale_line_21_task_timesheet_4" model="account.analytic.line">
             <field name="name">Requirements meeting</field>
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="date" eval="(DateTime.now() + relativedelta(weekday=0,weeks=-2)).strftime('%Y-%m-%d')"/>
@@ -353,7 +687,7 @@
         </record>
 
         <!-- Non billable Timesheets in project_support -->
-        <record id="timesheet_23" model="account.analytic.line">
+        <record id="project_task_internal_timesheet_1" model="account.analytic.line">
             <field name="name">Technical training</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(months=-2, days=-10)).strftime('%Y-%m-%d')"/>
@@ -361,7 +695,7 @@
             <field name="project_id" ref="project.project_project_1"/>
             <field name="task_id" ref="project_task_internal"/>
         </record>
-        <record id="timesheet_24" model="account.analytic.line">
+        <record id="project_task_internal_timesheet_2" model="account.analytic.line">
             <field name="name">Internal training</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(months=-2, days=-12)).strftime('%Y-%m-%d')"/>
@@ -369,7 +703,7 @@
             <field name="project_id" ref="project.project_project_1"/>
             <field name="task_id" ref="project_task_internal"/>
         </record>
-        <record id="timesheet_25" model="account.analytic.line">
+        <record id="project_task_internal_timesheet_3" model="account.analytic.line">
             <field name="name">Internal discussion</field>
             <field name="employee_id" ref="hr.employee_admin"/>
             <field name="date" eval="(DateTime.now() + relativedelta(months=-2, days=-13)).strftime('%Y-%m-%d')"/>
@@ -377,7 +711,7 @@
             <field name="project_id" ref="project.project_project_1"/>
             <field name="task_id" ref="project_task_internal"/>
         </record>
-        <record id="timesheet_26" model="account.analytic.line">
+        <record id="project_task_internal_timesheet_4" model="account.analytic.line">
             <field name="name">Details improvement</field>
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="date" eval="(DateTime.now() + relativedelta(months=-2, days=-11)).strftime('%Y-%m-%d')"/>
@@ -434,23 +768,15 @@
             <field name="unit_amount">1.00</field>
         </record>
 
-        <record id="project.project_stage_1" model="project.task.type">
-            <field name="project_ids" model="project.project" eval="[(4, obj().search([('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))], limit=1).id)]"/>
-        </record>
-
-        <record id="project.project_stage_2" model="project.task.type">
-            <field name="project_ids" model="project.project" eval="[(4, obj().search([('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))], limit=1).id)]"/>
-        </record>
-
+        <!-- SO1 project tasks -->
         <record id="project_task_1" model="project.task">
             <field name="name">Decoration</field>
             <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
             <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="stage_id" ref="project.project_stage_2"/>
-            <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
-            <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
         </record>
 
         <record id="project_task_2" model="project.task">
@@ -459,9 +785,8 @@
             <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="stage_id" ref="project.project_stage_2"/>
-            <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
-            <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
         </record>
 
         <record id="project_task_3" model="project.task">
@@ -469,23 +794,196 @@
             <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
             <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
-            <field name="stage_id" ref="project.project_stage_2"/>
-            <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
-            <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
+            <field name="stage_id" ref="project.project_stage_1"/>
             <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
         </record>
 
         <record id="project_task_4" model="project.task">
             <field name="name">Furniture Delivery</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="stage_id" ref="project.project_stage_1"/>
+            <field name="kanban_state">done</field>
             <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
             <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
         </record>
 
-        <!-- Personal stages for those tasks -->
+        <!-- SO2 project tasks -->
+        <record id="project_task_5" model="project.task">
+            <field name="name">Plastering</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_1"/>
+            <field name="kanban_state">done</field>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+        </record>
+
+        <record id="project_task_6" model="project.task">
+            <field name="name">Project Planning</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_2"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin')), Command.link(ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_task_7" model="project.task">
+            <field name="name">Wall Painting</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_1"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+        </record>
+        <record id="project_task_7_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_task_7"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_todo"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(hours=4)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Order paint</field>
+            <field name="create_uid" ref="base.user_demo"/>
+            <field name="user_id" ref="base.user_demo"/>
+        </record>
+
+        <record id="project_task_8" model="project.task">
+            <field name="name">Carpet fitting</field>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_0"/>
+            <field name="kanban_state">blocked</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
+        </record>
+        <record id="project_task_8_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_8"/>
+            <field name="body">Hello Admin,
+                I know you wanted my help to fit the carpet, but I unfortunately won't be available.
+                Sorry for the short notice.
+            </field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=2)).strftime('%Y-%m-%d 14:09:16')"/>
+        </record>
+        <record id="project_task_8_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_8"/>
+            <field name="parent_id" ref="project_task_8_message_1"/>
+            <field name="body">Demo, I did not expect you to pull the rug out from under me like that!</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=2)).strftime('%Y-%m-%d 14:45:52')"/>
+        </record>
+
+        <record id="project_task_9" model="project.task">
+            <field name="name">Electricity</field>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_2"/>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+        </record>
+        <record id="project_task_9_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_9"/>
+            <field name="body">Demo, I'm shocked to see this negative review, what happened with the cables? </field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=1)).strftime('%Y-%m-%d 10:26:23')"/>
+        </record>
+        <record id="project_task_9_message_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_9"/>
+            <field name="parent_id" ref="project_task_9_message_1"/>
+            <field name="body">Hello Admin, I'm currently investigating the problem with the client.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=1)).strftime('%Y-%m-%d 10:37:56')"/>
+        </record>
+        <record id="project_task_9_message_3" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_9"/>
+            <field name="parent_id" ref="project_task_9_message_2"/>
+            <field name="body">Hopefully, this will help throw some light over this situation. Please do not charge the customer any extra time spent on this.</field>
+            <field name="message_type">comment</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="(DateTime.now() - relativedelta(days=1)).strftime('%Y-%m-%d 10:41:14')"/>
+        </record>
+        <record id="project_task_9_activity_1" model="mail.activity">
+            <field name="res_id" ref="project_task_9"/>
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
+            <field name="date_deadline" eval="(DateTime.today() + relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="summary">Call customer</field>
+            <field name="create_uid" ref="base.user_demo"/>
+            <field name="user_id" ref="base.user_demo"/>
+        </record>
+
+        <record id="project_task_10" model="project.task">
+            <field name="name">Ceiling fan</field>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_0"/>
+            <field name="kanban_state">blocked</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_task_11" model="project.task">
+            <field name="name">Plumbing</field>
+            <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_2'))]"/>
+            <field name="stage_id" ref="project.project_stage_0"/>
+            <field name="kanban_state">blocked</field>
+            <field name="sale_line_id" ref="sale_timesheet.sale_line_22"/>
+            <field name="sale_order_id" ref="sale_timesheet.sale_order_2"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="user_ids" eval="[Command.link(ref('base.user_demo'))]"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <!-- Share DPC tasks with portal -->
+        <record id="project_task_5_follower_portal" model="mail.followers">
+            <field name="res_model">project.task</field>
+            <field name="res_id" ref="project_task_5"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+        </record>
+        <record id="project_task_8_follower_portal" model="mail.followers">
+            <field name="res_model">project.task</field>
+            <field name="res_id" ref="project_task_8"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+        </record>
+        <record id="project_task_10_follower_portal" model="mail.followers">
+            <field name="res_model">project.task</field>
+            <field name="res_id" ref="project_task_10"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+        </record>
+
+        <!-- Admin personal stages -->
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_3')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_admin_1')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_4')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_admin_2')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_5')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_admin_3')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_8')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_admin_3')}"/>
+        </function>
         <function model="project.task.stage.personal" name="write">
             <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_1')), ('user_id', '=', ref('base.user_admin'))]"/>
             <value eval="{'stage_id': ref('project.project_personal_stage_admin_5')}"/>
@@ -495,13 +993,46 @@
             <value eval="{'stage_id': ref('project.project_personal_stage_admin_5')}"/>
         </function>
         <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_3')), ('user_id', '=', ref('base.user_admin'))]"/>
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_6')), ('user_id', '=', ref('base.user_admin'))]"/>
             <value eval="{'stage_id': ref('project.project_personal_stage_admin_5')}"/>
         </function>
+
+        <!-- Demo personal stages -->
         <function model="project.task.stage.personal" name="write">
-            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_4')), ('user_id', '=', ref('base.user_admin'))]"/>
-            <value eval="{'stage_id': ref('project.project_personal_stage_admin_2')}"/>
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_10')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_demo_2')}"/>
         </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_7')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_demo_3')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_6')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_demo_5')}"/>
+        </function>
+        <function model="project.task.stage.personal" name="write">
+            <value model="project.task.stage.personal" search="[('task_id', '=', ref('project_task_9')), ('user_id', '=', ref('base.user_demo'))]"/>
+            <value eval="{'stage_id': ref('project.project_personal_stage_demo_5')}"/>
+        </function>
+
+
+        <!-- Rating Demo Data -->
+        <record id="rating_task_1" model="rating.rating">
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="res_id" ref="project_task_1"/>
+        </record>
+        <function model="project.task" name="rating_apply" eval="([ref('project_task_1')], 5, None, 'This is already looking very promising, thanks for the good work! 😃')"/>
+
+        <record id="rating_task_2" model="rating.rating">
+            <field name="res_model_id" ref="project.model_project_task"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="res_id" ref="project_task_9"/>
+        </record>
+        <function model="project.task" name="rating_apply" eval="([ref('project_task_9')], 3, None, 'Everything is working fine, but there are some loose cables')"/>
+
 
         <!-- Timesheet for those tasks -->
         <record id="project_task_1_account_analytic_line_1" model="account.analytic.line">
@@ -511,7 +1042,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_2" model="account.analytic.line">
@@ -521,7 +1053,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_3" model="account.analytic.line">
@@ -571,7 +1104,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_8" model="account.analytic.line">
@@ -621,7 +1155,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_13" model="account.analytic.line">
@@ -671,7 +1206,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_18" model="account.analytic.line">
@@ -681,7 +1217,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_1"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_1_account_analytic_line_19" model="account.analytic.line">
@@ -751,7 +1288,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_3" model="account.analytic.line">
@@ -771,7 +1309,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_5" model="account.analytic.line">
@@ -871,7 +1410,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_15" model="account.analytic.line">
@@ -971,7 +1511,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_25" model="account.analytic.line">
@@ -981,7 +1522,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_26" model="account.analytic.line">
@@ -1001,7 +1543,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_28" model="account.analytic.line">
@@ -1011,7 +1554,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_29" model="account.analytic.line">
@@ -1051,7 +1595,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_33" model="account.analytic.line">
@@ -1061,7 +1606,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_34" model="account.analytic.line">
@@ -1071,7 +1617,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_2"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_2_account_analytic_line_35" model="account.analytic.line">
@@ -1110,7 +1657,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_3" model="account.analytic.line">
@@ -1130,7 +1678,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_5" model="account.analytic.line">
@@ -1140,7 +1689,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_6" model="account.analytic.line">
@@ -1160,7 +1710,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_8" model="account.analytic.line">
@@ -1170,7 +1721,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_9" model="account.analytic.line">
@@ -1180,7 +1732,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_10" model="account.analytic.line">
@@ -1200,7 +1753,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_12" model="account.analytic.line">
@@ -1240,7 +1794,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_16" model="account.analytic.line">
@@ -1250,7 +1805,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_17" model="account.analytic.line">
@@ -1260,7 +1816,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_18" model="account.analytic.line">
@@ -1280,7 +1837,8 @@
             <field name="unit_amount">3</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-90.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_20" model="account.analytic.line">
@@ -1300,7 +1858,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_22" model="account.analytic.line">
@@ -1330,7 +1889,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_25" model="account.analytic.line">
@@ -1340,7 +1900,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_3_account_analytic_line_26" model="account.analytic.line">
@@ -1380,7 +1941,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_3"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_1" model="account.analytic.line">
@@ -1480,7 +2042,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_11" model="account.analytic.line">
@@ -1560,7 +2123,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_19" model="account.analytic.line">
@@ -1590,7 +2154,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_22" model="account.analytic.line">
@@ -1620,7 +2185,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_25" model="account.analytic.line">
@@ -1660,7 +2226,8 @@
             <field name="unit_amount">2</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-60.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_29" model="account.analytic.line">
@@ -1680,7 +2247,8 @@
             <field name="unit_amount">1</field>
             <field name="project_id" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]"/>
             <field name="task_id" ref="sale_timesheet.project_task_4"/>
-            <field name="amount">-30.0</field>
+            <field name="so_line"/>
+            <field name="is_so_line_edited">True</field>
         </record>
 
         <record id="project_task_4_account_analytic_line_31" model="account.analytic.line">