diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c00cc170bbd..979633038af 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -25,39 +25,59 @@
         <function id="parent_project_default_set" model="ir.values" name="set" eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)"/>
 
         <!-- Task Stages -->
+
+        <record id="project_tt_analysis" model="project.task.type">
+            <field name="sequence">1</field>
+            <field name="name">Analysis</field>
+            <field name="state">open</field>
+            <field name="case_default" eval="False"/>
+        </record>
         <record id="project_tt_specification" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Specification</field>
+            <field name="state">draft</field>
+            <field name="case_default" eval="True"/>
+        </record>
+        <record id="project_tt_design" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Design</field>
             <field name="state">draft</field>
             <field name="case_default" eval="True"/>
         </record>
+        <record id="project_tt_negotiation" model="project.task.type">
+            <field name="sequence">3</field>
+            <field name="name">Negotiation</field>
+            <field name="state">pending</field>
+            <field name="case_default" eval="False"/>
+            <field name="fold" eval="True"/>
+        </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">4</field>
             <field name="name">Development</field>
             <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">3</field>
+            <field name="sequence">5</field>
             <field name="name">Testing</field>
             <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
-        <record id="project_tt_pending" model="project.task.type">
-            <field name="sequence">4</field>
-            <field name="name">Pending</field>
-            <field name="state">pending</field>
-            <field name="case_default" eval="True"/>
+        <record id="project_tt_merge" model="project.task.type">
+            <field name="sequence">6</field>
+            <field name="name">Merge</field>
+            <field name="state">open</field>
+            <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
         </record>
-        <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">5</field>
+        <record id="project_tt_deployment" model="project.task.type">
+            <field name="sequence">7</field>
             <field name="name">Deployment</field>
             <field name="state">done</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">6</field>
+            <field name="sequence">7</field>
             <field name="name">Cancelled</field>
             <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 273581164c8..958737b4bd0 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -150,17 +150,17 @@
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_niv"/>
-            <field name="priority">2</field>
+            <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="stage_id" ref="project_tt_analysis"/>
             <field name="color">3</field>
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project.project_category_02')])]"/>
         </record>
         <record id="project_task_2" model="project.task">
-            <field name="planned_hours" eval="80.0"/>
-            <field name="remaining_hours" eval="80.0"/>
+            <field name="planned_hours" eval="32.0"/>
+            <field name="remaining_hours" eval="32.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
@@ -168,111 +168,111 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_3" model="project.task">
-            <field name="planned_hours" eval="40.0"/>
-            <field name="remaining_hours" eval="40.0"/>
+            <field name="planned_hours" eval="10.0"/>
+            <field name="remaining_hours" eval="10.0"/>
             <field name="user_id" ref="base.user_al"/>
-            <field name="priority">2</field>
+            <field name="priority">6</field>
             <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Design Use Cases</field>
+            <field name="name">Budget Planning</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
-            <field name="stage_id" ref="project_tt_specification"/>
-            <field name="color">4</field>specification
+            <field name="stage_id" ref="project_tt_negotiation"/>
+            <field name="color">4</field>
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_02'),
                     ref('project_category_04')])]"/>
         </record>
         <record id="project_task_4" model="project.task">
-            <field name="planned_hours" eval="25.0"/>
-            <field name="remaining_hours" eval="25.0"/>
+            <field name="planned_hours" eval="60.0"/>
+            <field name="remaining_hours" eval="60.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">6</field>
             <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Budget Planning</field>
+            <field name="name">Develop module for Sale Management</field>
             <field name="description">Use the account_budget module</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-19')"/>
             <field name="color">5</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="stage_id" ref="project_tt_development"/>
         </record>
         <record id="project_task_5" model="project.task">
-            <field name="planned_hours" eval="25.0"/>
-            <field name="remaining_hours" eval="25.0"/>
+            <field name="planned_hours" eval="76.0"/>
+            <field name="remaining_hours" eval="76.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Quality Planning</field>
+            <field name="name">Develop module for Warehouse</field>
             <field name="kanban_state">done</field>
             <field name="priority">0</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="stage_id" ref="project_tt_development"/>
         </record>
         <record id="project_task_6" model="project.task">
-            <field name="planned_hours" eval="20.0"/>
-            <field name="remaining_hours" eval="20.0"/>
+            <field name="planned_hours" eval="24.0"/>
+            <field name="remaining_hours" eval="24.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Risk Management Planning</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="name">Integrate Modules</field>
+            <field name="stage_id" ref="project_tt_development"/>
         </record>
         <record id="project_task_7" model="project.task">
