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

[nobody at svn.erp5.org]

Author: aurel
Date: Mon Jun 25 15:01:27 2007
New Revision: 14949

URL: http://svn.erp5.org?rev=14949&view=rev
Log:
way to check account position was wrong
when delivering, do all check in deliver_action

Modified:
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.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=14949&r1=14948&r2=14949&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 Jun 25 15:01:27 2007
@@ -72,6 +72,11 @@
 \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 @@
     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 @@
                             <string>_getitem_</string>
                             <string>transaction</string>
                             <string>_getattr_</string>
+                            <string>site</string>
+                            <string>date</string>
                             <string>price</string>
                             <string>None</string>
                             <string>msg</string>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml?rev=14949&r1=14948&r2=14949&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml Mon Jun 25 15:01:27 2007
@@ -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 @@
                             <string>_getitem_</string>
                             <string>transaction</string>
                             <string>_getattr_</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml?rev=14949&r1=14948&r2=14949&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver.xml Mon Jun 25 15:01:27 2007
@@ -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>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml?rev=14949&r1=14948&r2=14949&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml Mon Jun 25 15:01:27 2007
@@ -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>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14949&r1=14948&r2=14949&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Mon Jun 25 15:01:27 2007
@@ -1,1 +1,1 @@
-280
+282