[Erp5-report] r17704 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Nov 20 14:36:57 2007
New Revision: 17704

URL: http://svn.erp5.org?rev=17704&view=rev
Log:
Return earlier if price is None, to avoid trying to round a None value.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml?rev=17704&r1=17703&r2=17704&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml Tue Nov 20 14:36:57 2007
@@ -72,6 +72,8 @@
 \n
 if commission_ratio is not None and commission_ratio !=0 and commission_price is not None and commission_price !=0:\n
   price = None\n
+if price is None:\n
+  return price\n
 if commission_ratio == 0 or commission_price == 0:\n
   price = round(price,0)\n
 if commission_ratio is None and commission_price is None:\n
@@ -83,9 +85,6 @@
 \n
 if commission_price is not None:\n
   commission_value = commission_price\n
-\n
-if price is None:\n
-  return price\n
 \n
 quantity = price - commission_value\n
 quantity = round(quantity,0)\n

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=17704&r1=17703&r2=17704&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Tue Nov 20 14:36:57 2007
@@ -1,1 +1,1 @@
-379
+380