[MERGE] sync with trunk (state -> stage removed some test)

bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k

1 files changed, 14 insertions, 34 deletions

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7bf1a623a2c..0f48dfe9a2b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -30,51 +30,43 @@
         <record id="project_tt_analysis" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Analysis</field>
-            <field name="state">draft</field>
-            <field name="case_default" eval="False"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_specification" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">10</field>
             <field name="name">Specification</field>
-            <field name="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">11</field>
             <field name="name">Design</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">3</field>
+            <field name="sequence">12</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">4</field>
+            <field name="sequence">13</field>
             <field name="name">Testing</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">5</field>
+            <field name="sequence">14</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_deployment" model="project.task.type">
-            <field name="sequence">100</field>
+            <field name="sequence">20</field>
             <field name="name">Done</field>
-            <field name="state">done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">200</field>
+            <field name="sequence">30</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
@@ -86,11 +78,11 @@
             <field name="default" eval="False"/>
             <field name="description">Task created</field>
         </record>
-        <record id="mt_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
-            <field name="description">Task started</field>
+            <field name="description">Task Assigned</field>
         </record>
         <record id="mt_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
@@ -98,12 +90,6 @@
             <field name="default" eval="False"/>
             <field name="description">Task blocked</field>
         </record>
-        <record id="mt_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Task closed</field>
-        </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.task</field>
@@ -118,11 +104,11 @@
             <field name="parent_id" eval="ref('mt_task_new')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_project_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_started')"/>
+            <field name="parent_id" eval="ref('mt_task_assigned')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
@@ -131,12 +117,6 @@
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_task_closed')"/>
-            <field name="relation_field">project_id</field>
-        </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
             <field name="name">Task Stage Changed</field>
             <field name="res_model">project.project</field>