Author: jleroux
Date: Mon May 5 17:53:53 2014
New Revision: 1592588
URL: http://svn.apache.org/r1592588
Log:
I stumbled upon this today and I agree with Deepak:
http://markmail.org/message/2bsurgd52crssldk
So backporting also to R13.07 (only)
Modified:
ofbiz/trunk/applications/product/config/catalog.properties
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/trunk/specialpurpose/ecommerce/config/ecommerce.properties
Modified: ofbiz/trunk/applications/product/config/catalog.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/catalog.properties?rev=1592588&r1=1592587&r2=1592588&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/catalog.properties (original)
+++ ofbiz/trunk/applications/product/config/catalog.properties Mon May 5
17:53:53 2014
@@ -41,3 +41,6 @@ image.management.url=/images/products/ma
image.management.nameofthumbnail=-100
image.management.autoApproveImage=Y
image.management.multipleApproval=N
+
+# Automatic product price currency conversion
+convertProductPriceCurrency=true
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=1592588&r1=1592587&r2=1592588&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
Mon May 5 17:53:53 2014
@@ -522,7 +522,7 @@ public class PriceServices {
}
// Convert the value to the price currency, if required
-
if("true".equals(UtilProperties.getPropertyValue("ecommerce.properties",
"convertProductPriceCurrency"))){
+ if("true".equals(UtilProperties.getPropertyValue("catalog.properties",
"convertProductPriceCurrency"))){
if (UtilValidate.isNotEmpty(currencyDefaultUomId) &&
UtilValidate.isNotEmpty(currencyUomIdTo) &&
!currencyDefaultUomId.equals(currencyUomIdTo)) {
if(UtilValidate.isNotEmpty(result)){
Map<String, Object> convertPriceMap =
FastMap.newInstance();
Modified: ofbiz/trunk/specialpurpose/ecommerce/config/ecommerce.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/ecommerce.properties?rev=1592588&r1=1592587&r2=1592588&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/ecommerce.properties (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/ecommerce.properties Mon May 5
17:53:53 2014
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
###############################################################################
-convertProductPriceCurrency=true
+
############################################
# Janrain Engage
