diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml
index cef42548001..43e597d6fab 100644
--- a/addons/sale_timesheet/data/sale_service_demo.xml
+++ b/addons/sale_timesheet/data/sale_service_demo.xml
@@ -130,28 +130,6 @@
             <field name="product_uom_qty">50</field>
         </record>
 
-        <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"/>
-        </record>
-
-        <record id="project_task_2" model="project.task">
-            <field name="name">Planning</field>
-            <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
-            <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
-        </record>
-
-        <record id="project_task_3" model="project.task">
-            <field name="name">Furniture</field>
-            <field name="sale_line_id" ref="sale_timesheet.sale_line_13"/>
-            <field name="sale_order_id" ref="sale_timesheet.sale_order_1"/>
-        </record>
-
-        <record id="project_task_4" model="project.task">
-            <field name="name">Furniture Delivery</field>
-        </record>
-
         <!-- Sale Order 'sale_order_2' (Delta PC) -->
         <record id="sale_order_2" model="sale.order">
             <field name="partner_id" ref="base.res_partner_4"/>
@@ -439,5 +417,80 @@
             <field name="product_uom_id" ref="uom.product_uom_day"/>
             <field name="unit_amount">1.00</field>
         </record>
+
+        <!-- task on project generated by sale order 1 -->
+        <record id="project_from_sale_order_1_to_do" model="project.task.type">
+            <field name="sequence">10</field>
+            <field name="name">To Do</field>
+            <field name="legend_blocked">Not ready</field>
+            <field name="legend_done">Ready to be started</field>
+            <field name="project_ids" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]" />
+        </record>
+
+        <record id="project_from_sale_order_1_in_progress" model="project.task.type">
+            <field name="sequence">20</field>
+            <field name="name">In Progress</field>
+            <field name="legend_blocked">Need help</field>
+            <field name="legend_done">Work done</field>
+            <field name="project_ids" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]" />
+        </record>
+
+        <record id="project_from_sale_order_1_done" model="project.task.type">
+            <field name="sequence">30</field>
+            <field name="name">Done</field>
+            <field name="legend_blocked">Not done yet</field>
+            <field name="legend_done">Done</field>
+            <field name="project_ids" search="[('sale_order_id', '=', ref('sale_timesheet.sale_order_1'))]" />
+        </record>
+
+        <function model="project.task" name="write">
+            <value model="project.task" eval="obj().search([('sale_line_id','=',ref('sale_timesheet.sale_line_13')), ('stage_id', '=', False)]).id"/>
+            <value eval="{
+                'stage_id': ref('sale_timesheet.project_from_sale_order_1_to_do')
+            }"/>
+        </function>
+
+        <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_from_sale_order_1_in_progress"/>
+            <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" />
+        </record>
+
+        <record id="project_task_2" model="project.task">
+            <field name="name">Planning</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_from_sale_order_1_done"/>
+            <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" />
+        </record>
+
+        <record id="project_task_3" model="project.task">
+            <field name="name">Furniture</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_from_sale_order_1_in_progress"/> 
+            <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" />    
+        </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_from_sale_order_1_to_do" />
+            <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" />
+        </record>
+
     </data>
 </odoo>