svn commit: r667894 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

[lektran]

Author: lektran
Date: Sat Jun 14 15:24:23 2008
New Revision: 667894

URL: http://svn.apache.org/viewvc?rev=667894&view=rev
Log:
Small change so that shipped quantities don't show up as remaining quantities in the order view

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=667894&r1=667893&r2=667894&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Jun 14 15:24:23 2008
@@ -158,8 +158,8 @@
                   <td align="right" valign="top" nowrap="nowrap">
                     <table>
                       <tr valign="top">
-                        <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
                         <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)>
+                        <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0) - shippedQuantity)>
                         <#-- to compute shortfall amount, sum up the orderItemShipGrpInvRes.quantityNotAvailable -->
                         <#assign shortfalledQuantity = 0/>
                         <#list orderItemShipGrpInvResList as orderItemShipGrpInvRes>