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

[nobody at svn.erp5.org]

Author: seb
Date: Tue May 22 23:32:59 2007
New Revision: 14556

URL: http://svn.erp5.org?rev=14556&view=rev
Log:
finish changes on check payment in order to support the new way of checking references

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

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml?rev=14556&r1=14555&r2=14556&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/updateBankingOperation.xml Tue May 22 23:32:59 2007
@@ -74,17 +74,15 @@
 bank_account = transaction.getDestinationPaymentValue()\n
 check_number = transaction.getAggregateFreeText()\n
 \n
-\n
-check = transaction.Base_checkOrCreateCheck(reference=check_number)\n
-if not check.Check_isValid():\n
-  raise ValidationFailed, Message(domain=\'ui\', message=\'Check is in an invalid state\')\n
+# Already done before in validateConsistency\n
+#check = transaction.Base_checkOrCreateCheck(reference=check_number)\n
+#if not check.Check_isValid():\n
+#  raise ValidationFailed, Message(domain=\'ui\', message=\'Check is in an invalid state\')\n
 \n
 line = transaction.get(\'movement\')\n
 if line is not None and line.getPortalType() == \'Banking Operation Line\':\n
   # This is a single currency operation, so it is not necessary to convert the price.\n
   line.setSourceDebit(transaction.getSourceTotalAssetPrice())\n
-\n
-transaction.edit(aggregate = check.getRelativeUrl())\n
 </string> </value>
         </item>
         <item>
@@ -151,7 +149,6 @@
                             <string>_getattr_</string>
                             <string>bank_account</string>
                             <string>check_number</string>
-                            <string>check</string>
                             <string>line</string>
                             <string>None</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml?rev=14556&r1=14555&r2=14556&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml Tue May 22 23:32:59 2007
@@ -129,8 +129,9 @@
   msg = Message(domain=\'ui\', message="Check type not defined.")\n
   raise ValidationFailed, (msg,)\n
 \n
-transaction.Base_checkCheck(reference=check_number, bank_account=bank_account, \n
+check = transaction.Base_checkCheck(reference=check_number, bank_account=bank_account, \n
                             resource=check_resource)\n
+transaction.edit(aggregate=check.getRelativeUrl())\n
 \n
 context.updateBankingOperation(state_change)\n
 
@@ -213,6 +214,7 @@
                             <string>bank_account</string>
                             <string>check_number</string>
                             <string>check_resource</string>
+                            <string>check</string>
                             <string>context</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14556&r1=14555&r2=14556&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue May 22 23:32:59 2007
@@ -1,1 +1,1 @@
-225
+227