From 2b62f81d106d1e7fa0e73a95246ae3e1270a4dca Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Wed, 26 May 2010 10:00:53 +0000 Subject: [PATCH] 2010-05-26 yo * Now the Resource_getPriceCalculationOperandDict must include base_unit_price, as the script is shared with getPrice and getBaseUnitPrice. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35634 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_pdm/Resource_getPriceCalculationOperandDict.xml | 3 ++- bt5/erp5_pdm/bt/change_log | 3 +++ bt5/erp5_pdm/bt/revision | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml index 4e1c9d6fa1..e298449dc5 100644 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml +++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml @@ -111,7 +111,7 @@ if base_price not in (None, \'\'):\n \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 @@ return default\n <string>min</string> <string>sum_surcharge_ratio</string> <string>priced_quantity</string> + <string>dict</string> </tuple> </value> </item> diff --git a/bt5/erp5_pdm/bt/change_log b/bt5/erp5_pdm/bt/change_log index c2da28e34c..b929e1fd39 100644 --- a/bt5/erp5_pdm/bt/change_log +++ b/bt5/erp5_pdm/bt/change_log @@ -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. diff --git a/bt5/erp5_pdm/bt/revision b/bt5/erp5_pdm/bt/revision index f35d9602e1..9889789bab 100644 --- a/bt5/erp5_pdm/bt/revision +++ b/bt5/erp5_pdm/bt/revision @@ -1 +1 @@ -498 \ No newline at end of file +499 \ No newline at end of file -- 2.30.9