diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml index d5b1c2db7293253d80b22114277ed20d5f42f755..97ec78c2dda4875dc680f93e0162fb09a83e125b 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml @@ -72,6 +72,11 @@ from Products.ERP5Type.Message import Message\n \n transaction = state_change[\'object\']\n \n +site = transaction.getSite()\n +date = transaction.getStartDate()\n +transaction.Baobab_checkCounterDateOpen(site=site, date=date)\n +transaction.Baobab_checkAccountingDateOpen(site=site, date=date)\n +\n # Check the amount.\n price = transaction.getSourceTotalAssetPrice()\n if price is None or price <= 0:\n @@ -111,7 +116,7 @@ for check_operation_line in transaction.contentValues(filter = {\'portal_type\' raise ValidationFailed, (msg,)\n \n # Test if the account balance is sufficient.\n - error = context.BankAccount_checkBalance(source_bank_account.getRelativeUrl(), check_operation_line.getTotalQuantity())\n + error = context.BankAccount_checkBalance(source_bank_account.getRelativeUrl(), check_operation_line.getPrice())\n if error[\'error_code\'] == 1:\n msg = Message(domain=\'ui\', message="Source bank account is not sufficient.")\n raise ValidationFailed, (msg,)\n @@ -195,6 +200,8 @@ if transaction.getSimulationState() == "draft":\n <string>_getitem_</string> <string>transaction</string> <string>_getattr_</string> + <string>site</string> + <string>date</string> <string>price</string> <string>None</string> <string>msg</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml index 1a9c603bb7d3ad3620d429e5239ef124ec675760..169cffcff40f90f14dca839f4267da2ee9cfc469 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml @@ -69,6 +69,8 @@ \n # Check getBaobabSource and getBaobabDestination\n transaction.Base_checkBaobabSourceAndDestination()\n +\n +context.validateConsistency(state_change)\n </string> </value> </item> <item> @@ -122,6 +124,7 @@ transaction.Base_checkBaobabSourceAndDestination()\n <string>_getitem_</string> <string>transaction</string> <string>_getattr_</string> + <string>context</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml index de2e5a6c7019635fa6db0f2c2244554d8bf6d3ec..ea106609baa39b38c9c07bdf9e1584739c1e2c90 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml @@ -57,7 +57,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string>validateSourceAndDestination</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml index 11c87f129ffe11279443ec3a1e4ca97cb95ef526..ff78493266c847352f01ddcf71683a6a7fa5bec8 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml @@ -57,7 +57,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string>validateConsistency</string> </value> + <value> <string>validateSourceAndDestination</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index c2567dc4fbfc3d2b290f9f5c083008b55b2256dc..4e66132b50032ef4b80cd41c36efeb2353360c8c 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -280 \ No newline at end of file +282 \ No newline at end of file