diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 5248a26f4f9..b229c5225c9 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -551,49 +551,6 @@
         <record id="project.project_task_192" model="project.task">
         <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="project.project_task_193" model="project.task">
-            <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_194" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_195" model="project.task">
-        <field name="company_id" ref="res_company_oerp_in"/>
-        </record>
-        <record id="project.project_task_196" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_197" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_198" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_199" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_200" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_201" model="project.task">
-        <field name="company_id" ref="res_company_oerp_in"/>
-        </record>
-        <record id="project.project_task_202" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_203" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_204" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_205" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_206" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-
 
 
         <!--
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 999d16c07cc..f752c72c992 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -76,6 +76,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Prepare Requirements Document</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_2" model="project.task">
@@ -84,6 +85,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Make SRS</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_3" model="project.task">
@@ -92,6 +94,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Design Use Cases</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_4" model="project.task">
@@ -100,6 +103,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Budget Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_5" model="project.task">
@@ -108,6 +112,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Quality Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_6" model="project.task">
@@ -116,6 +121,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Risk Management Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_7" model="project.task">
@@ -124,6 +130,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Create Project Schedules</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_8" model="project.task">
@@ -132,6 +139,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Dataflow Design</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_9" model="project.task">
@@ -140,6 +148,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">User Interface Design</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_10" model="project.task">
@@ -148,6 +157,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop Module in Sale Management</field>
+             <field name="type_id" ref="project_tt_development"/>
         </record>
 
         <record id="project_task_11" model="project.task">
@@ -156,6 +166,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop module in Warehouse</field>
+            <field name="type_id" ref="project_tt_development"/>
         </record>
 
         <record id="project_task_12" model="project.task">
@@ -164,6 +175,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
+            <field name="type_id" ref="project_tt_development"/>
         </record>
 
         <record id="project_task_13" model="project.task">
@@ -172,6 +184,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Unit Testing</field>
+            <field name="type_id" ref="project_tt_testing"/>      
         </record>
 
         <record id="project_task_14" model="project.task">
@@ -180,6 +193,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Regression Test</field>
+            <field name="type_id" ref="project_tt_testing"/>  
         </record>
 
         <record id="project_task_15" model="project.task">
@@ -188,6 +202,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Documentation</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_16" model="project.task">
@@ -197,6 +212,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Performance Tuning</field>
+             <field name="type_id" ref="project_tt_merge"/>
         </record>
 
         <record id="project_task_17" model="project.task">
@@ -205,6 +221,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Deploy and Review on Customer System</field>
+            <field name="type_id" ref="project_tt_merge"/>
         </record>
 
         <record id="project_task_18" model="project.task">
@@ -213,6 +230,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Training and Presentation</field>
+            <field name="type_id" ref="project_tt_merge"/>
         </record>
 
         <!--
@@ -321,6 +339,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Parameters</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_190" model="project.task">
             <field name="sequence">20</field>
@@ -330,130 +349,7 @@
             <field name="state">open</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Start of the doc redaction + MRP</field>
-        </record>
-        <record id="project_task_192" model="project.task">
-            <field name="sequence">25</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="state">done</field>
-            <field name="name">MRP Tests</field>
-        </record>
-        <record id="project_task_193" model="project.task">
-            <field name="sequence">29</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">MRP; functional layer</field>
-            <field name="state">done</field>
-        </record>
-        <record id="project_task_194" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Products Adaptation</field>
-        </record>
-        <record id="project_task_195" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_23"/>
-            <field name="name">Install + Super User Training</field>
-        </record>
-        <record id="project_task_196" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Customer doc</field>
-        </record>
-        <record id="project_task_197" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Development of the presentation layer</field>
-        </record>
-        <record id="project_task_198" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Free Time</field>
-        </record>
-        <record id="project_task_199" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">50.0</field>
-            <field name="remaining_hours">50.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Specific tests</field>
-        </record>
-        <record id="project_task_200" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Sale module</field>
-        </record>
-        <record id="project_task_201" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_23"/>
-            <field name="state">open</field>
-            <field name="name">In house training</field>
-        </record>
-        <record id="project_task_202" model="project.task">
-            <field name="sequence">50</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="state">open</field>
-            <field name="name">Validation + latest modifications.</field>
-        </record>
-        <record id="project_task_203" model="project.task">
-            <field name="sequence">50</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Adaptations buy module</field>
-        </record>
-        <record id="project_task_204" model="project.task">
-            <field name="sequence">60</field>
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Presentation of the software.</field>
-        </record>
-        <record id="project_task_205" model="project.task">
-            <field name="sequence">60</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Adaptations Stock module</field>
-        </record>
-        <record id="project_task_206" model="project.task">
-            <field name="sequence">70</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Latest in house tests</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 000a08fa246..295009e85bf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -514,7 +514,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_draft": 1, "search_default_open":1 }</field>
+            <field name="context">{"search_default_draft": 1, "search_default_open":1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index 5ae12dff7bf..00ba897c4e2 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
 
-
     <record model="project.gtd.context" id="context_home">
         <field name="name">Home</field>
         <field name="sequence">3</field>
@@ -12,71 +11,25 @@
         <field name="sequence">1</field>
     </record>
 
-    <record id="project.project_task_116" model="project.task">
-        <field name="planned_hours">38.0</field>
-        <field name="remaining_hours">38.0</field>
+    <record id="project.project_task_10" model="project.task">
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type_id" ref="project.project_tt_development"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Specific adaptation to MRP</field>
     </record>
 
-     <record id="project.project_task_201" model="project.task">
-        <field name="sequence">40</field>
-        <field name="planned_hours">32.0</field>
-        <field name="remaining_hours">32.0</field>
-        <field name="timebox_id" ref="timebox_monthly"/>
-        <field name="context_id" ref="context_home"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_23"/>
-        <field name="name">In house training</field>
-      </record>
-
-      <record id="project.project_task_202" model="project.task">
-        <field name="sequence">50</field>
-        <field name="planned_hours">24.0</field>
-        <field name="remaining_hours">24.0</field>
-        <field name="timebox_id" ref="timebox_weekly"/>
-        <field name="context_id" ref="context_office"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Validation + latest modifications.</field>
-      </record>
-
-    <record id="project.project_task_116" model="project.task">
-        <field name="planned_hours">38.0</field>
-        <field name="remaining_hours">38.0</field>
+    <record id="project.project_task_11" model="project.task">
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type_id" ref="project.project_tt_development"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Specific adaptation to MRP</field>
     </record>
 
-     <record id="project.project_task_201" model="project.task">
-        <field name="sequence">40</field>
-        <field name="planned_hours">32.0</field>
-        <field name="remaining_hours">32.0</field>
-        <field name="timebox_id" ref="timebox_monthly"/>
-        <field name="context_id" ref="context_home"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_23"/>
-        <field name="name">In house training</field>
-      </record>
+    <record id="project.project_task_12" model="project.task">
+        <field name="timebox_id" ref="timebox_daily"/>
+        <field name="context_id" ref="context_car"/>
+    </record>
 
-      <record id="project.project_task_202" model="project.task">
-        <field name="sequence">50</field>
-        <field name="planned_hours">24.0</field>
-        <field name="remaining_hours">24.0</field>
-        <field name="timebox_id" ref="timebox_weekly"/>
-        <field name="context_id" ref="context_office"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Validation + latest modifications.</field>
-      </record>
+    <record id="project.project_task_13" model="project.task">
+        <field name="timebox_id" ref="timebox_daily"/>
+        <field name="context_id" ref="context_car"/>
+    </record>
 
     </data>
 </openerp>