diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ForeignCashReception_view/my_description.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ForeignCashReception_view/my_description.xml index 148dca8044082b5a74b7e13960a775d6546e2290..d59c66994f7b344027d145e7c8f25f35e464d7f9 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ForeignCashReception_view/my_description.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ForeignCashReception_view/my_description.xml @@ -259,7 +259,7 @@ </item> <item> <key> <string>required</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml index 411a855fe645ddb75866042852b0960880c090f6..ce42c44355cd0486cb9cbcafc5cc9c6aa0a06f2e 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml @@ -114,12 +114,12 @@ def create_movement(CD_head_dict, CD_line_list):\n , reindex_object = 1\n , reference = CD_line[\'reference\']\n , cash_number_range_start = CD_line[\'range_start\']\n - , cash_number_range_stop = CD_line[\'range_stop\']\n + , cash_number_range_stop = CD_line[\'range_stop\']\n )\n # create a cash container line\n container_line = movement_container.newContent(portal_type = \'Container Line\'\n , reindex_object = 1\n - , resource_value = CD_head_dict[\'resource\']\n + , resource_value =CD_head_dict[\'resource\']\n , quantity = CD_line[\'quantity\']\n )\n \n @@ -309,6 +309,13 @@ def split_lines(CD_file_line_list):\n ,\'range_stop\' : line_range_stop\n ,\'quantity\' : line_quantity}\n )\n + # check reference doesn\'t already exist for this resource\n + movement_container_list = context.portal_catalog(portal_type = "Cash Container Item", reference = line_container_id)\n + if len(movement_container_list) > 0:\n + pass\n + #return {\'error\':True, \'message\':message_dict[\'03\'], \'head_dict\':{}}\n +\n +\n \n if line_number > 0:\n return {\'error\':False, \'message\':\'Ligne \' + str(line_number) + \' : \' + message_dict[\'00\'],\'lines_dict\' : CD_line_list}\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow.xml index c96019c10f25426c1a57e73f946579feb70b264a..1b26306e88cd3397dabc86f31f3793b4c6eb2cc5 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow.xml @@ -36,6 +36,10 @@ <none/> </value> </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>groups</string> </key> <value> @@ -58,9 +62,9 @@ <key> <string>permissions</string> </key> <value> <tuple> - <string>View</string> <string>Access contents information</string> <string>Modify portal content</string> + <string>View</string> <string>Add portal content</string> </tuple> </value> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml index f16854ac857de78485278f520499e02bd93fffb3..eb1d5f0b74f2d98a7cb5f2e285faa5d9ddb06f96 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/scripts/checkConsistency.xml @@ -89,7 +89,7 @@ elif len(in_list) == 0 and len(out_list) == 0:\n msg = Message(domain = "ui", message="No resource.")\n raise ValidationFailed, (msg,)\n elif len(out_list) !=0:\n - resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Account Incident Line\')\n + resource = txn.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Outgoing Account Incident Line\')\n if resource <> 0 :\n msg = Message(domain="ui", message="Insufficient Balance.")\n raise ValidationFailed, (msg,)\n @@ -162,7 +162,6 @@ elif (in_price != 0 and in_price != price) or (out_price != 0 and out_price != p <string>out_price</string> <string>len</string> <string>msg</string> - <string>transaction</string> <string>resource</string> </tuple> </value> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml new file mode 100644 index 0000000000000000000000000000000000000000..098044fd0078221962ba5619d7602599a311b85e --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/cancelled.xml @@ -0,0 +1,106 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.States</string> + <string>StateDefinition</string> + </tuple> + <none/> + </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>cancelled</string> </value> + </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Cancelled</string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple/> + </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>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>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>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/planned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml similarity index 94% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/planned.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml index dbe3473e79ffccc5355fa18f2a1ea508a382a72f..7434d0584a2cb5c178ed75a16b587dc33491ee21 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/planned.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/confirmed.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>planned</string> </value> + <value> <string>confirmed</string> </value> </item> <item> <key> <string>permission_roles</string> </key> @@ -34,7 +34,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Sent to validation</string> </value> + <value> <string>Confirmed</string> </value> </item> <item> <key> <string>transitions</string> </key> @@ -42,6 +42,8 @@ <tuple> <string>archive</string> <string>archive_action</string> + <string>reject</string> + <string>reject_action</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/archived.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml similarity index 88% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/archived.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml index 4c7a4444b40566bc0ff360b57b8844b595759aa7..2334c2212b0f13e8a2a75bed032c4a8dc3452c85 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/archived.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/delivered.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>archived</string> </value> + <value> <string>delivered</string> </value> </item> <item> <key> <string>permission_roles</string> </key> @@ -38,15 +38,6 @@ </item> <item> <key> <string>transitions</string> </key> - <value> - <tuple> - <string>cancel</string> - <string>cancel_action</string> - </tuple> - </value> - </item> - <item> - <key> <string>type_list</string> </key> <value> <tuple/> </value> @@ -76,7 +67,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>Auditor</string> <string>Manager</string> </tuple> </value> @@ -103,7 +93,6 @@ <tuple> <string>Assignee</string> <string>Assignor</string> - <string>Auditor</string> <string>Manager</string> </tuple> </value> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml index 0b073664732c51c5cfa8552e4532530cef4525ff..51772a1ee71c10c6609542341a5e6935fb59e045 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/states/draft.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>id</string> </key> @@ -40,17 +40,13 @@ <key> <string>transitions</string> </key> <value> <tuple> - <string>plan</string> - <string>plan_action</string> + <string>cancel</string> + <string>cancel_action</string> + <string>confirm</string> + <string>confirm_action</string> </tuple> </value> </item> - <item> - <key> <string>type_list</string> </key> - <value> - <tuple/> - </value> - </item> </dictionary> </pickle> </record> @@ -74,8 +70,10 @@ <key> <string>Access contents information</string> </key> <value> <tuple> + <string>Assignee</string> <string>Assignor</string> <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> @@ -94,6 +92,7 @@ <tuple> <string>Assignor</string> <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> @@ -101,8 +100,10 @@ <key> <string>View</string> </key> <value> <tuple> + <string>Assignee</string> <string>Assignor</string> <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive.xml index f8dfcfd9e80dd556c7253bcdc42e2d6a45f5c5ca..094a4ea93417f97e6e6e6ef5015133a69e66b0f0 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive.xml @@ -50,11 +50,11 @@ </item> <item> <key> <string>new_state_id</string> </key> - <value> <string>archived</string> </value> + <value> <string>delivered</string> </value> </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>validateSourceAndDestination</string> </value> </item> <item> <key> <string>title</string> </key> @@ -83,8 +83,8 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Manager</string> <string>Assignee</string> + <string>Manager</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive_action.xml index 22056d841e21fc92b5cad538597cc7946861a7a2..d04113b341305ccfd6acbbff4e759d8c50c15ebe 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/archive_action.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Validate</string> </value> + <value> <string>Deliver</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -83,8 +83,8 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Manager</string> <string>Assignee</string> + <string>Manager</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml similarity index 93% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml index c7f1604051881f10185fdb43941d26fec75f03d4..7078cfec143b1ab15e9030ddd719503c98ce6804 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel.xml @@ -46,11 +46,11 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>plan</string> </value> + <value> <string>cancel</string> </value> </item> <item> <key> <string>new_state_id</string> </key> - <value> <string>planned</string> </value> + <value> <string>cancelled</string> </value> </item> <item> <key> <string>script_name</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Send To Validation</string> </value> + <value> <string>Cancel</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -83,8 +83,8 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Manager</string> <string>Assignor</string> + <string>Manager</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml new file mode 100644 index 0000000000000000000000000000000000000000..75e79653579bf0465133785c50d617f450dbb011 --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/cancel_action.xml @@ -0,0 +1,94 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string>Cancel</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>cancel</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>cancel_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>Cancel 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> + <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> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml new file mode 100644 index 0000000000000000000000000000000000000000..2922cf5d7a9e9ade18cf004ed2acd9ddeaa119d7 --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm.xml @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></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>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>Confirm</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_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml similarity index 87% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml index a8bc9a7b719acd8df5a2968f48ec923040d79a1c..c9cf55e69e372233dddef2df1ab38c415676cba7 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/plan_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/confirm_action.xml @@ -24,15 +24,15 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Send To Validation</string> </value> + <value> <string>Confirm</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?workflow_action=confirm_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> - <value> <string>plan</string> </value> + <value> <string>confirm</string> </value> </item> <item> <key> <string>description</string> </key> @@ -46,7 +46,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>plan_action</string> </value> + <value> <string>confirm_action</string> </value> </item> <item> <key> <string>new_state_id</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Send To Validation Action</string> </value> + <value> <string>Confirm Action</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -83,8 +83,9 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Manager</string> <string>Assignor</string> + <string>Manager</string> + <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject.xml new file mode 100644 index 0000000000000000000000000000000000000000..96dab88db3959d3dc098bd601005d32660a39e52 --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject.xml @@ -0,0 +1,121 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></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>reject</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>draft</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Reject</string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>var_exprs</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>Assignee</string> + <string>Manager</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/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject_action.xml new file mode 100644 index 0000000000000000000000000000000000000000..4eeca706412244e858d9e04697b2e5614330a7ff --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/transitions/reject_action.xml @@ -0,0 +1,94 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string>Reject</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=reject_action</string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>reject</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>reject_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>Reject 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> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/actor.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/actor.xml index d1db1ef6eb24c320d6bf046357fa63d3246b4de9..56b9e0039cf679fdc0bb4973498ba3e2015229fb 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/actor.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/actor.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Auteur</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>for_catalog</string> </key> @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>user/getUserName</string> </value> + <value> <string>user/getUserName </string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/simulation_assigned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/simulation_assigned.xml deleted file mode 100644 index 13676378248a199bed8d96cd27369191f62593e9..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/simulation_assigned.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>If set to yes then assigned to worklist</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>1</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>simulation_assigned</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_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/time.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/time.xml index 1ff286bc78b2df9c9c408d44431332bec8a7446b..18e4adedab438a9e0cad78bd30a8f7c53cc4199c 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/time.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/time.xml @@ -71,7 +71,9 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>state_change/getDateTime</string> </value> + <value> <string>state_change/getDateTime\r\n + \r\n +</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml index e39ae8b18d690feceaddd2abf5b64a53270dafa5..de5d5e21916ef2f049406b0847a7769ca3d3e44d 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml @@ -24,19 +24,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Account Incident To Validate (%(count)s)</string> </value> + <value> <string>Usual Cash Transfers to Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewWorklist?simulation_state=confimed&portal_type=Account Incident&reset=1 +Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Usual Cash Transfer ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Account Incident To Validate</string> </value> + <value> <string>Usual Cash Transfers to Validate</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -101,7 +101,7 @@ Base_viewWorklist?simulation_state=confimed&portal_type=Account Incident&reset=1 <key> <string>portal_type</string> </key> <value> <tuple> - <string>Account Incident</string> + <string>Usual Cash Transfer</string> </tuple> </value> </item> @@ -109,7 +109,7 @@ Base_viewWorklist?simulation_state=confimed&portal_type=Account Incident&reset=1 <key> <string>simulation_state</string> </key> <value> <tuple> - <string>planned</string> + <string>confirmed</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml index 7fa16d381c70c647e402a2c7992448b2cd61f4e3..5c7827172c4ddbb93153777bde1f0879eee26161 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml @@ -24,19 +24,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Draft To Validate (%(count)s)</string> </value> + <value> <string>Drafts to Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewWorklist?simulation_state=draft&portal_type=Account Incident&reset=1 +Base_viewWorklist?simulation_state=draft&portal_type=Usual Cash Transfer&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Draft to validate</string> </value> + <value> <string>Drafts to Validate</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -101,7 +101,7 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Incident&reset=1 <key> <string>portal_type</string> </key> <value> <tuple> - <string>Account Incident</string> + <string>Usual Cash Transfer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml index 9294624e7ca5914594632bfd8272e22f8b446d36..c604d60a777e30d323a7f19749ff40f6321b963c 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml @@ -73,7 +73,7 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n \n object = state_change.object\n \n -# utilisation de la contrainte\n +# use of the constraint\n vliste = object.checkConsistency()\n object.log(\'vliste\', vliste)\n if len(vliste) != 0:\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml index 28ba66d5f8e1ed14c5a5da713bc6d9bf8963bbed..21ca1b3e8ff09e470024e1719f08c185f0a8813e 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Monetary Rexeptions to Validate (%(count)s)</string> </value> + <value> <string>Monetary Receptions to Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index 0fd0714a51f10639eab0e6a0121977179a7b458a..e3b5acb83455926f7a928b8ab4de46bfdb4605bd 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -103 \ No newline at end of file +107 \ No newline at end of file