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

[nobody at svn.erp5.org]

Author: yo
Date: Wed May 26 12:00:53 2010
New Revision: 35634

URL: http://svn.erp5.org?rev=35634&view=rev
Log:
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/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=35634&r1=35633&r2=35634&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] Wed May 26 12:00:53 2010
@@ -111,7 +111,7 @@
 \n
 # Return result\n
 if unit_base_price is not None:\n
-  return {\'price\': unit_base_price}\n
+  return dict(price=unit_base_price, base_unit_price=price_parameter_dict.get(\'base_unit_price\'))\n
 return default\n
 </string> </value>
         </item>
@@ -171,6 +171,7 @@
                             <string>min</string>
                             <string>sum_surcharge_ratio</string>
                             <string>priced_quantity</string>
+                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_pdm/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/change_log?rev=35634&r1=35633&r2=35634&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/change_log [utf8] Wed May 26 12:00:53 2010
@@ -1,3 +1,6 @@
+2010-05-26 yo
+* Now the Resource_getPriceCalculationOperandDict must include base_unit_price, as the script is shared with getPrice and getBaseUnitPrice.
+
 2010-05-03 kazuhiko
 * make precision of base_price in Resource_viewDefaultSaleSupplyLine same as SaleSupplyLine_view's one, and same for Internal Supply Line and Purchase Supply Line.
 

Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=35634&r1=35633&r2=35634&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Wed May 26 12:00:53 2010
@@ -1,1 +1,1 @@
-498
+499