From 542644d2ad3703a5ca98da8680f87c768a7e7392 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Mon, 17 Sep 2007 14:33:21 +0000 Subject: [PATCH] - allow to manually undeliver a check - allow to confirm a checkbook - minor changes on some forms - improved the new accounting cancellation workflow git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16413 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_destination_payment_title.xml | 2 +- .../listbox.xml | 31 +- .../AccountingCancellation_view/listbox.xml | 4 +- .../my_destination_total_asset_price.xml | 2 +- .../BankAccount_getReportInformationList.xml | 4 + .../BankAccount_getReportTransactionList.xml | 18 +- .../erp5_banking_core/Checkbook_view.xml | 4 +- .../Checkbook_view/listbox.xml | 11 +- .../Checkbook_view/listbox_stop_date.xml | 2021 +++++++++++++++++ .../Checkbook_view/my_destination.xml | 9 +- .../Checkbook_view/my_start_date.xml | 8 + .../CounterDate_getRemainingOperationList.xml | 26 +- .../ImportCsvToCategories.xml | 6 +- .../scripts/validateConsistency.xml | 34 +- .../states/confirmed.xml | 2 +- .../states/ordered.xml | 2 +- .../transitions/deliver_action.xml | 2 +- .../worklists/confirmed.xml | 8 +- .../worklists/draft.xml | 20 +- .../worklists/ordered.xml | 11 +- .../worklists/planned.xml | 119 - .../check_workflow/states/delivered.xml | 5 +- .../check_workflow/transitions/undeliver.xml | 67 + .../transitions/undeliver_action.xml | 87 + .../states/confirmed.xml} | 79 +- .../checkbook_workflow/states/draft.xml | 1 + .../transitions/confirm.xml | 67 + .../transitions/unconfirm.xml | 67 + bt5/erp5_banking_core/bt/revision | 2 +- 29 files changed, 2462 insertions(+), 257 deletions(-) create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox_stop_date.xml delete mode 100644 bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/planned.xml create mode 100644 bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver.xml create mode 100644 bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver_action.xml rename bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/{accounting_cancellation_workflow/worklists/started.xml => checkbook_workflow/states/confirmed.xml} (52%) create mode 100644 bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/confirm.xml create mode 100644 bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/unconfirm.xml diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view/my_destination_payment_title.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view/my_destination_payment_title.xml index 0b618255c7..437b66ac61 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view/my_destination_payment_title.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view/my_destination_payment_title.xml @@ -242,7 +242,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Bank Account Name</string> </value> + <value> <string>Destination Bank Account Name</string> </value> </item> <item> <key> <string>truncate</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationModule_viewAccountingCancellationList/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationModule_viewAccountingCancellationList/listbox.xml index 235a200050..7616df73d4 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationModule_viewAccountingCancellationList/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationModule_viewAccountingCancellationList/listbox.xml @@ -309,7 +309,28 @@ <item> <key> <string>all_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>source_reference</string> + <string>Reference</string> + </tuple> + <tuple> + <string>start_date</string> + <string>Date</string> + </tuple> + <tuple> + <string>source_total_asset_price</string> + <string>Amount</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>translated_simulation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> @@ -334,18 +355,10 @@ <string>start_date</string> <string>Date</string> </tuple> - <tuple> - <string>source_payment_title</string> - <string>Account</string> - </tuple> <tuple> <string>source_total_asset_price</string> <string>Amount</string> </tuple> - <tuple> - <string>Delivery Mode</string> - <string>Delivery Mode</string> - </tuple> <tuple> <string>description</string> <string>Description</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/listbox.xml index 26a6312d69..5a4b20d1bb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/listbox.xml @@ -348,7 +348,7 @@ <string>ID</string> </tuple> <tuple> - <string>source_payment_reference</string> + <string>getSourcePaymentInternalBankAccountNumber</string> <string>Source Account</string> </tuple> <tuple> @@ -364,7 +364,7 @@ <string>Credit</string> </tuple> <tuple> - <string>destination_payment_reference</string> + <string>getDestinationPaymentInternalBankAccountNumber</string> <string>Destination Account</string> </tuple> <tuple> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/my_destination_total_asset_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/my_destination_total_asset_price.xml index b7cd29a1fe..3c77e3c760 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/my_destination_total_asset_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/my_destination_total_asset_price.xml @@ -261,7 +261,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.Delivery_getTotalDestinationTotalAssetPrice(portal_type="Account Transfer Line")</string> </value> + <value> <string>python: here.Delivery_getTotalDestinationTotalAssetPrice(portal_type="Accounting Cancellation Line")</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml index 43a1057f75..907335ef5f 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml @@ -75,9 +75,13 @@ if reference is None:\n message = Message(domain="ui", message="Please give a reference")\n raise ValueError, message\n \n +context.log(\'reference\',reference)\n account_list = catalog(string_index=reference, portal_type=portal_type, validation_state=\'valid\')\n +context.log(\'sql src\',catalog(string_index=reference, portal_type=portal_type, validation_state=\'valid\',src__=1))\n +context.log(\'len 1\',len(account_list))\n if len(account_list) == 0:\n account_list = catalog(string_index="%%%s%%" % reference, portal_type=portal_type, validation_state=\'valid\')\n +context.log(\'len 2\',len(account_list))\n if len(account_list) == 0:\n message = Message(domain="ui", message="No bank account have this reference")\n raise ValueError, message\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml index cbc9884c3b..eb837bb6bb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml @@ -161,12 +161,21 @@ if transaction_list:\n tmp_dict[\'document_reference\'] = document_reference\n total_price = inventory.total_quantity\n tmp_dict[\'total_price\'] = total_price\n + cancellation_amount = movement.isCancellationAmount()\n + tmp_dict[\'cancellation_amount\'] = cancellation_amount\n tmp_dict[\'debit\'] = None\n tmp_dict[\'credit\'] = None\n - if total_price is not None and total_price >= 0:\n - tmp_dict[\'debit\'] = total_price\n - elif total_price is not None and total_price < 0:\n - tmp_dict[\'credit\'] = - total_price\n + if total_price is not None:\n + if not cancellation_amount:\n + if total_price >= 0:\n + tmp_dict[\'debit\'] = total_price\n + elif total_price < 0:\n + tmp_dict[\'credit\'] = - total_price\n + else:\n + if total_price < 0:\n + tmp_dict[\'debit\'] = total_price\n + elif total_price >= 0:\n + tmp_dict[\'credit\'] = - total_price\n \n description = delivery.getDescription()\n if description is None:\n @@ -289,6 +298,7 @@ return inv_account_dict.values()\n <string>delivery</string> <string>document_reference</string> <string>total_price</string> + <string>cancellation_amount</string> <string>description</string> <string>_inplacevar_</string> <string>sort_date</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view.xml index ddfa76593c..9d2765f2fe 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view.xml @@ -95,7 +95,9 @@ <item> <key> <string>hidden</string> </key> <value> - <list/> + <list> + <string>listbox_stop_date</string> + </list> </value> </item> <item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml index 4bd39706ed..a983eee4bb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml @@ -352,6 +352,10 @@ <string>stop_date</string> <string>Operation Date</string> </tuple> + <tuple> + <string>translated_simulation_state_title</string> + <string>State</string> + </tuple> </list> </value> </item> @@ -394,7 +398,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>stop_date</string> + <string>stop_date</string> + </tuple> + </list> </value> </item> <item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox_stop_date.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox_stop_date.xml new file mode 100644 index 0000000000..b79b779438 --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox_stop_date.xml @@ -0,0 +1,2021 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="DateTimeField" module="Products.Formulator.StandardFields"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_stop_date</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>datetime_out_of_range</string> </key> + <value> <string>The date and time you entered were out of range.</string> </value> + </item> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_datetime</string> </key> + <value> <string>You did not enter a valid date and time.</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>allow_empty_time</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_now</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</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>end_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>sub_form</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_empty_time</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_now</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</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>end_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_empty_time</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string>/</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>default_now</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </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>end_datetime</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hide_day</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> <string>dmy</string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>text</string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string>:</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Emission Date</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.Form</string> + <string>BasicForm</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>fields</string> </key> + <value> + <dictionary> + <item> + <key> <string>ampm</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>day</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + <item> + <key> <string>hour</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + </value> + </item> + <item> + <key> <string>minute</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + </value> + </item> + <item> + <key> <string>month</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + </value> + </item> + <item> + <key> <string>year</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>Default</string> + <string>date</string> + <string>time</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>Default</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>date</string> </key> + <value> + <list> + <string>year</string> + <string>month</string> + <string>day</string> + </list> + </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <list> + <string>hour</string> + <string>minute</string> + <string>ampm</string> + </list> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>ISO-8859-1</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Basic Form</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <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.portal_preferences.getPreferredDateOrder()</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>ampm</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> <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>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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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> <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>am/pm</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="5" aka="AAAAAAAAAAU="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>day</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>integer_out_of_range</string> </key> + <value> <string>The integer you entered was out of range.</string> </value> + </item> + <item> + <key> <string>not_integer</string> </key> + <value> <string>You did not enter an integer.</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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>end</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> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Day</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="6" aka="AAAAAAAAAAY="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>hour</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>integer_out_of_range</string> </key> + <value> <string>The integer you entered was out of range.</string> </value> + </item> + <item> + <key> <string>not_integer</string> </key> + <value> <string>You did not enter an integer.</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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>end</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> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Hour</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="7" aka="AAAAAAAAAAc="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>minute</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>integer_out_of_range</string> </key> + <value> <string>The integer you entered was out of range.</string> </value> + </item> + <item> + <key> <string>not_integer</string> </key> + <value> <string>You did not enter an integer.</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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>end</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> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Minute</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="8" aka="AAAAAAAAAAg="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>month</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>integer_out_of_range</string> </key> + <value> <string>The integer you entered was out of range.</string> </value> + </item> + <item> + <key> <string>not_integer</string> </key> + <value> <string>You did not enter an integer.</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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>end</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> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Month</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="9" aka="AAAAAAAAAAk="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>year</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>integer_out_of_range</string> </key> + <value> <string>The integer you entered was out of range.</string> </value> + </item> + <item> + <key> <string>not_integer</string> </key> + <value> <string>You did not enter an integer.</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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>end</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>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start</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> <int>4</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>4</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>end</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> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Year</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_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination.xml index 80337c8a49..2337865ef8 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination.xml @@ -273,18 +273,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = None, user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value> + <value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = here.getDestination(), user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_start_date.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_start_date.xml index 570324bbfa..77086b9500 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_start_date.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_start_date.xml @@ -288,6 +288,14 @@ <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> + <item> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hide_day</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>input_order</string> </key> <value> <string>dmy</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml index 49a796dbbc..3bfe5fa3aa 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml @@ -65,10 +65,10 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if site is not None:\n - site_uid = site.getUid()\n -else:\n - site_uid = context.getSiteUid()\n + <value> <string>if site is None:\n + site = context.getSiteValue()\n +site_uid = site.getUid()\n +site_url = site.getRelativeUrl()\n operation_list = []\n exception_portal_type_list = [\'Paper Money Deposit\']\n if site_uid is not None:\n @@ -85,15 +85,22 @@ if site_uid is not None:\n # Mutilated Banknotes in planned state or in finished state with siege as source must nogt block either.\n portal_type = document.getPortalType()\n simulation_state = document.getSimulationState()\n - if not ( (portal_type in (\'Stop Payment\', \'Cash Movement\') and simulation_state == \'started\')\n + if (portal_type in (\'Stop Payment\', ) and simulation_state == \'started\') \\\n or (portal_type == \'Mutilated Banknote\' and \n (simulation_state == \'planned\' or \n (simulation_state == \'finished\' and \'siege\' in here.getSource(\'\'))\n )\n - )\n - or (portal_type == \'Monetary Destruction\' and simulation_state == \'ordered\')\n + ) \\\n + or (portal_type == \'Monetary Destruction\' and simulation_state == \'ordered\'):\n + continue\n + if portal_type in (\'Cash Movement\', \'Cash Movement New Not Emmited\'):\n + if not (\n + ((simulation_state in (\'confirmed\') and site_url in document.getSource()) \n + or \n + (simulation_state in (\'stopped\') and site_url in document.getDestination()))\n ):\n - append(document)\n + continue\n + append(document)\n \n def operation_sort(a,b):\n result = cmp(a.getPortalType(),b.getPortalType())\n @@ -162,8 +169,9 @@ return operation_list\n <string>kw</string> <string>None</string> <string>_getattr_</string> - <string>site_uid</string> <string>context</string> + <string>site_uid</string> + <string>site_url</string> <string>operation_list</string> <string>exception_portal_type_list</string> <string>not_closed_state_list</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml index 6d147f12e1..2be42efe43 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml @@ -254,8 +254,10 @@ elif import_type == \'create_subvaults\' :\n subvault_dict[vault].append([counter_subvault, subvault_code])\n if subvault == \'Encaisse des Billets et Monnaies\' :\n if counter_name in two_way_counter_list:\n - subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "entrante"), None])\n - subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "sortante"), None])\n + if counter_name != \'gros_paiement\':\n + subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "entrante"), None])\n + if counter_name != \'gros_versement\':\n + subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "sortante"), None])\n elif subvault == \'Encaisse des Externes\' :\n subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "transit"), \'TRA\'])\n elif subvault == \'Encaisse des Devises\' :\n diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.xml index c32314b76e..4d6543e7ef 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.xml @@ -76,7 +76,7 @@ transaction = state_change[\'object\']\n \n site = transaction.getSite()\n date = transaction.getStartDate()\n -transaction.Baobab_checkCounterDateOpen(site=site, date=date)\n +# No need to check counter date, only accounting date\n transaction.Baobab_checkAccountingDateOpen(site=site, date=date)\n \n # Check some properties of document\n @@ -93,31 +93,6 @@ if transaction.getResource() is None:\n \n # Check the source bank account.\n source_bank_account = transaction.getSourcePaymentValue()\n -#accounting_code = transaction.getSourceSection()\n -#if source_bank_account is None and accounting_code is None:\n -# msg = Message(domain=\'ui\', message="Source account is not defined.")\n -# raise ValidationFailed, (msg,)\n -#elif source_bank_account is not None and accounting_code is not None:\n -# msg = Message(domain=\'ui\', message="You can\'t defined account and accounting code on document")\n -# raise ValidationFailed, (msg,)\n -\n -# Specific check to bank account\n -if source_bank_account is not None:\n - if context.BankAccount_isMessagePending(source_bank_account):\n - msg = Message(domain=\'ui\', message="There are operations pending for this account that prevent form calculating its position. Please try again later.")\n - raise ValidationFailed, (msg,)\n - source_bank_account.serialize()\n - # Test if the account balance is sufficient.\n - error = context.BankAccount_checkBalance(source_bank_account.getRelativeUrl(), transaction.getSourceTotalAssetPrice())\n - # if error[\'error_code\'] == 1:\n - # msg = Message(domain=\'ui\', message="Source bank account is not sufficient.")\n - # raise ValidationFailed, (msg,)\n - if error[\'error_code\'] == 2:\n - msg = Message(domain=\'ui\', message="Source bank account is not valid.")\n - raise ValidationFailed, (msg,)\n - elif error[\'error_code\'] != 0:\n - msg = Message(domain=\'ui\', message="Unknown error code.")\n - raise ValidationFailed, (msg,)\n \n # test we have account transfer line defined\n nb_transfer_line = len(transaction.objectValues(portal_type=\'Accounting Cancellation Line\'))\n @@ -140,13 +115,13 @@ for line in transaction.objectValues(portal_type=\'Accounting Cancellation Line\ msg = Message(domain=\'ui\', message="No account defined on line.")\n raise ValidationFailed, (msg,)\n # check we don\'t have both account and accounting code defined\n - if line.getDestinationPaymentReference(None) is not None \\\n + if line.getDestinationPayment(None) is not None \\\n and line.getDestinationSection() is not None:\n msg = Message(domain=\'ui\', message="You can\'t defined account and accounting code on line.")\n raise ValidationFailed, (msg,)\n # check that at least destination_payment or destination_section is defined\n if line.getDestinationPayment() is None and \\\n - line.getBaobabDestinationSection() is None:\n + line.getDestinationSection() is None:\n msg = Message(domain=\'ui\', message="Destination account is not defined.")\n raise ValidationFailed, (msg,)\n # Index the banking operation line so it impacts account position\n @@ -222,14 +197,13 @@ if total_line_price != transaction.getSourceTotalAssetPrice():\n <string>None</string> <string>msg</string> <string>source_bank_account</string> - <string>context</string> - <string>error</string> <string>len</string> <string>nb_transfer_line</string> <string>total_line_price</string> <string>_getiter_</string> <string>line</string> <string>_inplacevar_</string> + <string>context</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/confirmed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/confirmed.xml index 63ea1f7682..949a1497da 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/confirmed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/confirmed.xml @@ -31,7 +31,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Sent To Interface</string> </value> + <value> <string>Sent To Second Validation Level</string> </value> </item> <item> <key> <string>transitions</string> </key> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/ordered.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/ordered.xml index 15d91fda68..3abdaf515d 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/ordered.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/ordered.xml @@ -31,7 +31,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Sent To Second Validation Level</string> </value> + <value> <string>Sent To First Validation Level</string> </value> </item> <item> <key> <string>transitions</string> </key> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/transitions/deliver_action.xml index f3937650d5..f96808dc45 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/transitions/deliver_action.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Pay</string> </value> + <value> <string>Validate</string> </value> </item> <item> <key> <string>actbox_url</string> </key> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/confirmed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/confirmed.xml index 7593e40677..aef302e5e6 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/confirmed.xml @@ -21,19 +21,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Validated By Interface (%(count)s)</string> </value> + <value> <string>Sent To Second Validation Level (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewWorklist?simulation_state=confirmed&portal_type=Account Transfer&reset=1 +Base_viewWorklist?simulation_state=confirmed&portal_type=Accounting Cancellation&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Validated By Interface</string> </value> + <value> <string>Sent To Second Validation Level</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -93,7 +93,7 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Account Transfer&reset= <key> <string>portal_type</string> </key> <value> <tuple> - <string>Account Transfer</string> + <string>Accounting Cancellation</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/draft.xml index a00d19c5ae..1fe6efa8fd 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/draft.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/draft.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1 +Base_viewWorklist?simulation_state=draft&portal_type=Accounting Cancellation&reset=1 ]]></string> </value> </item> @@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1 <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> @@ -81,24 +78,21 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1 <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> <key> <string>portal_type</string> </key> <value> <tuple> - <string>Account Transfer</string> + <string>Accounting Cancellation</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/ordered.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/ordered.xml index 50e5871949..1b806b4bb1 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/ordered.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/ordered.xml @@ -21,19 +21,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Sent To Second Validation Level (%(count)s)</string> </value> + <value> <string>Sent To First Validation Level (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1 +Base_viewWorklist?simulation_state=ordered&portal_type=Accounting Cancellation&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Sent To Second Validation Level</string> </value> + <value> <string>Sent To First Validation Level</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -68,8 +68,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1 <value> <tuple> <string>Manager</string> - <string>DestinationAssignor</string> - <string>DestinationAssignee</string> + <string>Assignee</string> </tuple> </value> </item> @@ -93,7 +92,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1 <key> <string>portal_type</string> </key> <value> <tuple> - <string>Account Transfer</string> + <string>Accounting Cancellation</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/planned.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/planned.xml deleted file mode 100644 index 49c4364adc..0000000000 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/planned.xml +++ /dev/null @@ -1,119 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>actbox_category</string> </key> - <value> <string>global</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Sent To First Validation Level (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Sent To First Validation Level</string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>planned</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Account Transfer</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_state</string> </key> - <value> - <tuple> - <string>planned</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml index dbbbd84f73..a08e119be9 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml @@ -36,7 +36,10 @@ <item> <key> <string>transitions</string> </key> <value> - <tuple/> + <tuple> + <string>undeliver</string> + <string>undeliver_action</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver.xml new file mode 100644 index 0000000000..670ab5bb68 --- /dev/null +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>undeliver</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>confirmed</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver_action.xml new file mode 100644 index 0000000000..5c28304467 --- /dev/null +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver_action.xml @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string>Go back to Issued</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=undeliver_action</string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>undeliver</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>undeliver_action</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Go back to Issued</string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/started.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/confirmed.xml similarity index 52% rename from bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/started.xml rename to bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/confirmed.xml index a3890398c0..d5d64f68e7 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/started.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/confirmed.xml @@ -3,7 +3,7 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> + <global name="StateDefinition" module="Products.DCWorkflow.States"/> <tuple/> </tuple> </pickle> @@ -16,66 +16,41 @@ </value> </item> <item> - <key> <string>actbox_category</string> </key> - <value> <string>global</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Waiting for correction (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -Base_viewWorklist?simulation_state=started&portal_type=Account Transfer&reset=1 - -]]></string> </value> + <key> <string>description</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>description</string> </key> - <value> <string>Waiting for correction</string> </value> + <key> <string>id</string> </key> + <value> <string>confirmed</string> </value> </item> <item> - <key> <string>guard</string> </key> + <key> <string>permission_roles</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>id</string> </key> - <value> <string>started</string> </value> + <key> <string>title</string> </key> + <value> <string>Issued (Checkbook)</string> </value> </item> <item> - <key> <string>var_matches</string> </key> + <key> <string>transitions</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <tuple> + <string>unconfirm</string> + </tuple> </value> </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Guard" module="Products.DCWorkflow.Guard"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> <item> - <key> <string>roles</string> </key> + <key> <string>type_list</string> </key> <value> - <tuple> - <string>Manager</string> - <string>DestinationAssignor</string> - </tuple> + <tuple/> </value> </item> </dictionary> </pickle> </record> - <record id="3" aka="AAAAAAAAAAM="> + <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> <global name="PersistentMapping" module="Persistence.mapping"/> @@ -89,18 +64,34 @@ Base_viewWorklist?simulation_state=started&portal_type=Account Transfer&reset=1 <value> <dictionary> <item> - <key> <string>portal_type</string> </key> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + <string>Reviewer</string> + </tuple> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> <value> <tuple> - <string>Account Transfer</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> </tuple> </value> </item> <item> - <key> <string>simulation_state</string> </key> + <key> <string>View</string> </key> <value> <tuple> - <string>started</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + <string>Reviewer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml index 1e5c178961..ce6cd2edc6 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml @@ -37,6 +37,7 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>confirm</string> <string>delete</string> <string>delete_action</string> </tuple> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/confirm.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/confirm.xml new file mode 100644 index 0000000000..c9aabf5b52 --- /dev/null +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/confirm.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>confirm</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>confirmed</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/unconfirm.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/unconfirm.xml new file mode 100644 index 0000000000..adf286aa3b --- /dev/null +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/unconfirm.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>unconfirm</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>draft</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index ac471d3ba0..2a9c18ad50 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -355 \ No newline at end of file +357 \ No newline at end of file -- 2.30.9