-            <field name="planned_hours" eval="30.0"/>
-            <field name="remaining_hours" eval="30.0"/>
+            <field name="planned_hours" eval="15.0"/>
+            <field name="remaining_hours" eval="5.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Create Project Schedules</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="name">Internal testing + Software Install</field>
+            <field name="stage_id" ref="project_tt_testing"/>
         </record>
         <record id="project_task_8" model="project.task">
-            <field name="planned_hours" eval="10.0"/>
-            <field name="remaining_hours" eval="10.0"/>
+            <field name="planned_hours" eval="22.0"/>
+            <field name="remaining_hours" eval="22.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Dataflow Design</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_tt_specification"/>
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project.project_category_01')])]"/>
         </record>
         <record id="project_task_9" model="project.task">
-            <field name="planned_hours" eval="50.0"/>
-            <field name="remaining_hours" eval="50.0"/>
+            <field name="planned_hours" eval="18.0"/>
+            <field name="remaining_hours" eval="18.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">User Interface Design</field>
-            <field name="stage_id" ref="project_tt_specification"/>
-        </record>
-        <record id="project_task_10" model="project.task">
-            <field name="planned_hours" eval="40.0"/>
-            <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Develop Module in Sale Management</field>
-            <field name="kanban_state">blocked</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Document history management</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <record id="project_task_11" model="project.task">
-            <field name="planned_hours" eval="90.0"/>
-            <field name="remaining_hours" eval="90.0"/>
+        <record id="project_task_10" model="project.task">
+            <field name="planned_hours" eval="38.0"/>
+            <field name="remaining_hours" eval="38.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Develop module in Warehouse</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Social network integration</field>
+            <field name="kanban_state">blocked</field>
+            <field name="stage_id" ref="project_tt_testing"/>
+        </record>
+        <record id="project_task_11" model="project.task">
+            <field name="planned_hours" eval="16.0"/>
+            <field name="remaining_hours" eval="16.0"/>
+            <field name="user_id" ref="base.user_fpi"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">User interface improvements</field>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
         <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
 
         <record id="project_task_12" model="project.task">
-            <field name="planned_hours" eval="20.0"/>
-            <field name="remaining_hours" eval="20.0"/>
+            <field name="planned_hours" eval="40.0"/>
+            <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Integrate Modules</field>
-            <field name="stage_id" ref="project_tt_development"/>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Improve+clean code and functionality</field>
+            <field name="stage_id" ref="project_tt_merge"/>
             <field name="color">6</field>
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01'),
@@ -281,151 +281,149 @@
         <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
 
         <record id="project_task_13" model="project.task">
-            <field name="planned_hours" eval="50.0"/>
-            <field name="remaining_hours" eval="50.0"/>
+            <field name="planned_hours" eval="12.0"/>
+            <field name="remaining_hours" eval="12.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Unit Testing</field>
-            <field name="stage_id" ref="project_tt_development"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Design Use Cases</field>
+            <field name="stage_id" ref="project_tt_analysis"/>
         </record>
         <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
 
         <record id="project_task_14" model="project.task">
-            <field name="planned_hours" eval="30.0"/>
-            <field name="remaining_hours" eval="30.0"/>
+            <field name="planned_hours" eval="12.0"/>
+            <field name="remaining_hours" eval="12.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Regression Test</field>
-            <field name="stage_id" ref="project_tt_development"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Dataflow Design</field>
+            <field name="stage_id" ref="project_tt_analysis"/>
         </record>
         <record id="project_task_15" model="project.task">
-            <field name="planned_hours" eval="15.0"/>
-            <field name="remaining_hours" eval="15.0"/>
+            <field name="planned_hours" eval="55.0"/>
+            <field name="remaining_hours" eval="55.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Documentation</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">User Interface design</field>
+            <field name="stage_id" ref="project_tt_development"/>
             <field name="date_start">2011-02-06</field>
         </record>
 
         <record id="project_task_16" model="project.task">
             <field name="sequence" eval="10"/>
-            <field name="planned_hours" eval="40.0"/>
-            <field name="remaining_hours" eval="40.0"/>
+            <field name="planned_hours" eval="80.0"/>
+            <field name="remaining_hours" eval="80.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Performance Tuning</field>
-            <field name="description">Test on Runbot</field>
-             <field name="stage_id" ref="project_tt_specification"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Set target for all deparments</field>
+             <field name="stage_id" ref="project_tt_development"/>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
 
         <record id="project_task_17" model="project.task">
-            <field name="planned_hours" eval="5.0"/>
-            <field name="remaining_hours" eval="5.0"/>
+            <field name="planned_hours" eval="34.0"/>
+            <field name="remaining_hours" eval="34.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Deploy and Review on Customer System</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Integration of core components</field>
+            <field name="stage_id" ref="project_tt_testing"/>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
 
         <record id="project_task_18" model="project.task">
