svn commit: r1650584 - in /ofbiz/branches/release14.12: ./ applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java

Author: jleroux
Date: Fri Jan  9 16:09:02 2015
New Revision: 1650584

URL: http://svn.apache.org/r1650584
Log:
"Applied fix from trunk for revision: 1650583  "
------------------------------------------------------------------------
r1650583 | jleroux | 2015-01-09 17:06:57 +0100 (ven. 09 janv. 2015) | 3 lignes

Reverts r1646926 as I explained in "WebShoppingCart ignores session currency"  in https://issues.apache.org/jira/browse/OFBIZ-5767 and as stated Mridul at "missing request map for changing currency" https://issues.apache.org/jira/browse/OFBIZ-5767

This is only one part of the work (ie it's a WIP) because Jossip has some points in OFBIZ-5767
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  9 16:09:02 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649742,1650240
+/ofbiz/trunk:1649742,1650240,1650583

Modified: ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1650584&r1=1650583&r2=1650584&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Fri Jan  9 16:09:02 2015
@@ -946,7 +946,6 @@ public class ShoppingCartEvents {
             session.setAttribute("shoppingCart", cart);
         }
 
-        if (currencyUom == null) currencyUom = UtilHttp.getCurrencyUom(request);
         if (cart == null) {
             cart = new WebShoppingCart(request, locale, currencyUom);
             session.setAttribute("shoppingCart", cart);