svn commit: r1560048 - /ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

[adrianc]

Author: adrianc
Date: Tue Jan 21 15:57:30 2014
New Revision: 1560048

URL: http://svn.apache.org/r1560048
Log:
Order view NPE bug fix. Don't assume a product store has a related facility.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1560048&r1=1560047&r2=1560048&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Tue Jan 21 15:57:30 2014
@@ -273,10 +273,12 @@ if (orderHeader) {
     context.productStore = productStore;
     if (productStore) {
         facility = productStore.getRelatedOne("Facility", false);
-        inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]);
-        context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap;
-        context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap;
-        context.facility = facility;
+        if (facility) {
+            inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]);
+            context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap;
+            context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap;
+            context.facility = facility;
+        }
     }
 
     // Get a list of facilities for purchase orders to receive against.