[Erp5-report] r34387 herve.poulain - in /erp5/trunk/bt5/erp5_accounting: WorkflowTemplateIt...

[nobody at svn.erp5.org]

Author: herve.poulain
Date: Thu Apr  8 15:29:31 2010
New Revision: 34387

URL: http://svn.erp5.org?rev=34387&view=rev
Log:
Modify the transition to do checking of price currency between bank_account and transaction, it must be the same. (fix bug number: 1242, the corresponding unit test is commited in the revision number 34386)

Modified:
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml?rev=34387&r1=34386&r2=34387&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml [utf8] Thu Apr  8 15:29:31 2010
@@ -98,13 +98,13 @@
            mapping=dict(third_party_name=unicode(\n
                       third_party.getTitle(), \'utf8\')))\n
       \n
-    if bank_account is not None and\\\n
-        bank_account.getValidationState() in invalid_state_list:\n
-      raise ValidationFailed, translateString(\n
-          "Bank Account ${bank_account_reference} is invalid.",\n
-           mapping=dict(bank_account_reference=unicode(\n
-                          bank_account.getReference(), \'utf8\')))\n
-\n
+    if bank_account is not None:\n
+      if bank_account.getValidationState() in invalid_state_list:\n
+        raise ValidationFailed, translateString(\n
+            "Bank Account ${bank_account_reference} is invalid.",\n
+             mapping=dict(bank_account_reference=unicode(\n
+                            bank_account.getReference(), \'utf8\')))\n
+      \n
       if account is not None:\n
         # also check that currencies are consistent if we use this quantity for\n
         # accounting.\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=34387&r1=34386&r2=34387&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Apr  8 15:29:31 2010
@@ -1,1 +1,1 @@
-1155
+1156