svn commit: r519145 - /ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh

[si...@apache.org]

Author: sichen
Date: Fri Mar 16 14:04:09 2007
New Revision: 519145

URL: http://svn.apache.org/viewvc?view=rev&rev=519145
Log:
Update ship group PDF to handle cancelled ship group associations.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh?view=diff&rev=519145&r1=519144&r2=519145
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/shipGroups.bsh Fri Mar 16 14:04:09 2007
@@ -70,6 +70,7 @@
     // the lines in a page, each line being a row of data to display
     lines = FastList.newInstance();
 
+    // process the order item to ship group associations, each being a line item for the group
     orderItemAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", UtilMisc.toList("orderItemSeqId"));
     for (oiter = orderItemAssocs.iterator(); oiter.hasNext(); ) {
         orderItemAssoc = oiter.next();
@@ -77,19 +78,24 @@
         product = orderItem.getRelatedOne("Product");
         line = FastMap.newInstance();
 
-        line.put("quantityInGroup", orderItemAssoc.get("quantity"));
+        quantity = orderItemAssoc.get("quantity").doubleValue();
+        if (orderItemAssoc.get("cancelQuantity") != null) {
+            quantity -= orderItemAssoc.get("cancelQuantity").doubleValue();
+        }
+
+        line.put("quantityInGroup", quantity);
         line.put("orderItem", orderItem);
         line.put("product", product);
 
         if ("MARKETING_PKG_AUTO".equals(product.get("productTypeId"))) {
-            sublines = expandProductGroup(product, orderItemAssoc.get("quantity").doubleValue());
+            sublines = expandProductGroup(product, quantity);
             line.put("expandedList", sublines);
             for (siter = sublines.iterator(); siter.hasNext(); ) {
                 subline = siter.next();
                 groupQuantity += subline.get("quantityInGroup").doubleValue();
             }
         } else {
-            groupQuantity += orderItemAssoc.get("quantity").doubleValue();
+            groupQuantity += quantity;
         }
 
         lines.add(line);