From d7ae52776003e109226e55fd7d8bbcb378f9e83f Mon Sep 17 00:00:00 2001
From: Fabrice Decroix <fabrice@nexedi.com>
Date: Wed, 9 Jul 2008 08:50:53 +0000
Subject: [PATCH] 2008-07-09 fabrice * change budget_workflow
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22364 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_workflow/budget_workflow.xml | 26 +++-
...ckConsistency.xml => checkConsistency.xml} | 22 +---
.../budget_workflow/states/cancelled.xml | 72 +++++++++++
.../budget_workflow/states/deleted.xml | 110 ++++++++++++++++
.../budget_workflow/states/delivered.xml | 50 -------
.../budget_workflow/states/draft.xml | 85 +++++++++++-
.../budget_workflow/states/submitted.xml | 122 ++++++++++++++++++
.../budget_workflow/states/validated.xml | 114 ++++++++++++++++
.../budget_workflow/transitions/cancel.xml | 2 +-
.../transitions/cancel_action.xml | 14 +-
.../transitions/{drafting.xml => delete.xml} | 4 +-
...{drafting_action.xml => delete_action.xml} | 18 ++-
.../transitions/{deliver.xml => submit.xml} | 4 +-
.../transitions/submit_action.xml | 87 +++++++++++++
.../{deliver_action.xml => validate.xml} | 14 +-
.../transitions/validate_action.xml | 87 +++++++++++++
.../budget_workflow/variables/action.xml | 9 +-
.../budget_workflow/variables/actor.xml | 9 +-
.../budget_workflow/variables/comment.xml | 11 +-
.../variables/error_message.xml | 2 +-
.../budget_workflow/variables/history.xml | 11 +-
.../budget_workflow/variables/portal_type.xml | 57 ++++++++
.../budget_workflow/variables/time.xml | 9 +-
.../budget_workflow/worklists.xml | 6 +
.../worklists/1_planned_budget_list.xml | 112 ++++++++++++++++
bt5/erp5_budget/bt/change_log | 3 +
bt5/erp5_budget/bt/revision | 2 +-
27 files changed, 921 insertions(+), 141 deletions(-)
rename bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/{Budget_checkConsistency.xml => checkConsistency.xml} (84%)
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
delete mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/delivered.xml
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
rename bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/{drafting.xml => delete.xml} (94%)
rename bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/{drafting_action.xml => delete_action.xml} (83%)
rename bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/{deliver.xml => submit.xml} (94%)
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
rename bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/{deliver_action.xml => validate.xml} (79%)
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
create mode 100644 bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_planned_budget_list.xml
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
index 9bb9cd5785..92d905c71d 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
@@ -22,11 +22,15 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
+ <key> <string>creation_guard</string> </key>
<value>
<none/>
</value>
</item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>groups</string> </key>
<value>
@@ -39,11 +43,27 @@
</item>
<item>
<key> <string>initial_state</string> </key>
- <value> <string>delivered</string> </value>
+ <value> <string>draft</string> </value>
+ </item>
+ <item>
+ <key> <string>manager_bypass</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>Access contents information</string>
+ <string>View</string>
+ <string>Add portal content</string>
+ <string>Modify portal content</string>
+ <string>Delete objects</string>
+ </tuple>
+ </value>
</item>
<item>
<key> <string>state_var</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>validation_state</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
similarity index 84%
rename from bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml
rename to bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
index 6c8deeda55..6f89f3b056 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
@@ -65,17 +65,8 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-\n
-object = state_change[\'object\']\n
-error_msg = \'Please correct the following errors:\'\n
-\n
-consistency = object.checkConsistency()\n
-for elem in consistency:\n
- error_msg =error_msg+\' \'+elem[4]\n
-\n
-if consistency != []:\n
- raise ValidationFailed, str(error_msg)\n
+ <value> <string>object = state_change[\'object\']\n
+object.Base_checkConsistency()\n
</string> </value>
</item>
<item>
@@ -119,16 +110,9 @@ if consistency != []:\n
<value>
<tuple>
<string>state_change</string>
- <string>Products.DCWorkflow.DCWorkflow</string>
- <string>ValidationFailed</string>
<string>_getitem_</string>
<string>object</string>
- <string>error_msg</string>
<string>_getattr_</string>
- <string>consistency</string>
- <string>_getiter_</string>
- <string>elem</string>
- <string>str</string>
</tuple>
</value>
</item>
@@ -145,7 +129,7 @@ if consistency != []:\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Budget_checkConsistency</string> </value>
+ <value> <string>checkConsistency</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
index c4fa701664..9734d680b4 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
@@ -23,6 +23,12 @@
<key> <string>id</string> </key>
<value> <string>cancelled</string> </value>
</item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string>Cancelled</string> </value>
@@ -42,4 +48,70 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <list>
+ <string>Assignor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>Add portal content</string> </key>
+ <value>
+ <list>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <list>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <list>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <list>
+ <string>Assignor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
new file mode 100644
index 0000000000..b09fc49876
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>deleted</string> </value>
+ </item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Deleted</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Add portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/delivered.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/delivered.xml
deleted file mode 100644
index 5d32e027e7..0000000000
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/delivered.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="StateDefinition" module="Products.DCWorkflow.States"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>delivered</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Allocated</string> </value>
- </item>
- <item>
- <key> <string>transitions</string> </key>
- <value>
- <tuple>
- <string>cancel</string>
- <string>cancel_action</string>
- <string>drafting</string>
- <string>drafting_action</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>type_list</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
index 2de8777614..1efb1b31c2 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
@@ -23,6 +23,12 @@
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
</item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string>Draft</string> </value>
@@ -31,10 +37,10 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
- <string>cancel</string>
- <string>cancel_action</string>
- <string>deliver</string>
- <string>deliver_action</string>
+ <string>delete</string>
+ <string>delete_action</string>
+ <string>submit</string>
+ <string>submit_action</string>
</tuple>
</value>
</item>
@@ -47,4 +53,75 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Add portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
new file mode 100644
index 0000000000..bee4f428bb
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>submitted</string> </value>
+ </item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Submitted</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple>
+ <string>cancel</string>
+ <string>cancel_action</string>
+ <string>validate</string>
+ <string>validate_action</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Add portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
new file mode 100644
index 0000000000..e1dffdde8d
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>validated</string> </value>
+ </item>
+ <item>
+ <key> <string>permission_roles</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Validated</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Access contents information</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Add portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Delete objects</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>Modify portal content</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>View</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
index 7e6c616311..074d9360e1 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
@@ -21,7 +21,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string></string> </value>
+ <value> <string>Cancel</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
index 45aaebe973..dccfc2cdf6 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
@@ -21,11 +21,11 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Cancel Budget</string> </value>
+ <value> <string>Cancel</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
- <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
+ <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Cancel a budget</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -81,7 +78,6 @@
<value>
<tuple>
<string>Assignor</string>
- <string>Owner</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
similarity index 94%
rename from bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting.xml
rename to bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
index cbb71dbf53..80cd6128ec 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
@@ -43,11 +43,11 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>drafting</string> </value>
+ <value> <string>delete</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
- <value> <string>draft</string> </value>
+ <value> <string>deleted</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
similarity index 83%
rename from bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting_action.xml
rename to bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
index 5b69678c53..f762d5a64c 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/drafting_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
@@ -21,15 +21,15 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Return for drafting</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
- <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=drafting_action</string> </value>
+ <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=delete_action</string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
- <value> <string>drafting</string> </value>
+ <value> <string>delete</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -43,7 +43,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>drafting_action</string> </value>
+ <value> <string>delete_action</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Delete a budget</string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Guard</string>
- <string>Guard</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -81,6 +78,7 @@
<value>
<tuple>
<string>Assignor</string>
+ <string>Owner</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
similarity index 94%
rename from bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver.xml
rename to bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
index 8f03c1ab44..4f5e25bc73 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
@@ -43,11 +43,11 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>deliver</string> </value>
+ <value> <string>submit</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
- <value> <string>delivered</string> </value>
+ <value> <string>submitted</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
new file mode 100644
index 0000000000..f7b2e24e45
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Submit</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=submit_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>submit</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>submit_action</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string>checkConsistency</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Plan a budget</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
similarity index 79%
rename from bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver_action.xml
rename to bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
index 3dc6061726..fae78d6c50 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
@@ -21,15 +21,15 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Allocate Budget</string> </value>
+ <value> <string>Validate</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
- <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=deliver_action</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
- <value> <string>deliver</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -43,15 +43,15 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>deliver_action</string> </value>
+ <value> <string>validate</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
- <value> <string></string> </value>
+ <value> <string>validated</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
- <value> <string>Budget_checkConsistency</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -59,7 +59,7 @@
</item>
<item>
<key> <string>trigger_type</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
new file mode 100644
index 0000000000..4b2c38485c
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Validate</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=validate_action</string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string>validate</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>validate_action</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string>checkConsistency</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Make a budget effective</string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
index b6947a99ad..e56bf7a226 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>The last transition</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
@@ -57,11 +57,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
index 719557507f..e5fbe8aef5 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>The name of the user who performed the last transition</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
@@ -57,11 +57,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
index 636dd21ecd..c78b599949 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Comments about the last transition</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
@@ -57,18 +57,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:state_change.kwargs.get(\'comment\',\'\')</string> </value>
+ <value> <string>python:state_change.kwargs.get(\'comment\', \'\')</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
index 08c6214231..aace5d205e 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Error message if validation failed</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
index 6270841fa0..a16e9ad133 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Provides access to workflow history</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
@@ -49,7 +49,7 @@
</item>
<item>
<key> <string>update_always</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
@@ -57,11 +57,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
new file mode 100644
index 0000000000..d4abc30a9a
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>default_expr</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>default_value</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>portal type (use as filter for worklists)</string> </value>
+ </item>
+ <item>
+ <key> <string>for_catalog</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>for_status</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>portal_type</string> </value>
+ </item>
+ <item>
+ <key> <string>info_guard</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>update_always</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
index a8c1b7f62c..79cfd6ad69 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Time of the last transition</string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
@@ -57,11 +57,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
index 3953ad0209..609a885c76 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
@@ -21,6 +21,12 @@
<dictionary/>
</value>
</item>
+ <item>
+ <key> <string>_objects</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>worklists</string> </value>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_planned_budget_list.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_planned_budget_list.xml
new file mode 100644
index 0000000000..9ff3df497e
--- /dev/null
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_planned_budget_list.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>global</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Budget to Plan (%(count)s)</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+budget_module/view?validation_state=planned&local_roles:list=Assignor&reset=1
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Budget to plan</string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>1_planned_budget_list</string> </value>
+ </item>
+ <item>
+ <key> <string>var_matches</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value>
+ <tuple>
+ <string>Budget</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
+ <value>
+ <tuple>
+ <string>planned</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_budget/bt/change_log b/bt5/erp5_budget/bt/change_log
index cc45a25c9c..8883425916 100644
--- a/bt5/erp5_budget/bt/change_log
+++ b/bt5/erp5_budget/bt/change_log
@@ -1,3 +1,6 @@
+2008-07-09 fabrice
+* change budget_workflow
+
2008-07-07 jerome
* Use categories to configure the budget line and budget cell variations. Scripts adapt their behaviour to use those configurations.
diff --git a/bt5/erp5_budget/bt/revision b/bt5/erp5_budget/bt/revision
index 3e932fe8f1..d2e1cefe89 100644
--- a/bt5/erp5_budget/bt/revision
+++ b/bt5/erp5_budget/bt/revision
@@ -1 +1 @@
-34
\ No newline at end of file
+44
\ No newline at end of file
--
2.30.9