Author: jleroux Date: Mon May 5 17:54:29 2014 New Revision: 1592589 URL: http://svn.apache.org/r1592589 Log: "Applied fix from trunk for revision: 1592588 " ------------------------------------------------------------------------ r1592588 | jleroux | 2014-05-05 19:53:53 +0200 (lun. 05 mai 2014) | 2 lignes
I stumbled upon this today and I agree with Deepak: http://markmail.org/message/2bsurgd52crssldk So backporting also to R13.07 (only) ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/product/config/catalog.properties ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/branches/release13.07/specialpurpose/ecommerce/config/ecommerce.properties Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1592588 Modified: ofbiz/branches/release13.07/applications/product/config/catalog.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/config/catalog.properties?rev=1592589&r1=1592588&r2=1592589&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/config/catalog.properties (original) +++ ofbiz/branches/release13.07/applications/product/config/catalog.properties Mon May 5 17:54:29 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/branches/release13.07/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=1592589&r1=1592588&r2=1592589&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/price/PriceServices.java Mon May 5 17:54:29 2014 @@ -524,7 +524,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/branches/release13.07/specialpurpose/ecommerce/config/ecommerce.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/config/ecommerce.properties?rev=1592589&r1=1592588&r2=1592589&view=diff ============================================================================== --- ofbiz/branches/release13.07/specialpurpose/ecommerce/config/ecommerce.properties (original) +++ ofbiz/branches/release13.07/specialpurpose/ecommerce/config/ecommerce.properties Mon May 5 17:54:29 2014 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. ############################################################################### -convertProductPriceCurrency=true + ############################################ # Janrain Engage
