Author: jleroux
Date: Wed Sep 23 20:10:01 2015
New Revision: 1704929
URL:
http://svn.apache.org/viewvc?rev=1704929&view=revLog:
Reverts r1639922, reported by Oleg Andreyev at OFBIZ-6652
Modified:
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1704929&r1=1704928&r2=1704929&view=diff==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Wed Sep 23 20:10:01 2015
@@ -24,7 +24,6 @@
import org.ofbiz.base.util.*;
import org.ofbiz.entity.*;
-import org.ofbiz.entity.condition.*;
import org.ofbiz.entity.util.*;
import org.ofbiz.service.*;
import org.ofbiz.product.product.ProductContentWrapper;
@@ -52,14 +51,6 @@ if (cart.isSalesOrder()) {
context.productStoreId = productStoreId;
facilityId = productStore.inventoryFacilityId;
}
-
-if (!facilityId) {
- productStoreFacility = EntityQuery.use(delegator).select("facilityId").from("ProductStoreFacility").where(UtilMisc.toList(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId))).queryFirst();
- if (productStoreFacility) {
- facilityId = productStoreFacility.facilityId;
- }
-}
-
autoUserLogin = session.getAttribute("autoUserLogin");
userLogin = session.getAttribute("userLogin");