From a6aa1c209314453276eebb735a7749baf65cbb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Thu, 30 Oct 2008 10:36:34 +0000 Subject: [PATCH] remove no longer worfklow's states and transitions change call to script so that stocks are only check at right time git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24413 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../validateDestinationCounterDate.xml | 12 +- .../states/confirmed.xml | 125 ----------------- .../states/ordered.xml | 129 ------------------ .../transitions/confirm.xml | 67 --------- .../transitions/deliver_action.xml | 2 +- .../transitions/order.xml | 73 ---------- .../transitions/order_action.xml | 116 ---------------- .../transitions/start_action.xml | 4 +- .../transitions/stop_action.xml | 2 +- ..._action.xml => stop_to_deliver_action.xml} | 20 ++- bt5/erp5_banking_cash/bt/revision | 2 +- 11 files changed, 20 insertions(+), 532 deletions(-) delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/{confirm_action.xml => stop_to_deliver_action.xml} (76%) diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateDestinationCounterDate.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateDestinationCounterDate.xml index 636d8a9659..508cb18e74 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateDestinationCounterDate.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateDestinationCounterDate.xml @@ -65,9 +65,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -from Products.DCWorkflow.DCWorkflow import ValidationFailed\n + <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n from Products.ERP5Type.Message import Message\n \n transaction = state_change[\'object\']\n @@ -76,12 +74,7 @@ source_section = transaction.getSourceSection()\n \n # check again that we are in the good accounting date in site destination\n transaction.Baobab_checkCounterDateOpen(site=source_section, date=transaction.getStopDate())\n -\n -# Check source counter stock & date again.\n -context.validateVaultBalance(state_change=state_change, check_source_counter_date=0)\n - - -]]></string> </value> +</string> </value> </item> <item> <key> <string>_code</string> </key> @@ -139,7 +132,6 @@ context.validateVaultBalance(state_change=state_change, check_source_counter_dat <string>transaction</string> <string>_getattr_</string> <string>source_section</string> - <string>context</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml deleted file mode 100644 index 064397ab78..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml +++ /dev/null @@ -1,125 +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>confirmed</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>Assigned To Remote Site Vault Controller</string> </value> - </item> - <item> - <key> <string>transitions</string> </key> - <value> - <tuple> - <string>deliver</string> - <string>deliver_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>Assignee</string> - <string>Assignor</string> - <string>DestinationAssignee</string> - <string>DestinationAssignor</string> - <string>Manager</string> - <string>Reviewer</string> - <string>Assistant</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>Assignee</string> - <string>Assignor</string> - <string>DestinationAssignee</string> - <string>DestinationAssignor</string> - <string>Manager</string> - <string>Reviewer</string> - <string>Assistant</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml deleted file mode 100644 index d33cadbb4d..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml +++ /dev/null @@ -1,129 +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>_owner</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>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>Assigned To Vault Manager</string> </value> - </item> - <item> - <key> <string>transitions</string> </key> - <value> - <tuple> - <string>confirm</string> - <string>confirm_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>Assignee</string> - <string>Assignor</string> - <string>DestinationAssignor</string> - <string>Manager</string> - <string>Reviewer</string> - <string>Assistant</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>Assignee</string> - <string>Assignor</string> - <string>DestinationAssignor</string> - <string>Manager</string> - <string>Reviewer</string> - <string>Assistant</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml deleted file mode 100644 index 9ffbde741b..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?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>Assign To Remote Site Vault Controller</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string></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>confirm</string> </value> - </item> - <item> - <key> <string>new_state_id</string> </key> - <value> <string>confirmed</string> </value> - </item> - <item> - <key> <string>script_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Assign To Remote Site Vault Controller</string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver_action.xml index dd087d9e2e..7d3d81ad86 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver_action.xml @@ -51,7 +51,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string>validateDestinationCounterDate</string> </value> + <value> <string>validateVaultBalance</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml deleted file mode 100644 index 613ae2ca19..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?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>_owner</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>Assign To Remote Site Vault Manager</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string></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>order</string> </value> - </item> - <item> - <key> <string>new_state_id</string> </key> - <value> <string>ordered</string> </value> - </item> - <item> - <key> <string>script_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Assign To Remote Site Vault Manager</string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml deleted file mode 100644 index adbb700b3d..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?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>_owner</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>Assign To Remote Site Vault Manager</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string>order</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>order_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></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Assign To Remote Site Vault Manager Action</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>expr</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Manager</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="Expression" module="Products.CMFCore.Expression"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>python: \'externe\' in here.getSource() and not here.isDematerialization()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml index 81391eb854..eba2fbf2a2 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml @@ -31,7 +31,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=start_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -57,7 +57,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>validateVaultBalance</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_action.xml index 28716650f8..aa940d31d4 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_action.xml @@ -31,7 +31,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/CashMovement_viewStopWorkflowActionDialog?workflow_action=confirm_action</string> </value> + <value> <string>%(content_url)s/CashMovement_viewStopWorkflowActionDialog?workflow_action=stop_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_to_deliver_action.xml similarity index 76% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_to_deliver_action.xml index c12bf23126..5f393bbbb3 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/stop_to_deliver_action.xml @@ -15,21 +15,27 @@ <none/> </value> </item> + <item> + <key> <string>_owner</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>Assign To Remote Site Vault Controller </string> </value> + <value> <string>Validate</string> </value> </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/CashMovement_viewStopWorkflowActionDialog?workflow_action=confirm_action</string> </value> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=strop_to_deliver_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> - <value> <string>confirm</string> </value> + <value> <string>deliver</string> </value> </item> <item> <key> <string>description</string> </key> @@ -43,7 +49,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>confirm_action</string> </value> + <value> <string>stop_to_deliver_action</string> </value> </item> <item> <key> <string>new_state_id</string> </key> @@ -51,11 +57,11 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string>setMovementStopDate</string> </value> + <value> <string>validateDestinationCounterDate</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Assign To Remote Site Vault Controller Action</string> </value> + <value> <string>Validate Action</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -77,7 +83,7 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>DestinationAssignor</string> + <string>DestinationAssignee</string> <string>Manager</string> </tuple> </value> diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index 6f1745c38f..a869e998c0 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -636 \ No newline at end of file +638 \ No newline at end of file -- 2.30.9