[Erp5-report] r35665 yo - in /erp5/trunk/bt5/erp5_pdm: SkinTemplateItem/portal_skins/erp5_p...

[nobody at svn.erp5.org]

Author: yo
Date: Thu May 27 08:58:00 2010
New Revision: 35665

URL: http://svn.erp5.org?rev=35665&view=rev
Log:
2010-05-27 yo
* Resource_getPriceCalculationOperandDict must return base_unit_price even if price is not found. So the meaning of the default parameter has changed slightly - now it represents the default value of price instead of the default value of the returned result. This way is more backward compatible.

Modified:
    erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml
    erp5/trunk/bt5/erp5_pdm/bt/change_log
    erp5/trunk/bt5/erp5_pdm/bt/revision

Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml?rev=35665&r1=35664&r2=35665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml [utf8] Thu May 27 08:58:00 2010
@@ -110,9 +110,9 @@
     unit_base_price /= priced_quantity\n
 \n
 # Return result\n
-if unit_base_price is not None:\n
-  return dict(price=unit_base_price, base_unit_price=price_parameter_dict.get(\'base_unit_price\'))\n
-return default\n
+if unit_base_price is None:\n
+  unit_base_price = default\n
+return dict(price=unit_base_price, base_unit_price=price_parameter_dict.get(\'base_unit_price\'))\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_pdm/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/change_log?rev=35665&r1=35664&r2=35665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/change_log [utf8] Thu May 27 08:58:00 2010
@@ -1,3 +1,6 @@
+2010-05-27 yo
+* Resource_getPriceCalculationOperandDict must return base_unit_price even if price is not found. So the meaning of the default parameter has changed slightly - now it represents the default value of price instead of the default value of the returned result. This way is more backward compatible.
+
 2010-05-26 yo
 * Now the Resource_getPriceCalculationOperandDict must include base_unit_price, as the script is shared with getPrice and getBaseUnitPrice.
 

Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=35665&r1=35664&r2=35665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Thu May 27 08:58:00 2010
@@ -1,1 +1,1 @@
-499
+500