[Erp5-report] r19652 - in /erp5/trunk/bt5/erp5_banking_check: WorkflowTemplateItem/portal_w...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Mar 3 16:23:00 CET 2008


Author: vincent
Date: Mon Mar  3 16:22:56 2008
New Revision: 19652

URL: http://svn.erp5.org?rev=19652&view=rev
Log:
Disallow check deposit of the same check more than once in the same deposit document.

Modified:
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml?rev=19652&r1=19651&r2=19652&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml Mon Mar  3 16:22:56 2008
@@ -112,6 +112,7 @@
     \n
 \n
 bank_account_dict = {}\n
+seen_check_dict = {}\n
 \n
 # Check each check operation line.\n
 for check_operation_line in transaction.contentValues(filter = {\'portal_type\' : \'Check Operation Line\'}):\n
@@ -139,6 +140,14 @@
     msg = Message(domain=\'ui\', message=\'Bank account not defined on line $line.\'\n
                   , mapping={"line" : check_operation_line.getId()})\n
     raise ValidationFailed, (msg,)\n
+\n
+  seen_check_dict_key = (source_bank_account, check_type, check_number)\n
+  seen_check = seen_check_dict.get(seen_check_dict_key)\n
+  if seen_check is not None:\n
+    msg = Message(domain=\'ui\', message=\'Check on line $line is already used on line $oldline.\'\n
+                  , mapping={"line" : check_operation_line.getId(), "oldline": seen_check})\n
+    raise ValidationFailed, (msg,)\n
+  seen_check_dict[seen_check_dict_key] = check_operation_line.getId()\n
 \n
   # Test check is valid based on date\n
   transaction.Check_checkIntervalBetweenDate(resource=check_operation_line.getAggregateResourceValue(),\n
@@ -245,14 +254,17 @@
                             <string>destination_bank_account</string>
                             <string>context</string>
                             <string>bank_account_dict</string>
+                            <string>seen_check_dict</string>
                             <string>_getiter_</string>
                             <string>check_operation_line</string>
                             <string>check_number</string>
                             <string>check_type</string>
                             <string>source_bank_account</string>
+                            <string>seen_check_dict_key</string>
+                            <string>seen_check</string>
+                            <string>_write_</string>
                             <string>account_path</string>
                             <string>check_price</string>
-                            <string>_write_</string>
                             <string>error</string>
                             <string>check</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=19652&r1=19651&r2=19652&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Mon Mar  3 16:22:56 2008
@@ -1,1 +1,1 @@
-384
+386




More information about the Erp5-report mailing list