[MERGE] with trunk

bzr revid: fka@tinyerp.com-20121123041653-i17tnuh8o0thxti8

3 files changed, 9 insertions, 15 deletions

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 76c8c5341db..a23af11922f 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -35,7 +35,7 @@
         <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="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">
@@ -44,37 +44,31 @@
             <field name="state">open</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">4</field>
+            <field name="sequence">3</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">5</field>
+            <field name="sequence">4</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">6</field>
+            <field name="sequence">5</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">7</field>
+            <field name="sequence">6</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">7</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 698a1a99627..ee887c2728c 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -36,7 +36,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
         </record>
 
         <record id="project_project_2" model="project.project">
@@ -114,7 +114,7 @@
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
-            <field name="stage_id" ref="project_tt_negotiation"/>
+            <field name="stage_id" ref="project_tt_testing"/>
             <field name="color">4</field>
         </record>
         <record id="project_task_4" model="project.task">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a913ed22adc..12809797008 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -6,7 +6,7 @@
         <menuitem name="Project"
             id="base.menu_main_pm"
             groups="group_project_manager,group_project_user"
-            sequence="90"/>
+            sequence="40"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>