From 70e049c6b306350c05ec5c2d341664ca1b827787 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Sun, 17 Jun 2007 19:16:01 +0000 Subject: [PATCH] Initial revision of task_workflow. Permissions added. Simplified variable handling (which were not that useful, the previous idea was that the user would enter at each transition the confirmed date, which is nice but not consistent with the rest of ERP5. Also, state_change['object'] was not accessible at object creation) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14840 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_workflow/task_workflow.xml | 2 + .../task_workflow/states/auto_planned.xml | 70 +++++++++++++ .../task_workflow/states/cancelled.xml | 20 ++++ .../task_workflow/states/confirmed.xml | 4 +- .../task_workflow/states/draft.xml | 68 +++++++++++++ .../task_workflow/states/ordered.xml | 70 +++++++++++++ .../task_workflow/states/planned.xml | 72 ++++++++++++++ .../transitions/cancel_action.xml | 26 ++++- .../transitions/confirm_action.xml | 25 ++++- .../transitions/order_action.xml | 25 ++++- .../task_workflow/transitions/plan_action.xml | 26 ++++- .../task_workflow/variables/comment.xml | 2 +- .../task_workflow/variables/portal_type.xml | 60 ------------ .../task_workflow/variables/start_date.xml | 85 ---------------- .../task_workflow/variables/stop_date.xml | 85 ---------------- .../worklists/draft_purchase.xml | 98 ------------------- .../task_workflow/worklists/draft_sale.xml | 98 ------------------- .../task_workflow/worklists/ordered_sale.xml | 98 ------------------- ...{ordered_purchase.xml => ordered_task.xml} | 43 +++++--- .../task_workflow/worklists/planned_sale.xml | 98 ------------------- ...{planned_purchase.xml => planned_task.xml} | 44 ++++++--- bt5/erp5_project/bt/revision | 2 +- 22 files changed, 463 insertions(+), 658 deletions(-) delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/portal_type.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/start_date.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/stop_date.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_purchase.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_sale.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_sale.xml rename bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/{ordered_purchase.xml => ordered_task.xml} (70%) delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_sale.xml rename bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/{planned_purchase.xml => planned_task.xml} (69%) diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml index 513f78bf81..fd9d550d44 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml @@ -50,6 +50,8 @@ <tuple> <string>Modify portal content</string> <string>Add portal content</string> + <string>View</string> + <string>Access contents information</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml index 33d38943dc..e05286b562 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>auto_planned</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>Auto Planned</string> </value> @@ -52,4 +58,68 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <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>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>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml index 9931cd046a..b797d06675 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml @@ -75,6 +75,16 @@ <key> <string>_container</string> </key> <value> <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <list> + <string>Assignor</string> + <string>Manager</string> + <string>Owner</string> + </list> + </value> + </item> <item> <key> <string>Add portal content</string> </key> <value> @@ -87,6 +97,16 @@ <tuple/> </value> </item> + <item> + <key> <string>View</string> </key> + <value> + <list> + <string>Assignor</string> + <string>Manager</string> + <string>Owner</string> + </list> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml index 8de2970b81..377fbf8503 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml @@ -75,8 +75,8 @@ <string>Assignor</string> <string>Associate</string> <string>Auditor</string> - <string>Author</string> <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> @@ -100,8 +100,8 @@ <string>Assignor</string> <string>Associate</string> <string>Auditor</string> - <string>Author</string> <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml index 176270ab74..a116e6dcb5 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml @@ -26,6 +26,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> @@ -63,4 +69,66 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignor</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>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>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml index e03518b485..07a6a61889 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>ordered</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>Ordered</string> </value> @@ -59,4 +65,68 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <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>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>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml index 06e1019f51..627feec406 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>planned</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>Planned</string> </value> @@ -61,4 +67,70 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</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> + </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>Assignee</string> + <string>Assignor</string> + <string>Associate</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_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml index 8a8647a10e..bdf25691e7 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,28 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Assignee</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml index 8a09d55cd2..b57c7d03b1 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,27 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </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_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml index 95ed754367..ec54ae27cf 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,27 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </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_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml index 9b8026d079..4cf2f0371b 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,28 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Assignee</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml index 05ac72139e..7b16912f74 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml @@ -77,7 +77,7 @@ <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_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/portal_type.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/portal_type.xml deleted file mode 100644 index aaacee8edc..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/portal_type.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>VariableDefinition</string> - </tuple> - <none/> - </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></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_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/start_date.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/start_date.xml deleted file mode 100644 index eefa0e2162..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/start_date.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>VariableDefinition</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>default_expr</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>default_value</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>for_catalog</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>for_status</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>start_date</string> </value> - </item> - <item> - <key> <string>info_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>update_always</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>python:state_change.kwargs.get(\'start_date\',state_change.object.getStartDate())</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/stop_date.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/stop_date.xml deleted file mode 100644 index 23960e36b7..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/stop_date.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>VariableDefinition</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>default_expr</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>default_value</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>for_catalog</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>for_status</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>stop_date</string> </value> - </item> - <item> - <key> <string>info_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>update_always</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>python:state_change.kwargs.get(\'stop_date\',state_change.object.getStopDate())</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_purchase.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_purchase.xml deleted file mode 100644 index 37ae7945c7..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_purchase.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>WorklistDefinition</string> - </tuple> - <none/> - </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>Drafts of purchase orders (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -purchase_order?simulation_state=draft&portal_type=Purchase+Order&local_roles=%(local_roles)s&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>draft_purchase</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Purchase Order</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_sale.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_sale.xml deleted file mode 100644 index 87c42f5e2f..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/draft_sale.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>WorklistDefinition</string> - </tuple> - <none/> - </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>Drafts of sale orders (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -sale_order?simulation_state=draft&portal_type=Sale+Order&local_roles=%(local_roles)s&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>draft_sale</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Sale Order</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_sale.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_sale.xml deleted file mode 100644 index 139909ad2d..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_sale.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>WorklistDefinition</string> - </tuple> - <none/> - </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>Sale orders not confirmed (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -sale_order?simulation_state=ordered&portal_type=Sale+Order&local_roles=%(local_roles)s&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ordered_sale</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Sale Order</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_state</string> </key> - <value> - <tuple> - <string>ordered</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_purchase.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml similarity index 70% rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_purchase.xml rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml index a6c344329e..97ac6c5f9e 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_purchase.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml @@ -24,40 +24,63 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Purchase orders not confirmed (%(count)s)</string> </value> + <value> <string>Ordered Tasks (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -purchase_order?simulation_state=ordered&portal_type=Purchase+Order&local_roles=%(local_roles)s&reset=1 +task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Ordered tasks to review</string> </value> </item> <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>ordered_purchase</string> </value> + <value> <string>ordered_task</string> </value> </item> <item> <key> <string>var_matches</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> </dictionary> </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </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> <tuple> @@ -73,14 +96,6 @@ purchase_order?simulation_state=ordered&portal_type=Purchase+Order&local_roles=% <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Purchase Order</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_sale.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_sale.xml deleted file mode 100644 index a2a0a4b8bd..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_sale.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>WorklistDefinition</string> - </tuple> - <none/> - </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>Plans of sale orders</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -sale_order?simulation_state=planned&portal_type=Sale+Order&local_roles=%(local_roles)s&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>planned_sale</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Sale Order</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_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_purchase.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml similarity index 69% rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_purchase.xml rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml index 6bf112191b..d8cb6d24fb 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_purchase.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml @@ -24,40 +24,64 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Plans of purchase orders (%(count)s)</string> </value> + <value> <string>Planned Tasks (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -purchase_order?simulation_state=planned&portal_type=Purchase+Order&local_roles=%(local_roles)s&reset=1 +task_module?simulation_state=planned&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Planned tasks to review</string> </value> </item> <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>planned_purchase</string> </value> + <value> <string>planned_task</string> </value> </item> <item> <key> <string>var_matches</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> </dictionary> </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Assignee</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> @@ -73,14 +97,6 @@ purchase_order?simulation_state=planned&portal_type=Purchase+Order&local_roles=% <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Purchase Order</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index ce83bd94b3..9754915269 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -258 \ No newline at end of file +259 \ No newline at end of file -- 2.30.9