From 259726c013dc945f14e3981946009b855a26a88e Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Thu, 26 Oct 2006 08:18:24 +0000 Subject: [PATCH] do not use the fast input on stop payment, we must use reference min and reference max instead git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10948 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_types/Stop%20Payment/fastinput.xml | 2 +- .../check_payment_module.xml | 6 + .../checkbook_delivery_module.xml | 6 + .../checkbook_movement_module.xml | 6 + .../checkbook_reception_module.xml | 6 + .../checkbook_usual_cash_transfer_module.xml | 6 + .../checkbook_vault_transfer_module.xml | 6 + .../stop_payment_module.xml | 559 ++++++++++++------ .../traveler_check_purchase_module.xml | 6 + .../traveler_check_sale_module.xml | 6 + .../Base_checkOrCreateCheck.xml | 44 +- .../my_resource_title.xml | 4 +- .../my_destination_payment_reference.xml | 4 +- .../my_resource_title.xml | 4 +- .../Delivery_viewCheckbookInputDialog.xml | 12 +- .../Module_viewItemReportDialog.xml | 15 +- .../Module_viewItemReportDialog/my_vault.xml | 13 +- .../StopPayment_view.xml | 2 + .../StopPayment_view/listbox.xml | 16 +- .../StopPayment_view/my_debit_required.xml | 23 +- .../my_reference_range_max.xml | 293 +++++++++ .../my_reference_range_min.xml | 293 +++++++++ .../my_source_total_asset_price.xml | 25 +- .../TravelerCheckPurchase_view/listbox.xml | 2 +- .../TravelerCheckSale_view.xml | 1 + .../TravelerCheckSale_view/listbox.xml | 2 +- .../my_source_total_asset_price.xml | 254 ++++++++ .../checkAccountIsOverdraftFacility.xml | 27 + .../scripts/updateBankingOperation.xml | 48 +- .../scripts/updateCheck.xml | 27 + .../scripts/validateSourceAndDestination.xml | 154 +++++ .../transitions/deliver.xml | 2 +- .../CheckbookReception_generateItemList.xml | 6 + .../scripts/validateSourceAndDestination.xml | 154 +++++ .../scripts/validateSourceAndDestination.xml | 154 +++++ .../transitions/deliver.xml | 2 +- .../scripts/updateCheck.xml | 26 +- .../scripts/validatePositionAccounting.xml | 68 ++- .../states/confirmed.xml | 57 ++ .../states/delivered.xml | 6 +- .../stop_payment_workflow/states/started.xml | 57 ++ .../stop_payment_workflow/states/stopped.xml | 57 ++ .../transitions/cancel_action.xml | 2 +- .../transitions/start.xml | 4 +- .../transitions/start_action.xml | 2 +- bt5/erp5_banking_check/bt/revision | 2 +- 46 files changed, 2177 insertions(+), 294 deletions(-) create mode 100644 bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_max.xml create mode 100644 bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_min.xml create mode 100644 bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/my_source_total_asset_price.xml create mode 100644 bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml create mode 100644 bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml create mode 100644 bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml diff --git a/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Stop%20Payment/fastinput.xml b/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Stop%20Payment/fastinput.xml index 01aaa360af..d89852f857 100644 --- a/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Stop%20Payment/fastinput.xml +++ b/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Stop%20Payment/fastinput.xml @@ -64,7 +64,7 @@ </item> <item> <key> <string>visible</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/check_payment_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/check_payment_module.xml index 20d3f7dd29..5b56b2cbf4 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/check_payment_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/check_payment_module.xml @@ -483,6 +483,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -684,6 +687,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_delivery_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_delivery_module.xml index d59e640d99..2a44d38c4f 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_delivery_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_delivery_module.xml @@ -473,6 +473,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -667,6 +670,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_movement_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_movement_module.xml index 251a134382..19a0c35af3 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_movement_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_movement_module.xml @@ -484,6 +484,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -686,6 +689,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_reception_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_reception_module.xml index f574803617..d8e21a5a88 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_reception_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_reception_module.xml @@ -483,6 +483,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -684,6 +687,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_usual_cash_transfer_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_usual_cash_transfer_module.xml index a81251d571..14f6b95c5b 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_usual_cash_transfer_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_usual_cash_transfer_module.xml @@ -484,6 +484,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -686,6 +689,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_vault_transfer_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_vault_transfer_module.xml index 9ef2f5193f..9f2ffdeb5d 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_vault_transfer_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/checkbook_vault_transfer_module.xml @@ -484,6 +484,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -686,6 +689,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/stop_payment_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/stop_payment_module.xml index 1fd316c8d1..7995f6d6b6 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/stop_payment_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/stop_payment_module.xml @@ -1,515 +1,728 @@ <module> <id>stop_payment_module</id> <permission_list> - <permission type='list'> + <permission type='tuple'> <name>Access Transient Objects</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Access arbitrary user session data</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access contents information</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Access future portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access inactive portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access session data</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Add Accelerated HTTP Cache Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add BTreeFolder2s</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Browser Id Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Action Icons Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Active Processs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Caching Policy Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Calendar Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Core Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Default Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Report Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Setup Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Unique Id Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFActivity Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFCategory Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFMailIn Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Configured CMF Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Content Type Registrys</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Cookie Crumblers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Documents, Images, and Files</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Filesystem Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 OOo Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 PDF Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 PDF Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Publications</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Reports</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Subscriptions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Catalog Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Form Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Subversion Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5SyncML Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Type Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ExtFiles</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ExtImages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add External Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Filesystem Directory Views</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add LocalContents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add LocalFolders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Localizers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add MailHost objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add MessageCatalogs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Page Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Photo Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Photos</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Pluggable Index</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Plugin Registrys</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Python Scripts</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add RAM Cache Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ReStructuredText Documents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Session Data Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Site Roots</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Temporary Folder</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Transient Object Container</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add User Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Virtual Host Monsters</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Vocabularies</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z Gadfly Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z MySQL Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z MySQL Deferred Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZCatalogs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZMailIn Clients</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZMailMessages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZODB Mount Points</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Zope Tutorials</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal content</name> + <role>Assignor</role> + <role>Author</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal events</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal folders</name> + <role>Assignor</role> + <role>Author</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal member</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal topics</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Browser Id Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change DTML Documents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change DTML Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ExtFile/ExtImage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change External Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Formulator Fields</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Images and Files</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Lock Information</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Page Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Photo</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Python Scripts</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Session Data Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ZMailIn</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ZMailMessages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change bindings</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change cache managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change cache settings</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change configuration</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change local roles</name> + <role>Assignor</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change permissions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change portal events</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change portal topics</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change proxy roles</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Copy or Move</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Create Transient Objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Create class instances</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Define permissions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Delete objects</name> + <role>Assignor</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Download ExtFile/ExtImage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Edit Factories</name> + <role>Manager</role> </permission> <permission type='list'> + <name>Edit ParsedXML</name> + </permission> + <permission type='tuple'> <name>Edit ReStructuredText</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Edit target</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>FTP access</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Import/Export objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Join/leave Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>List folder contents</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>List portal members</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>List undoable changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Log Site Errors</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Log to the Event Log</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Mail forgotten password</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Access Rules</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Groups</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Transient Object Container</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Vocabulary</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage WebDAV Locks</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Z Classes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage ZCatalog Entries</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage ZCatalogIndex Entries</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage extensions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage languages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage messages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage portal</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage properties</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage users</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Modify Cookie Crumblers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Modify portal content</name> + <role>Assignor</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Open/Close Database Connection</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Open/Close Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Post mail to ZMailIn</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Query Vocabulary</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Reply to item</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Request review</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Review portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Save/discard Version changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Search ZCatalog</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Search for principals</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Set own password</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Set own properties</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Take ownership</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Test Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Translate Content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Undo changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use Factories</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use external editor</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use mailhost services</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>View</name> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> </permission> <permission type='list'> - <name>View History</name> + <name>View DOM hierarchy</name> </permission> - <permission type='list'> + <permission type='tuple'> + <name>View History</name> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>View ZMailMessage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>View management screens</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV Lock items</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV Unlock items</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV access</name> + <role>Manager</role> </permission> </permission_list> <portal_type>Stop Payment Module</portal_type> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_purchase_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_purchase_module.xml index e576f28dd9..0c017bfd2c 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_purchase_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_purchase_module.xml @@ -349,6 +349,9 @@ <permission type='list'> <name>Edit Factories</name> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='list'> <name>Edit ReStructuredText</name> </permission> @@ -493,6 +496,9 @@ <permission type='list'> <name>View</name> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='list'> <name>View History</name> </permission> diff --git a/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_sale_module.xml b/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_sale_module.xml index eafa104b9c..147694de3c 100644 --- a/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_sale_module.xml +++ b/bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_sale_module.xml @@ -486,6 +486,9 @@ <name>Edit Factories</name> <role>Manager</role> </permission> + <permission type='list'> + <name>Edit ParsedXML</name> + </permission> <permission type='tuple'> <name>Edit ReStructuredText</name> <role>Manager</role> @@ -689,6 +692,9 @@ <role>Author</role> <role>Manager</role> </permission> + <permission type='list'> + <name>View DOM hierarchy</name> + </permission> <permission type='tuple'> <name>View History</name> <role>Assignee</role> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml index 76be7cdde7..8cc4283370 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml @@ -75,11 +75,38 @@ # 1 - if a end date is not passed yet, we will create the check\n # 2 - if the end date is passed, we raise an error\n from Products.ERP5Type.Message import Message\n +from Products.DCWorkflow.DCWorkflow import ValidationFailed\n from DateTime import DateTime\n \n \n bank_account = context.getDestinationPaymentValue()\n -reference_list = [reference]\n +if reference is not None:\n + reference_list = [reference]\n +\n +elif reference_range_min is not None or reference_range_max is not None:\n + reference_list = []\n +\n + if reference_range_max is None:\n + reference_range_max = reference_range_min\n +\n + elif reference_range_min is None:\n + reference_range_min = reference_range_max\n +\n + try:\n + reference_range_min = int(reference_range_min)\n + reference_range_max = int(reference_range_max)\n + except ValueError:\n + msg = Message(domain=\'ui\', message=\'Sorry, make sure you have entered the right check number.\')\n + raise ValidationFailed, (msg,)\n +\n + if reference_range_min>reference_range_max :\n + msg = Message(domain=\'ui\', message=\'Sorry, the min number must be less than the max number.\')\n + raise ValidationFailed, (msg,)\n +\n + for ref in range(reference_range_min,reference_range_max+1):\n + # We will look for each reference and add the right number\n + reference_list.append(ref)\n +\n check_list = []\n for check_reference in reference_list:\n message_tag = \'check_%s\' % (check_reference, )\n @@ -125,7 +152,7 @@ for check_reference in reference_list:\n check_list.append(check)\n \n if reference is not None:\n - return check\n + return check_list[0]\n return check_list\n @@ -188,22 +215,27 @@ return check_list\n <string>reference_range_max</string> <string>Products.ERP5Type.Message</string> <string>Message</string> + <string>Products.DCWorkflow.DCWorkflow</string> + <string>ValidationFailed</string> <string>DateTime</string> <string>_getattr_</string> <string>context</string> <string>bank_account</string> + <string>None</string> <string>reference_list</string> - <string>check_list</string> + <string>int</string> + <string>ValueError</string> + <string>msg</string> <string>_getiter_</string> + <string>range</string> + <string>ref</string> + <string>check_list</string> <string>check_reference</string> <string>message_tag</string> - <string>msg</string> - <string>ValidationFailed</string> <string>result</string> <string>len</string> <string>end_date</string> <string>now</string> - <string>None</string> <string>checkbook</string> <string>_getitem_</string> <string>generic_model</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryLine_view/my_resource_title.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryLine_view/my_resource_title.xml index a4e8e0aa84..2413d2c46a 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryLine_view/my_resource_title.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryLine_view/my_resource_title.xml @@ -397,9 +397,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <list/> - </value> + <value> <string></string> </value> </item> <item> <key> <string>default_module</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_destination_payment_reference.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_destination_payment_reference.xml index e7a09fca6b..0bf0dd28fc 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_destination_payment_reference.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_destination_payment_reference.xml @@ -337,9 +337,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <list/> - </value> + <value> <string></string> </value> </item> <item> <key> <string>default_module</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_resource_title.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_resource_title.xml index 9d66e836ba..439ddbe6c9 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_resource_title.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view/my_resource_title.xml @@ -397,9 +397,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <list/> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml index ce9791956f..f7dd946f58 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml @@ -78,24 +78,29 @@ class Dummy:\n \n dummy = Dummy()\n node = kw.get(\'node\',dummy)\n +vault = kw.get(\'vault\',dummy)\n \n if item_portal_type_list is None:\n item_portal_type_list = ["Checkbook","Check"]\n \n if listbox is None:\n \n + if vault is not dummy:\n + node = vault\n if node is dummy:\n node = None\n - else:\n + if node is None:\n node = context.getBaobabSource()\n \n reference_date = DateTime()\n item_list = []\n listbox = []\n getCurrentTrackingList = context.portal_simulation.getCurrentTrackingList\n - context.log(\'current_tracking_list src\',getCurrentTrackingList(at_date=reference_date, node=node,src__=1))\n + #context.log(\'current_tracking_list src\',getCurrentTrackingList(at_date=reference_date, node=node,src__=1,where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'"))\n + #return [x.path for x in getCurrentTrackingList(at_date=reference_date, node=node)]\n current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n - at_date=reference_date, node=node)]\n + at_date=reference_date, node=node,\n + where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n for item in current_tracking_list:\n exclude=0\n if model_filter_dict is not None:\n @@ -198,6 +203,7 @@ return context.asContext(context=None\n <string>dummy</string> <string>_getattr_</string> <string>node</string> + <string>vault</string> <string>None</string> <string>context</string> <string>reference_date</string> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml index e2c4e09c60..7f92ba75d1 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog.xml @@ -67,8 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>bottom</string> - <string>hidden</string> + <string>left</string> </list> </value> </item> @@ -77,19 +76,13 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>left</string> </key> <value> <list> - <string>listbox</string> + <string>my_vault</string> </list> </value> </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -119,7 +112,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Report</string> </value> + <value> <string>Item Report</string> </value> </item> <item> <key> <string>unicode_mode</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog/my_vault.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog/my_vault.xml index 5000177f57..0c248a1968 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog/my_vault.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Module_viewItemReportDialog/my_vault.xml @@ -238,16 +238,7 @@ <item> <key> <string>items</string> </key> <value> - <list> - <tuple> - <string>a</string> - <string>a</string> - </tuple> - <tuple> - <string>z</string> - <string>z</string> - </tuple> - </list> + <list/> </value> </item> <item> @@ -256,7 +247,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>1</int> </value> + <value> <int>5</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view.xml index 0794d11fdb..71cfe95087 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view.xml @@ -112,6 +112,8 @@ <list> <string>my_destination_payment_reference</string> <string>my_destination_payment_title</string> + <string>my_reference_range_min</string> + <string>my_reference_range_max</string> <string>my_description</string> </list> </value> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/listbox.xml index 36daf3bb02..c80f329305 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/listbox.xml @@ -322,20 +322,12 @@ <value> <list> <tuple> - <string>resource_title</string> + <string>getResourceTitle</string> <string>Resource</string> </tuple> - <tuple> - <string>check_amount_title</string> - <string>Variation</string> - </tuple> <tuple> <string>reference_range_min</string> - <string>Start Number</string> - </tuple> - <tuple> - <string>reference_range_max</string> - <string>Stop Number</string> + <string>Number</string> </tuple> </list> </value> @@ -492,7 +484,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Checkbooks</string> </value> + <value> <string>Checks</string> </value> </item> <item> <key> <string>url_columns</string> </key> @@ -520,7 +512,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>objectValues</string> </value> + <value> <string>Delivery_getMovementList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_debit_required.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_debit_required.xml index 5df27169a2..27a56e0a8e 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_debit_required.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_debit_required.xml @@ -96,7 +96,9 @@ </item> <item> <key> <string>editable</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>enabled</string> </key> @@ -171,4 +173,23 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getSimulationState() in (\'draft\',\'confirmed\')</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_max.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_max.xml new file mode 100644 index 0000000000..469509c9d6 --- /dev/null +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_max.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_reference_range_max</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>Too much input was given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Check Number Max</string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getSimulationState() == \'draft\'</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_min.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_min.xml new file mode 100644 index 0000000000..6ea49efe97 --- /dev/null +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_reference_range_min.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_reference_range_min</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>Too much input was given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Check Number Min</string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getSimulationState() == \'draft\'</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_source_total_asset_price.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_source_total_asset_price.xml index aa8c69a76f..fc8897d007 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_source_total_asset_price.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_view/my_source_total_asset_price.xml @@ -142,7 +142,9 @@ </item> <item> <key> <string>editable</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>enabled</string> </key> @@ -163,7 +165,7 @@ <item> <key> <string>input_style</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -260,6 +262,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getSimulationState()==\'draft\'</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_view/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_view/listbox.xml index f8e4aa3c91..5767e99726 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_view/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_view/listbox.xml @@ -515,7 +515,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>objectValues</string> </value> + <value> <string>Delivery_getMovementList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view.xml index 191088e29f..22200fcf42 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view.xml @@ -101,6 +101,7 @@ <string>my_source_reference</string> <string>my_source_logical_path</string> <string>my_start_date</string> + <string>my_source_total_asset_price</string> </list> </value> </item> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/listbox.xml index dadd2e0547..3774e9d4a4 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/listbox.xml @@ -515,7 +515,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>objectValues</string> </value> + <value> <string>Delivery_getMovementList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/my_source_total_asset_price.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/my_source_total_asset_price.xml new file mode 100644 index 0000000000..48910c80c6 --- /dev/null +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_view/my_source_total_asset_price.xml @@ -0,0 +1,254 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>FloatField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>my_source_total_asset_price</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Total Amount</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml index 0506894297..4cc4680b39 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.xml @@ -86,6 +86,12 @@ if not account.isOverdraftFacility():\n <none/> </value> </item> + <item> + <key> <string>_dav_writelocks</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>_filepath</string> </key> <value> @@ -163,4 +169,25 @@ if not account.isOverdraftFacility():\n </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/> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml index ce43a3f170..3fc4c5d7c3 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml @@ -75,42 +75,9 @@ from Products.ERP5Type.Message import Message\n transaction = state_change[\'object\']\n bank_account = transaction.getDestinationPaymentValue()\n check_number = transaction.getAggregateFreeText()\n -message_tag = \'check_%s\' % (check_number, )\n \n -# XXX: no need to handle this cleanly for now, so just raise an error.\n -if context.portal_activities.countMessageWithTag(message_tag) != 0:\n - msg = Message(domain=\'ui\', message="This check number is already being indexed.")\n - raise ValidationFailed, (msg,)\n \n -result = context.portal_catalog(portal_type = \'Check\', reference = check_number)\n -if len(result) == 0:\n - # This happens only if automatic creation is allowed. So create a new check at this point.\n -\n - # Get a checkbook for this bank account.\n - checkbook = None\n - generic_model = context.portal_catalog(portal_type = \'Checkbook Model\', title = \'Generic\')[0].getObject()\n - # XXX it would be better to use a related key for this, but z_related_resource is too specific to\n - # movement at the moment.\n - for brain in context.portal_catalog(portal_type = \'Checkbook\',\n - destination_payment_uid = bank_account.getUid()):\n - obj = brain.getObject()\n - if obj.getResourceUid() == generic_model.getUid():\n - checkbook = obj\n - break\n - if checkbook is None:\n - # Create a checkbook.\n - # To prevent duplicated checkbooks for a single bank account, index this new checkbook immediately.\n - # This has a performance penalty, but this part of the script will rarely be called (once per bank account).\n - checkbook = context.checkbook_module.newContent(portal_type = \'Checkbook\',\n - resource_value = generic_model,\n - destination_payment_value = bank_account,\n - immediate_reindex = 1)\n - # Create a check.\n - check = checkbook.newContent(portal_type = \'Check\', reference = check_number, activate_kw={\'tag\': message_tag})\n - # Automatically issue this check.\n - check.confirm()\n -else:\n - check = result[0].getObject()\n +check = transaction.Base_checkOrCreateCheck(reference=check_number)\n \n line = transaction.get(\'movement\')\n if line is not None and line.getPortalType() == \'Banking Operation Line\':\n @@ -188,20 +155,9 @@ transaction.edit(aggregate = check.getRelativeUrl())\n <string>_getattr_</string> <string>bank_account</string> <string>check_number</string> - <string>message_tag</string> - <string>context</string> - <string>msg</string> - <string>ValidationFailed</string> - <string>result</string> - <string>len</string> - <string>None</string> - <string>checkbook</string> - <string>generic_model</string> - <string>_getiter_</string> - <string>brain</string> - <string>obj</string> <string>check</string> <string>line</string> + <string>None</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateCheck.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateCheck.xml index 281cd9879c..5c67bff6f9 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateCheck.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateCheck.xml @@ -82,6 +82,12 @@ check.deliver()\n <none/> </value> </item> + <item> + <key> <string>_dav_writelocks</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>_filepath</string> </key> <value> @@ -162,4 +168,25 @@ check.deliver()\n </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/> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml new file mode 100644 index 0000000000..366cb85cea --- /dev/null +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml @@ -0,0 +1,154 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>transaction = state_change.object\n +\n +# Check getBaobabSource and getBaobabDestination\n +transaction.Base_checkBaobabSourceAndDestination()\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>state_change, **kw</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>state_change</string> + <string>kw</string> + <string>_getattr_</string> + <string>transaction</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>validateSourceAndDestination</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml index 722cc6a746..8080982a2d 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml @@ -60,7 +60,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>validateSourceAndDestination</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml index 09f0d14983..a7e0f8dfae 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml @@ -71,6 +71,11 @@ <value> <string encoding="cdata"><![CDATA[ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n +transaction = state_change.object\n +\n +# Check getBaobabSource and getBaobabDestination\n +transaction.Base_checkBaobabSourceAndDestination()\n +\n \n delivery = state_change.object\n portal = context.getPortalObject()\n @@ -189,6 +194,7 @@ for line in line_list:\n <string>Products.DCWorkflow.DCWorkflow</string> <string>ValidationFailed</string> <string>_getattr_</string> + <string>transaction</string> <string>delivery</string> <string>context</string> <string>portal</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml new file mode 100644 index 0000000000..366cb85cea --- /dev/null +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml @@ -0,0 +1,154 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>transaction = state_change.object\n +\n +# Check getBaobabSource and getBaobabDestination\n +transaction.Base_checkBaobabSourceAndDestination()\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>state_change, **kw</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>state_change</string> + <string>kw</string> + <string>_getattr_</string> + <string>transaction</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>validateSourceAndDestination</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml new file mode 100644 index 0000000000..366cb85cea --- /dev/null +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml @@ -0,0 +1,154 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>transaction = state_change.object\n +\n +# Check getBaobabSource and getBaobabDestination\n +transaction.Base_checkBaobabSourceAndDestination()\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>state_change, **kw</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>state_change</string> + <string>kw</string> + <string>_getattr_</string> + <string>transaction</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>validateSourceAndDestination</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/transitions/deliver.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/transitions/deliver.xml index e36bc6b99f..b4603c527d 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/transitions/deliver.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/transitions/deliver.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>validateSourceAndDestination</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/updateCheck.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/updateCheck.xml index d179509d7b..88feebf4c8 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/updateCheck.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/updateCheck.xml @@ -70,12 +70,21 @@ <key> <string>_body</string> </key> <value> <string># We will make sure that the check will not be usable\n transaction = state_change[\'object\']\n +from Products.ERP5Type.Message import Message\n +from Products.DCWorkflow.DCWorkflow import ValidationFailed\n \n -line_list = transaction.getMovementList()\n portal_workflow = transaction.portal_workflow\n \n +aggregate_list = []\n +line_list = transaction.getMovementList()\n for line in line_list:\n - aggregate_list = line.getAggregateValueList()\n + aggregate_list.extend(line.getAggregateValueList())\n +ref_min = transaction.getReferenceRangeMin()\n +ref_max = transaction.getReferenceRangeMin()\n +if ref_min is not None or ref_max is not None:\n + if len(aggregate_list)==0:\n + msg = Message(domain=\'ui\', message=\'Sorry, no check was found, but there is a reference.\')\n + raise ValidationFailed, (msg,)\n for aggregate in aggregate_list:\n if aggregate.getPortalType()==\'Check\':\n aggregate.setStopDate(transaction.getStartDate())\n @@ -132,12 +141,21 @@ for line in line_list:\n <string>kw</string> <string>_getitem_</string> <string>transaction</string> + <string>Products.ERP5Type.Message</string> + <string>Message</string> + <string>Products.DCWorkflow.DCWorkflow</string> + <string>ValidationFailed</string> <string>_getattr_</string> - <string>line_list</string> <string>portal_workflow</string> + <string>aggregate_list</string> + <string>line_list</string> <string>_getiter_</string> <string>line</string> - <string>aggregate_list</string> + <string>ref_min</string> + <string>ref_max</string> + <string>None</string> + <string>len</string> + <string>msg</string> <string>aggregate</string> </tuple> </value> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.xml index 623f2bc7d6..eecc7144fd 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.xml @@ -68,7 +68,9 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n + <value> <string encoding="cdata"><![CDATA[ + +from Products.DCWorkflow.DCWorkflow import ValidationFailed\n from Products.ERP5Type.Message import Message\n \n transaction = state_change[\'object\']\n @@ -84,6 +86,41 @@ if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):\n msg = Message(domain = "ui", message="Counter Date is not opened")\n raise ValidationFailed, (msg,)\n \n +ref_min = transaction.getReferenceRangeMin()\n +ref_max = transaction.getReferenceRangeMax()\n +\n +# We will first retrieve all checks\n +check_list = []\n +if ref_min is not None or ref_max is not None:\n + check_list = transaction.Base_checkOrCreateCheck(\n + reference_range_min = ref_min,\n + reference_range_max = ref_max)\n +if len(check_list)>0:\n + # First make sure there is no delivery line\n + line_list = transaction.objectValues(portal_type=\'Cash Delivery Line\')\n + if len(line_list)>0:\n + id_list = [x.getId() for x in line_list]\n + transaction.manage_delObjects(ids=id_list)\n +\n + # Then we will construct a new line for each check\n + for item in check_list:\n + delivery_line = transaction.newContent(portal_type=\'Checkbook Delivery Line\')\n + item_dict = {}\n + reference_range_min = None\n + reference_range_max = None\n + if item.getPortalType()==\'Check\':\n + reference_range_min = reference_range_max = item.getReference()\n + item_dict[\'reference_range_min\'] = reference_range_min\n + item_dict[\'reference_range_max\'] = reference_range_max\n + item_dict[\'destination_trade\'] = item.getDestinationTrade()\n + item_dict["resource_value"] = item.getResourceValue()\n + item_dict["check_amount"] = item.getCheckAmount()\n + item_dict["check_type"] = item.getCheckType()\n + item_dict["price_currency"] = item.getPriceCurrency()\n + item_dict["aggregate_value"] = item\n + item_dict["quantity"] = 1\n + delivery_line.edit(**item_dict)\n +\n # First we have to look if we have some checks with some prices,\n # if so, this means that we are saling such kinds of check, thus\n # we must change the position of the customer account\n @@ -140,7 +177,9 @@ if debit_required:\n elif error[\'error_code\'] != 0:\n msg = Message(domain=\'ui\', message="Unknown error code.")\n raise ValidationFailed, (msg,)\n -</string> </value> + + +]]></string> </value> </item> <item> <key> <string>_code</string> </key> @@ -164,6 +203,12 @@ if debit_required:\n <key> <string>_params</string> </key> <value> <string>state_change, **kw</string> </value> </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>errors</string> </key> <value> @@ -201,12 +246,27 @@ if debit_required:\n <string>None</string> <string>source</string> <string>msg</string> + <string>ref_min</string> + <string>ref_max</string> + <string>check_list</string> + <string>len</string> + <string>line_list</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>x</string> + <string>id_list</string> + <string>item</string> + <string>delivery_line</string> + <string>item_dict</string> + <string>reference_range_min</string> + <string>reference_range_max</string> + <string>_write_</string> + <string>_apply_</string> <string>movement_list</string> <string>total_debit</string> - <string>_getiter_</string> <string>movement</string> <string>aggregate_value_list</string> - <string>item</string> <string>debit_required</string> <string>line</string> <string>bank_account</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml index 502fdfafa2..fae8ef684d 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml @@ -26,6 +26,12 @@ <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>Stop Payment Requested</string> </value> @@ -50,4 +56,55 @@ </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>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <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_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml index 006dc7d719..f11b6dbf80 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml @@ -71,7 +71,8 @@ <key> <string>Access contents information</string> </key> <value> <tuple> - <string>Auditor</string> + <string>Assignee</string> + <string>Assignor</string> <string>Manager</string> <string>Owner</string> </tuple> @@ -89,7 +90,8 @@ <key> <string>View</string> </key> <value> <tuple> - <string>Auditor</string> + <string>Assignee</string> + <string>Assignor</string> <string>Manager</string> <string>Owner</string> </tuple> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml index f4668ad26d..bf2c6e6c03 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>started</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>Payment Stopped</string> </value> @@ -49,4 +55,55 @@ </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>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml index 2b3329ab09..7b13155d1f 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>stopped</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>Lift Requested</string> </value> @@ -49,4 +55,55 @@ </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>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <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_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/cancel_action.xml index de6dcb6dc4..eb2d55a1db 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/cancel_action.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Annuler</string> </value> + <value> <string>Cancel</string> </value> </item> <item> <key> <string>actbox_url</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start.xml index 35dbc4bc02..12860202d3 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start.xml @@ -32,7 +32,7 @@ </item> <item> <key> <string>after_script_name</string> </key> - <value> <string>updateCheck</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -54,7 +54,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>updateCheck</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start_action.xml index 5692ec15b9..7c2e9b1ade 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/transitions/start_action.xml @@ -28,7 +28,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=stop_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> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 978b4e8e51..1758dddcce 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -26 \ No newline at end of file +32 \ No newline at end of file -- 2.30.9