[Erp5-report] r39054 gregory - /erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: gregory
Date: Tue Oct 12 14:24:47 2010
New Revision: 39054

URL: http://svn.erp5.org?rev=39054&view=rev
Log:
Fix r38977.

Call the right Currency(Sale|Purchase)_getQuantity script.

Modified:
    erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.xml

Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.xml?rev=39054&r1=39053&r2=39054&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.xml [utf8] Tue Oct 12 14:24:47 2010
@@ -82,9 +82,16 @@ context.Baobab_checkCounterOpened(counte
 if is_currency_sale:\n
   foreign_currency_portal_type = outgoing_portal_type\n
   default_currency_portal_type = incoming_portal_type\n
+  total_quantity = context.CurrencySale_getQuantity()\n
 else:\n
   foreign_currency_portal_type = incoming_portal_type\n
   default_currency_portal_type = outgoing_portal_type\n
+  total_quantity = context.CurrencyPurchase_getQuantity()\n
+\n
+# check if an exchange rate is defined\n
+if total_quantity is None:\n
+  raise ValidationFailed, (Message(domain=\'ui\',\n
+    message="No exchange rate defined for this currency at document date."))\n
 \n
 # check resource on currency fastinput\n
 doc_resource = context.getResource()\n
@@ -93,11 +100,6 @@ for line in context.contentValues(portal
     raise ValidationFailed, (Message(domain="ui",\n
       message="Resource defined on document is different from currency cash."), )\n
 \n
-# check if an exchange rate is defined\n
-if context.CurrencyPurchase_getQuantity() is None:\n
-  raise ValidationFailed, (Message(domain=\'ui\',\n
-    message="No exchange rate defined for this currency at document date."))\n
-\n
 # check outgoing amount\n
 if is_currency_sale:\n
   amount = context.getSourceTotalAssetPrice()\n
@@ -193,10 +195,11 @@ elif resource_one == 1:\n
                             <string>counter_site</string>
                             <string>foreign_currency_portal_type</string>
                             <string>default_currency_portal_type</string>
+                            <string>total_quantity</string>
+                            <string>None</string>
                             <string>doc_resource</string>
                             <string>_getiter_</string>
                             <string>line</string>
-                            <string>None</string>
                             <string>amount</string>
                             <string>msg</string>
                             <string>default_msg</string>