diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/cancelled.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/cancelled.xml index 606a9c721ea0b50942f850709123d2ef476e28d2..5c1d317c3d4dc1536180fb6f70b86e17c67da027 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/cancelled.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/cancelled.xml @@ -45,17 +45,14 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> @@ -64,7 +61,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> </tuple> @@ -92,7 +88,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> </tuple> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml index 26ba10887a7cb7bf9eb0c08f3b08613ad67b98f1..a815cfc0b11d57739886cd1c35722da67bbc8047 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml @@ -31,14 +31,14 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Validated By Vault Manager</string> </value> + <value> <string>Sent To Second Validation Level</string> </value> </item> <item> <key> <string>transitions</string> </key> <value> <tuple> - <string>confirm_to_deliver_action</string> <string>deliver</string> + <string>deliver_action</string> <string>reject</string> <string>reject_action</string> </tuple> @@ -72,7 +72,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> @@ -101,7 +100,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml index 48cb0a4a30876629a962288f8dce864cd79339b5..b8b90f3b171ba13997417cd76dd8e9602f2d4fd0 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml @@ -70,7 +70,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> @@ -99,7 +98,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml index 72df297c80348e6ceb3982d8d3b6e4f0cab8a45a..39afe6bc9a7884975e7992907a1ee8c804f92a89 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml @@ -41,8 +41,8 @@ <string>cancel_action</string> <string>delete</string> <string>delete_action</string> - <string>plan</string> - <string>plan_action</string> + <string>order</string> + <string>order_action</string> </tuple> </value> </item> @@ -72,13 +72,9 @@ <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>Owner</string> - <string>Reviewer</string> </tuple> </value> </item> @@ -106,13 +102,9 @@ <key> <string>View</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> - <string>DestinationAssignor</string> <string>Manager</string> <string>Owner</string> - <string>Reviewer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml index 27aedecd78e98e50f183543700d6a513fc1f0787..2e3893dff7e4a628c3aa2bdd7da2581994329042 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml @@ -31,7 +31,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Controler Validated</string> </value> + <value> <string>Sent To First Validation Level</string> </value> </item> <item> <key> <string>transitions</string> </key> @@ -39,8 +39,6 @@ <tuple> <string>confirm</string> <string>confirm_action</string> - <string>deliver</string> - <string>order_to_deliver_action</string> <string>reject</string> <string>reject_action</string> </tuple> @@ -74,7 +72,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> @@ -103,7 +100,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml deleted file mode 100644 index ee959ee4b78c193f937f79368a7f6b22f8b4578a..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml +++ /dev/null @@ -1,117 +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>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>Assigned To Controler</string> </value> - </item> - <item> - <key> <string>transitions</string> </key> - <value> - <tuple> - <string>order</string> - <string>order_action</string> - <string>reject</string> - <string>reject_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> - </tuple> - </value> - </item> - <item> - <key> <string>Add portal content</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> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/rejected.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/rejected.xml index fb5668f3adccf67dfd6e71f918a36520dbafb0ef..bd25397fd7ef28ec7c9d1a65455e69c851b8555a 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/rejected.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/rejected.xml @@ -41,8 +41,8 @@ <string>cancel_action</string> <string>delete</string> <string>delete_action</string> - <string>plan</string> - <string>plan_action</string> + <string>order</string> + <string>order_action</string> </tuple> </value> </item> @@ -74,7 +74,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> @@ -105,7 +104,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>DestinationAssignee</string> <string>DestinationAssignor</string> <string>Manager</string> <string>Reviewer</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm.xml index 9331aadd8abc184c6f8dea95be303993e2f5af39..8540e2aefac417558f4d9ccdb945df8493f06eaf 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Assign To Surface Controler</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -38,7 +38,7 @@ <item> <key> <string>guard</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <none/> </value> </item> <item> @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Assign To Surface Controler</string> </value> + <value> <string>Send To Second Validation Level</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -64,28 +64,4 @@ </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>DestinationAssignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_action.xml index cf0d1b83e6d1edfca68af5a1d1c42ae816ee425e..2d1cdf777e2c313effb9f605973dd57d1ffd571a 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_action.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Assign To Destination Controler</string> </value> + <value> <string>Send To Second Level Validation</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -51,11 +51,11 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>validateCheckbookVaultTransferConsistency</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Assign To Surface Controler Action</string> </value> + <value> <string>Send To Second Validation Level</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -73,17 +73,11 @@ </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>DestinationAssignor</string> + <string>Assignee</string> <string>Manager</string> </tuple> </value> @@ -91,20 +85,4 @@ </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: here.getSource() is not None and "surface" in here.getSource()</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_to_deliver_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_to_deliver_action.xml deleted file mode 100644 index 38045bf13934edf0b78adb1c13fc6336a91ddaef..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/confirm_to_deliver_action.xml +++ /dev/null @@ -1,110 +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>Validate</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=confirm_to_deliver_action</string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string>deliver</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>confirm_to_deliver_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>validateCheckbookVaultTransferConsistency</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Validate 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>DestinationAssignee</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: here.getSource() is not None and "surface" in here.getSource()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/deliver_action.xml similarity index 79% rename from bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan_action.xml rename to bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/deliver_action.xml index de9962b39d6e04f31b5bb7e0edd1213c49032b38..f0ff68abb6977980905c1ebc0b2bc11b4df6b377 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/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 Source Controler</string> </value> + <value> <string>Deliver</string> </value> </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=plan_action</string> </value> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=deliver_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> - <value> <string>plan</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>plan_action</string> </value> + <value> <string>deliver_action</string> </value> </item> <item> <key> <string>new_state_id</string> </key> @@ -55,7 +61,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Assign To Vault Controler Action</string> </value> + <value> <string>Deliver</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -67,11 +73,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> @@ -80,7 +83,7 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Assignor</string> + <string>DestinationAssignor</string> <string>Manager</string> </tuple> </value> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order.xml index dd2ff6b8947d0a51132e8b23e3be2c30d7a7ca3c..6b64c2861843b78332aa4a5ae9221a560ff7b1db 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Assigned To Values Manager</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Send To First Validation Level</string> </value> </item> <item> <key> <string>trigger_type</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_action.xml index b1dc67ef7386e6c32a3a4ec22e85d73e033c7645..190d53765530593945eb1430912eb81a40276aa8 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_action.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Send To Destination</string> </value> + <value> <string>Send To First Validation Level</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Send To Surface Action</string> </value> + <value> <string>Send To First Validation Level</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> @@ -80,7 +77,7 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Assignee</string> + <string>Assignor</string> <string>Manager</string> </tuple> </value> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_to_deliver_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_to_deliver_action.xml deleted file mode 100644 index 42beee50d37e3a843a99ebc73aa70136cb704017..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/order_to_deliver_action.xml +++ /dev/null @@ -1,110 +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>Validate</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_to_deliver_action</string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string>deliver</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_to_deliver_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>validateCheckbookVaultTransferConsistency</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Validate 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>DestinationAssignor</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: here.getSource() is not None and \'caveau\' in here.getSource()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan.xml deleted file mode 100644 index d7cfb30584c221882786010d8c64146019fb3715..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/plan.xml +++ /dev/null @@ -1,92 +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 Vault Controler</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> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>plan</string> </value> - </item> - <item> - <key> <string>new_state_id</string> </key> - <value> <string>planned</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 Vault Controler</string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </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>Manager</string> - <string>Owner</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject.xml index fbc8d958e38b0630f95109af60c0f82deb997212..fe935be0d1c638af1eae8313d858d495e67799d2 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject.xml @@ -38,7 +38,7 @@ <item> <key> <string>guard</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <none/> </value> </item> <item> @@ -64,27 +64,4 @@ </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>Assignee</string> - <string>DestinationAssignor</string> - <string>DestinationAssignee</string> - <string>Manager</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject_action.xml index 3d8b06f2f375782d1cf16939149a01511b6e3195..125cf6e0ad435b42ad34d44937f075ef065dad1b 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/transitions/reject_action.xml @@ -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> @@ -82,7 +79,6 @@ <tuple> <string>Assignee</string> <string>DestinationAssignor</string> - <string>DestinationAssignee</string> <string>Manager</string> </tuple> </value> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml index f48e412fe514a4055039a472f32f1d150d73842e..31ff6081d2d63688c1fd0440931b847f9ca8230e 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml @@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Vault <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> @@ -71,7 +68,7 @@ Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Vault <value> <tuple> <string>Manager</string> - <string>DestinationAssignee</string> + <string>DestinationAssignor</string> </tuple> </value> </item> @@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Vault <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml index c4648a02684a094326921c3876b6a596d152de44..ae08c3dd9010dab28aebb07c9acfb0cdbabc9e4c 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml @@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Checkbook Vault T <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> @@ -71,7 +68,7 @@ Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Checkbook Vault T <value> <tuple> <string>Manager</string> - <string>DestinationAssignor</string> + <string>Assignee</string> </tuple> </value> </item> @@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Checkbook Vault T <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/planned.xml deleted file mode 100644 index 42019b0cbc4be4d45dd885639d6ed549894506fe..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/planned.xml +++ /dev/null @@ -1,119 +0,0 @@ -<?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>Vault Transfers To Validate By Vault Controler (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Checkbook Vault Transfer - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Vault Transfers To Validate By Vault Controler</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>planned</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> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <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>Checkbook Vault Transfer</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_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 272a4581e99a8e4b8a0bfd3429e493850a30788b..059361f2464e150ad36f1317b66db501364219e1 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -316 \ No newline at end of file +317 \ No newline at end of file