From 6003686f85cef0a52d9e5ff263a4d87093d41b1d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 4 May 2012 17:31:54 +0530
Subject: [IMP] project :  Testing stage is related to In progress state.

bzr revid: mdi@tinyerp.com-20120504120154-sgzphkvp1lf95gtz
---
 addons/project/project_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 48bc3439382..b67f4ccd9de 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -36,7 +36,7 @@
         <record id="project_tt_testing" model="project.task.type">
             <field name="sequence">3</field>
             <field name="name">Testing</field>
-            <field name="state">pending</field>
+            <field name="state">open</field>
             <field name="project_default" eval="1"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-- 
cgit v1.2.3


From 564edefe278a8b78851dc42a2d5311b0f8dae840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 25 May 2012 15:08:32 +0200
Subject: [IMP] project_issue: updated module to use stage instead of states;
 udpated project task type demo data; udpated views.

bzr revid: tde@openerp.com-20120525130832-gxkv2iqlfvjlkoyt
---
 addons/project/project_data.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index b67f4ccd9de..d1e6dc57065 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+<!--
     <data noupdate="1">
+-->
+<data>
 
         <!-- Requests Links -->
         <record id="req_link_project" model="res.request.link">
@@ -39,11 +42,23 @@
             <field name="state">open</field>
             <field name="project_default" eval="1"/>
         </record>
-        <record id="project_tt_merge" model="project.task.type">
+        <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="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_merge" model="project.task.type">
+            <field name="sequence">5</field>
             <field name="name">Deployment</field>
             <field name="state">done</field>
             <field name="project_default" eval="1"/>
         </record>
+        <record id="project_tt_cancel" model="project.task.type">
+            <field name="sequence">6</field>
+            <field name="name">Cancelled</field>
+            <field name="state">cancelled</field>
+            <field name="project_default" eval="0"/>
+        </record>
     </data>
 </openerp>
-- 
cgit v1.2.3


From 3ac82713563efde8468a21fb1f595f34f6b60924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 25 May 2012 15:46:19 +0200
Subject: [FIX] project_issue: fixed issue with cancelled state due to bad
 defautl data.

bzr revid: tde@openerp.com-20120525134619-8m8rdb9mj8wyq0bp
---
 addons/project/project_data.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d1e6dc57065..8fec06e59ee 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -58,7 +58,8 @@
             <field name="sequence">6</field>
             <field name="name">Cancelled</field>
             <field name="state">cancelled</field>
-            <field name="project_default" eval="0"/>
+            <field name="project_default" eval="1"/>
+            <field name="fold" eval="True"/>
         </record>
     </data>
 </openerp>
-- 
cgit v1.2.3


From 585aac4c8c73ce5bb3d7e34aa20b970d378bea6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 25 May 2012 18:20:16 +0200
Subject: [IMP] project.task: second step towards cleaning.

bzr revid: tde@openerp.com-20120525162016-qyp3yiknuxeq8qeo
---
 addons/project/project_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 8fec06e59ee..42d497b517a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -57,7 +57,7 @@
         <record id="project_tt_cancel" model="project.task.type">
             <field name="sequence">6</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancelled</field>
+            <field name="state">cancel</field>
             <field name="project_default" eval="1"/>
             <field name="fold" eval="True"/>
         </record>
-- 
cgit v1.2.3


From 0a3e7b9c18beb0d2b5e77822fb3fadc51390ae24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 29 May 2012 11:24:24 +0200
Subject: [IMP] [FIX] project.task: state cancel -> back to cancelled, to be
 coherent with the project states (inherited from analytic.account, therefore
 difficult to change). Also updated default data: project_default ->
 case_default.

bzr revid: tde@openerp.com-20120529092424-mpz8824y14e1txhr
---
 addons/project/project_data.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 42d497b517a..d2a6a7ff399 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -28,37 +28,37 @@
             <field name="sequence">1</field>
             <field name="name">Design</field>
             <field name="state">draft</field>
-            <field name="project_default" eval="1"/>
+            <field name="case_default" eval="1"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Development</field>
             <field name="state">open</field>
-            <field name="project_default" eval="1"/>
+            <field name="case_default" eval="1"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
             <field name="sequence">3</field>
             <field name="name">Testing</field>
             <field name="state">open</field>
-            <field name="project_default" eval="1"/>
+            <field name="case_default" eval="1"/>
         </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="project_default" eval="1"/>
+            <field name="case_default" eval="1"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
             <field name="sequence">5</field>
             <field name="name">Deployment</field>
             <field name="state">done</field>
-            <field name="project_default" eval="1"/>
+            <field name="case_default" eval="1"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
             <field name="sequence">6</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancel</field>
-            <field name="project_default" eval="1"/>
+            <field name="state">cancelled</field>
+            <field name="case_default" eval="1"/>
             <field name="fold" eval="True"/>
         </record>
     </data>
-- 
cgit v1.2.3


From 34569d4303fa43f568c7b1f178028251c1627c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 1 Jun 2012 10:40:50 +0200
Subject: [CLEAN] project: cleaned code and branch modifications before
 merging.

bzr revid: tde@openerp.com-20120601084050-880kxdqcubyuknqs
---
 addons/project/project_data.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/project/project_data.xml')

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d2a6a7ff399..4c95373d91f 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<!--
     <data noupdate="1">
--->
-<data>
 
         <!-- Requests Links -->
         <record id="req_link_project" model="res.request.link">
@@ -28,37 +25,38 @@
             <field name="sequence">1</field>
             <field name="name">Design</field>
             <field name="state">draft</field>
-            <field name="case_default" eval="1"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Development</field>
             <field name="state">open</field>
-            <field name="case_default" eval="1"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
             <field name="sequence">3</field>
             <field name="name">Testing</field>
             <field name="state">open</field>
-            <field name="case_default" eval="1"/>
+            <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="1"/>
+            <field name="case_default" eval="True"/>
+            <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
             <field name="sequence">5</field>
             <field name="name">Deployment</field>
             <field name="state">done</field>
-            <field name="case_default" eval="1"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
             <field name="sequence">6</field>
             <field name="name">Cancelled</field>
             <field name="state">cancelled</field>
-            <field name="case_default" eval="1"/>
+            <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
     </data>
-- 
cgit v1.2.3