Commit 2b62f81d authored by Yoshinori Okuji's avatar Yoshinori Okuji

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
parent 800d619c
...@@ -111,7 +111,7 @@ if base_price not in (None, \'\'):\n ...@@ -111,7 +111,7 @@ if base_price not in (None, \'\'):\n
\n \n
# Return result\n # Return result\n
if unit_base_price is not None:\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 return default\n
</string> </value> </string> </value>
</item> </item>
...@@ -171,6 +171,7 @@ return default\n ...@@ -171,6 +171,7 @@ return default\n
<string>min</string> <string>min</string>
<string>sum_surcharge_ratio</string> <string>sum_surcharge_ratio</string>
<string>priced_quantity</string> <string>priced_quantity</string>
<string>dict</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
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 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. * make precision of base_price in Resource_viewDefaultSaleSupplyLine same as SaleSupplyLine_view's one, and same for Internal Supply Line and Purchase Supply Line.
......
498 499
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment