[OFBiz] SVN: r7229 - trunk/applications/order/webapp/ordermgr/order

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-04-07 08:33:49 -0500 (Fri, 07 Apr 2006)
New Revision: 7229

Modified:
   trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
Log:
Made sure that order items which are completed do not show up with postive quantity outstanding

Modified: trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/orderitems.ftl	2006-04-07 13:24:36 UTC (rev 7228)
+++ trunk/applications/order/webapp/ordermgr/order/orderitems.ftl	2006-04-07 13:33:49 UTC (rev 7229)
@@ -164,9 +164,12 @@
                           <div class="tabletext">${uiLabelMap.OrderShortfalled}:&nbsp;${shortfalledQuantity}&nbsp;&nbsp;</div>
                         </td>
                         <td>
-                          <div class="tabletext">${uiLabelMap.OrderShipRequest}:&nbsp;${orderReadHelper.getItemReservedQuantity(orderItem)}&nbsp;&nbsp;</div>
+                          <div class="tabletext">${uiLabelMap.OrderShipRequest}
+                          :&nbsp;${orderReadHelper.getItemReservedQuantity(orderItem)}&nbsp;&nbsp;</div>
                           <div class="tabletext">${uiLabelMap.OrderQtyShipped}:&nbsp;${shippedQuantity}&nbsp;&nbsp;</div>
-                          <div class="tabletext">${uiLabelMap.OrderOutstanding}:&nbsp;${orderItem.quantity?default(0) - shippedQuantity}&nbsp;&nbsp;</div>
+                          <div class="tabletext">${uiLabelMap.OrderOutstanding}:&nbsp;
+                          <#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity.  -->
+                          <#if (orderItem.statusId != null) && (orderItem.statusId == "ITEM_COMPLETED")>0<#else>${orderItem.quantity?default(0) - shippedQuantity}</#if>&nbsp;&nbsp;</div>
                           <div class="tabletext">${uiLabelMap.OrderInvoiced}:&nbsp;${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)}&nbsp;&nbsp;</div>
                           <div class="tabletext">${uiLabelMap.OrderReturned}:&nbsp;${returnQuantityMap.get(orderItem.orderItemSeqId)?default(0)}&nbsp;&nbsp;</div>
                         </td>