-            <field name="planned_hours" eval="10.0"/>
-            <field name="remaining_hours" eval="10.0"/>
+            <field name="planned_hours" eval="16.0"/>
+            <field name="remaining_hours" eval="16.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Training and Presentation</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="project_id" ref="project.project_project_3"/>
+            <field name="name">Deploy and review on live system</field>
+            <field name="stage_id" ref="project_tt_deployment"/>
         </record>
 
         <record id="project_task_19" model="project.task">
-            <field name="planned_hours">38.0</field>
-            <field name="remaining_hours">38.0</field>
-            <field name="stage_id" ref="project_tt_development"/>
+            <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
+            <field name="stage_id" ref="project_tt_design"/>
             <field name="user_id" eval="False"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="description">BoM, After sales returns, interventions. Traceability.</field>
-            <field name="name">Specific adaptation to MRP</field>
+            <field name="project_id" ref="project.project_project_4"/>
+            <field name="name">Basic outline</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/>
 
         <record id="project_task_20" model="project.task">
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
+            <field name="planned_hours">42.0</field>
+            <field name="remaining_hours">42.0</field>
             <field name="user_id" eval="False"/>
             <field name="stage_id" ref="project_tt_development"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Data importation + Doc</field>
+            <field name="project_id" ref="project.project_project_4"/>
+            <field name="name">Create new components</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/>
 
         <record id="project_task_21" model="project.task">
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
+            <field name="planned_hours">14.0</field>
+            <field name="remaining_hours">14.0</field>
             <field name="user_id" eval="False"/>
-            <field name="stage_id" ref="project_tt_development"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Modifications asked by the customer.</field>
+            <field name="stage_id" ref="project_tt_testing"/>
+            <field name="project_id" ref="project.project_project_4"/>
+            <field name="name">Useablity review</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/>
 
         <record id="project_task_22" model="project.task">
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
-            <field name="stage_id" ref="project_tt_testing"/>
+            <field name="planned_hours">12.0</field>
+            <field name="remaining_hours">12.0</field>
+            <field name="stage_id" ref="project_tt_analysis"/>
             <field name="user_id" eval="False"/>
             <field name="priority">0</field>
-            <field name="project_id" ref="project.project_project_1"/>
+            <field name="project_id" ref="project.project_project_5"/>
             <field name="name">Customer analysis + Architecture</field>
             <field name="color">7</field>
         </record>
         <record id="project_task_23" model="project.task">
             <field name="sequence">15</field>
-            <field name="planned_hours">8.0</field>
-            <field name="remaining_hours">8.0</field>
-            <field name="stage_id" ref="project_tt_testing"/>
+            <field name="planned_hours">15.0</field>
+            <field name="remaining_hours">15.0</field>
+            <field name="stage_id" ref="project_tt_specification"/>
             <field name="user_id" eval="False"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Internal testing + Software Install</field>
+            <field name="project_id" ref="project.project_project_5"/>
+            <field name="name">Data Export flow</field>
             <field name="color">8</field>
         </record>
         <record id="project_task_24" model="project.task">
             <field name="sequence">17</field>
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
+            <field name="planned_hours">8.0</field>
+            <field name="remaining_hours">8.0</field>
             <field name="stage_id" ref="project_tt_development"/>
             <field name="user_id" eval="False"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Analysis, Data Importation</field>
+            <field name="project_id" ref="project.project_project_5"/>
+            <field name="name">Modifications asked by the customer</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/>
 
         <record id="project_task_25" model="project.task">
             <field name="sequence">20</field>
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
+            <field name="planned_hours">20.0</field>
+            <field name="remaining_hours">20.0</field>
             <field name="user_id" eval="False"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Parameters</field>
-            <field name="stage_id" ref="project_tt_specification"/>
+            <field name="project_id" ref="project.project_project_5"/>
+            <field name="name">Data importation + Doc</field>
+            <field name="stage_id" ref="project_tt_development"/>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/>
 
         <record id="project_task_26" model="project.task">
             <field name="sequence">20</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
+            <field name="planned_hours">35.0</field>
+            <field name="remaining_hours">35.0</field>
             <field name="user_id" eval="False"/>
-            <field name="project_id" ref="project.project_project_1"/>
-            <field name="name">Start of the doc redaction + MRP</field>
+            <field name="project_id" ref="project.project_project_5"/>
+            <field name="name">Unit Testing</field>
             <field name="stage_id" ref="project_tt_testing"/>
         </record>