Skip to content

erp5
erp5
Commit 542644d2 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

- 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
parent 466cba5d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2462 additions and 138 deletions
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view/my_destination_payment_title.xml
View file @ 542644d2
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Bank Account Name</string> </value> <value> <string>Destination Bank Account Name</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationModule_viewAccountingCancellationList/listbox.xml
View file @ 542644d2
...@@ -309,7 +309,28 @@ ...@@ -309,7 +309,28 @@
<item> <item>
<key> <string>all_columns</string> </key> <key> <string>all_columns</string> </key>
<value> <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> </value>
</item> </item>
<item> <item>
...@@ -334,18 +355,10 @@ ...@@ -334,18 +355,10 @@
<string>start_date</string> <string>start_date</string>
<string>Date</string> <string>Date</string>
</tuple> </tuple>
<tuple>
<string>source_payment_title</string>
<string>Account</string>
</tuple>
<tuple> <tuple>
<string>source_total_asset_price</string> <string>source_total_asset_price</string>
<string>Amount</string> <string>Amount</string>
</tuple> </tuple>
<tuple>
<string>Delivery Mode</string>
<string>Delivery Mode</string>
</tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/listbox.xml
View file @ 542644d2
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
<string>ID</string> <string>ID</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_payment_reference</string> <string>getSourcePaymentInternalBankAccountNumber</string>
<string>Source Account</string> <string>Source Account</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<string>Credit</string> <string>Credit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_payment_reference</string> <string>getDestinationPaymentInternalBankAccountNumber</string>
<string>Destination Account</string> <string>Destination Account</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellation_view/my_destination_total_asset_price.xml
View file @ 542644d2
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml
View file @ 542644d2
...@@ -75,9 +75,13 @@ if reference is None:\n ...@@ -75,9 +75,13 @@ if reference is None:\n
message = Message(domain="ui", message="Please give a reference")\n message = Message(domain="ui", message="Please give a reference")\n
raise ValueError, message\n raise ValueError, message\n
\n \n
context.log(\'reference\',reference)\n
account_list = catalog(string_index=reference, portal_type=portal_type, validation_state=\'valid\')\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 if len(account_list) == 0:\n
account_list = catalog(string_index="%%%s%%" % reference, portal_type=portal_type, validation_state=\'valid\')\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 if len(account_list) == 0:\n
message = Message(domain="ui", message="No bank account have this reference")\n message = Message(domain="ui", message="No bank account have this reference")\n
raise ValueError, message\n raise ValueError, message\n
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml
View file @ 542644d2
...@@ -161,11 +161,20 @@ if transaction_list:\n ...@@ -161,11 +161,20 @@ if transaction_list:\n
tmp_dict[\'document_reference\'] = document_reference\n tmp_dict[\'document_reference\'] = document_reference\n
total_price = inventory.total_quantity\n total_price = inventory.total_quantity\n
tmp_dict[\'total_price\'] = total_price\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[\'debit\'] = None\n
tmp_dict[\'credit\'] = None\n tmp_dict[\'credit\'] = None\n
if total_price is not None and total_price >= 0:\n if total_price is not None:\n
if not cancellation_amount:\n
if total_price >= 0:\n
tmp_dict[\'debit\'] = total_price\n tmp_dict[\'debit\'] = total_price\n
elif total_price is not None and total_price < 0:\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 tmp_dict[\'credit\'] = - total_price\n
\n \n
description = delivery.getDescription()\n description = delivery.getDescription()\n
...@@ -289,6 +298,7 @@ return inv_account_dict.values()\n ...@@ -289,6 +298,7 @@ return inv_account_dict.values()\n
<string>delivery</string> <string>delivery</string>
<string>document_reference</string> <string>document_reference</string>
<string>total_price</string> <string>total_price</string>
<string>cancellation_amount</string>
<string>description</string> <string>description</string>
<string>_inplacevar_</string> <string>_inplacevar_</string>
<string>sort_date</string> <string>sort_date</string>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view.xml
View file @ 542644d2
...@@ -95,7 +95,9 @@ ...@@ -95,7 +95,9 @@
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list>
<string>listbox_stop_date</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml
View file @ 542644d2
...@@ -352,6 +352,10 @@ ...@@ -352,6 +352,10 @@
<string>stop_date</string> <string>stop_date</string>
<string>Operation Date</string> <string>Operation Date</string>
</tuple> </tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -394,7 +398,12 @@ ...@@ -394,7 +398,12 @@
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string>stop_date</string>
<string>stop_date</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination.xml
View file @ 542644d2
...@@ -273,18 +273,15 @@ ...@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_start_date.xml
View file @ 542644d2
...@@ -288,6 +288,14 @@ ...@@ -288,6 +288,14 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </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> <item>
<key> <string>input_order</string> </key> <key> <string>input_order</string> </key>
<value> <string>dmy</string> </value> <value> <string>dmy</string> </value>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
View file @ 542644d2
...@@ -65,10 +65,10 @@ ...@@ -65,10 +65,10 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if site is not None:\n <value> <string>if site is None:\n
site_uid = site.getUid()\n site = context.getSiteValue()\n
else:\n site_uid = site.getUid()\n
site_uid = context.getSiteUid()\n site_url = site.getRelativeUrl()\n
operation_list = []\n operation_list = []\n
exception_portal_type_list = [\'Paper Money Deposit\']\n exception_portal_type_list = [\'Paper Money Deposit\']\n
if site_uid is not None:\n if site_uid is not None:\n
...@@ -85,14 +85,21 @@ if site_uid is not None:\n ...@@ -85,14 +85,21 @@ 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 # Mutilated Banknotes in planned state or in finished state with siege as source must nogt block either.\n
portal_type = document.getPortalType()\n portal_type = document.getPortalType()\n
simulation_state = document.getSimulationState()\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 or (portal_type == \'Mutilated Banknote\' and \n
(simulation_state == \'planned\' or \n (simulation_state == \'planned\' or \n
(simulation_state == \'finished\' and \'siege\' in here.getSource(\'\'))\n (simulation_state == \'finished\' and \'siege\' in here.getSource(\'\'))\n
)\n )\n
)\n ) \\\n
or (portal_type == \'Monetary Destruction\' and simulation_state == \'ordered\')\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 ):\n
continue\n
append(document)\n append(document)\n
\n \n
def operation_sort(a,b):\n def operation_sort(a,b):\n
...@@ -162,8 +169,9 @@ return operation_list\n ...@@ -162,8 +169,9 @@ return operation_list\n
<string>kw</string> <string>kw</string>
<string>None</string> <string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>site_uid</string>
<string>context</string> <string>context</string>
<string>site_uid</string>
<string>site_url</string>
<string>operation_list</string> <string>operation_list</string>
<string>exception_portal_type_list</string> <string>exception_portal_type_list</string>
<string>not_closed_state_list</string> <string>not_closed_state_list</string>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml
View file @ 542644d2
...@@ -254,7 +254,9 @@ elif import_type == \'create_subvaults\' :\n ...@@ -254,7 +254,9 @@ elif import_type == \'create_subvaults\' :\n
subvault_dict[vault].append([counter_subvault, subvault_code])\n subvault_dict[vault].append([counter_subvault, subvault_code])\n
if subvault == \'Encaisse des Billets et Monnaies\' :\n if subvault == \'Encaisse des Billets et Monnaies\' :\n
if counter_name in two_way_counter_list:\n if counter_name in two_way_counter_list:\n
if counter_name != \'gros_paiement\':\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "entrante"), None])\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 subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "sortante"), None])\n
elif subvault == \'Encaisse des Externes\' :\n elif subvault == \'Encaisse des Externes\' :\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "transit"), \'TRA\'])\n subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "transit"), \'TRA\'])\n
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.xml
View file @ 542644d2
...@@ -76,7 +76,7 @@ transaction = state_change[\'object\']\n ...@@ -76,7 +76,7 @@ transaction = state_change[\'object\']\n
\n \n
site = transaction.getSite()\n site = transaction.getSite()\n
date = transaction.getStartDate()\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 transaction.Baobab_checkAccountingDateOpen(site=site, date=date)\n
\n \n
# Check some properties of document\n # Check some properties of document\n
...@@ -93,31 +93,6 @@ if transaction.getResource() is None:\n ...@@ -93,31 +93,6 @@ if transaction.getResource() is None:\n
\n \n
# Check the source bank account.\n # Check the source bank account.\n
source_bank_account = transaction.getSourcePaymentValue()\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 \n
# test we have account transfer line defined\n # test we have account transfer line defined\n
nb_transfer_line = len(transaction.objectValues(portal_type=\'Accounting Cancellation Line\'))\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\ ...@@ -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 msg = Message(domain=\'ui\', message="No account defined on line.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
# check we don\'t have both account and accounting code defined\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 and line.getDestinationSection() is not None:\n
msg = Message(domain=\'ui\', message="You can\'t defined account and accounting code on line.")\n msg = Message(domain=\'ui\', message="You can\'t defined account and accounting code on line.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
# check that at least destination_payment or destination_section is defined\n # check that at least destination_payment or destination_section is defined\n
if line.getDestinationPayment() is None and \\\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 msg = Message(domain=\'ui\', message="Destination account is not defined.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
# Index the banking operation line so it impacts account position\n # Index the banking operation line so it impacts account position\n
...@@ -222,14 +197,13 @@ if total_line_price != transaction.getSourceTotalAssetPrice():\n ...@@ -222,14 +197,13 @@ if total_line_price != transaction.getSourceTotalAssetPrice():\n
<string>None</string> <string>None</string>
<string>msg</string> <string>msg</string>
<string>source_bank_account</string> <string>source_bank_account</string>
<string>context</string>
<string>error</string>
<string>len</string> <string>len</string>
<string>nb_transfer_line</string> <string>nb_transfer_line</string>
<string>total_line_price</string> <string>total_line_price</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>_inplacevar_</string> <string>_inplacevar_</string>
<string>context</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/confirmed.xml
View file @ 542644d2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Sent To Interface</string> </value> <value> <string>Sent To Second Validation Level</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/states/ordered.xml
View file @ 542644d2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <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>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/transitions/deliver_action.xml
View file @ 542644d2
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Pay</string> </value> <value> <string>Validate</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/confirmed.xml
View file @ 542644d2
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <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>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <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> ]]></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Validated By Interface</string> </value> <value> <string>Sent To Second Validation Level</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -93,7 +93,7 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Account Transfer&reset= ...@@ -93,7 +93,7 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Account Transfer&reset=
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<tuple> <tuple>
<string>Account Transfer</string> <string>Accounting Cancellation</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/draft.xml
View file @ 542644d2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <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> ]]></string> </value>
</item> </item>
...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1 ...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -81,24 +78,21 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1 ...@@ -81,24 +78,21 @@ Base_viewWorklist?simulation_state=draft&portal_type=Account Transfer&reset=1
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<tuple> <tuple>
<string>Account Transfer</string> <string>Accounting Cancellation</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/ordered.xml
View file @ 542644d2
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <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>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <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> ]]></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <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>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -68,8 +68,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1 ...@@ -68,8 +68,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1
<value> <value>
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>DestinationAssignor</string> <string>Assignee</string>
<string>DestinationAssignee</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -93,7 +92,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1 ...@@ -93,7 +92,7 @@ Base_viewWorklist?simulation_state=ordered&portal_type=Account Transfer&reset=1
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<tuple> <tuple>
<string>Account Transfer</string> <string>Accounting Cancellation</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml
View file @ 542644d2
...@@ -36,7 +36,10 @@ ...@@ -36,7 +36,10 @@
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple/> <tuple>
<string>undeliver</string>
<string>undeliver_action</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver.xml 0 → 100644
View file @ 542644d2
<?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>
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/planned.xml → bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/undeliver_action.xml
View file @ 542644d2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/> <tuple/>
</tuple> </tuple>
</pickle> </pickle>
...@@ -17,23 +17,23 @@ ...@@ -17,23 +17,23 @@
</item> </item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>actbox_category</string> </key>
<value> <string>global</string> </value> <value> <string>workflow</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Sent To First Validation Level (%(count)s)</string> </value> <value> <string>Go back to Issued</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=undeliver_action</string> </value>
</item>
Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1 <item>
<key> <string>after_script_name</string> </key>
]]></string> </value> <value> <string>undeliver</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Sent To First Validation Level</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -43,13 +43,23 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1 ...@@ -43,13 +43,23 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>planned</string> </value> <value> <string>undeliver_action</string> </value>
</item> </item>
<item> <item>
<key> <string>var_matches</string> </key> <key> <string>new_state_id</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </item>
</value> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -57,11 +67,8 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1 ...@@ -57,11 +67,8 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -71,48 +78,9 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1 ...@@ -71,48 +78,9 @@ Base_viewWorklist?simulation_state=planned&portal_type=Account Transfer&reset=1
<value> <value>
<tuple> <tuple>
<string>Manager</string> <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> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>planned</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/worklists/started.xml → bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/confirmed.xml
View file @ 542644d2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> <global name="StateDefinition" module="Products.DCWorkflow.States"/>
<tuple/> <tuple/>
</tuple> </tuple>
</pickle> </pickle>
...@@ -16,66 +16,41 @@ ...@@ -16,66 +16,41 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>actbox_category</string> </key> <key> <string>description</string> </key>
<value> <string>global</string> </value> <value> <string></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>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>id</string> </key>
<value> <string>Waiting for correction</string> </value> <value> <string>confirmed</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>permission_roles</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>title</string> </key>
<value> <string>started</string> </value> <value> <string>Issued (Checkbook)</string> </value>
</item> </item>
<item> <item>
<key> <string>var_matches</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple> <tuple>
<global name="Guard" module="Products.DCWorkflow.Guard"/> <string>unconfirm</string>
<tuple/>
</tuple> </tuple>
</pickle> </value>
<pickle> </item>
<dictionary>
<item> <item>
<key> <string>roles</string> </key> <key> <string>type_list</string> </key>
<value> <value>
<tuple> <tuple/>
<string>Manager</string>
<string>DestinationAssignor</string>
</tuple>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
...@@ -89,18 +64,34 @@ Base_viewWorklist?simulation_state=started&portal_type=Account Transfer&reset=1 ...@@ -89,18 +64,34 @@ Base_viewWorklist?simulation_state=started&portal_type=Account Transfer&reset=1
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Account Transfer</string> <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>simulation_state</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>started</string> <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>View</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml
View file @ 542644d2
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>confirm</string>
<string>delete</string> <string>delete</string>
<string>delete_action</string> <string>delete_action</string>
</tuple> </tuple>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/confirm.xml 0 → 100644
View file @ 542644d2
<?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>
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/transitions/unconfirm.xml 0 → 100644
View file @ 542644d2
<?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>
bt5/erp5_banking_core/bt/revision
View file @ 542644d2
355 357
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7