Author: deepak
Date: Tue Jun 6 06:14:37 2017
New Revision: 1797734
URL: http://svn.apache.org/viewvc?rev=1797734&view=rev
Log:
Applied fix from trunk for revision: 1797733
===
Fixed: CostServices.xml#getProductCost fail currency conversion.(OFBIZ-9387)
Thanks Wai for your contribution.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/product/minilang/product/cost/CostServices.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 6 06:14:37 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/product/minilang/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/cost/CostServices.xml?rev=1797734&r1=1797733&r2=1797734&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/minilang/product/cost/CostServices.xml (original)
+++ ofbiz/branches/release16.11/applications/product/minilang/product/cost/CostServices.xml Tue Jun 6 06:14:37 2017
@@ -109,7 +109,6 @@ under the License.
<if-compare field="productCost" operator="equals" value="0" type="BigDecimal">
<clear-field field="costsAndMap"/>
<set from-field="parameters.productId" field="costsAndMap.productId"/>
- <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
<find-by-and entity-name="SupplierProduct" map="costsAndMap" list="priceCosts" order-by-list="orderByList"/>
<filter-list-by-date list="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
<first-from-list list="priceCosts" entry="priceCost"/>
@@ -119,7 +118,7 @@ under the License.
<set from-field="priceCost.lastPrice" field="inputMap.originalValue"/>
<set from-field="priceCost.currencyUomId" field="inputMap.uomId"/>
<set from-field="parameters.currencyUomId" field="inputMap.uomIdTo"/>
-
+
<call-service service-name="convertUom" in-map-name="inputMap" require-new-transaction="true" break-on-error="false">
<result-to-field result-name="convertedValue" field="productCost"/>
</call-service>