[OFBiz] SVN: r6615 - trunk/applications/order/src/org/ofbiz/order/order

[jaz@svn.ofbiz.org]

Author: jaz
Date: 2006-01-30 23:14:42 -0600 (Mon, 30 Jan 2006)
New Revision: 6615

Modified:
   trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Log:
updated to not reserve items which are cancelled or rejected


Modified: trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
===================================================================
--- trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java	2006-01-30 20:19:11 UTC (rev 6614)
+++ trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java	2006-01-31 05:14:42 UTC (rev 6615)
@@ -965,7 +965,11 @@
                     GenericValue orderItemShipGroupAssoc = (GenericValue) osiInfos.next();
                     if ("OrderItemShipGroupAssoc".equals(orderItemShipGroupAssoc.getEntityName())) {
                         GenericValue orderItem = (GenericValue) itemValuesBySeqId.get(orderItemShipGroupAssoc.get("orderItemSeqId"));
-
+                        String itemStatus = orderItem.getString("statusId");
+                        if ("ITEM_REJECTED".equals(itemStatus) || "ITEM_CANCELLED".equals(itemStatus) || "ITEM_COMPLETED".equals(itemStatus)) {
+                            Debug.logInfo("Order item [" + orderItem.getString("orderId") + " / " + orderItem.getString("orderItemSeqId") + "] is not in a proper status for reservation", module);
+                            continue;
+                        }
                         if (UtilValidate.isNotEmpty(orderItem.getString("productId")) && !"RENTAL_ORDER_ITEM".equals(orderItem.getString("orderItemTypeId")))
                         { // ignore for rental
                             // only reserve product items; ignore non-product items