svn commit: r463339 - /incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl

[sichen]

Author: sichen
Date: Thu Oct 12 10:36:31 2006
New Revision: 463339

URL: http://svn.apache.org/viewvc?view=rev&rev=463339
Log:
Pack order will not check items which have no quantity to pack and changed a UI label

Modified:
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?view=diff&rev=463339&r1=463338&r2=463339
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Thu Oct 12 10:36:31 2006
@@ -206,14 +206,15 @@
             </tr>
 
             <#list itemInfos as orderItem>
+              <#assign shippedQuantity = orderReadHelper.getItemShippedQuantityBd(orderItem)?if_exists>
               <#if orderItem.cancelQuantity?exists>
                 <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity>
               <#else>
                 <#assign orderItemQuantity = orderItem.quantity>
               </#if>
-              <#assign shippedQuantity = orderReadHelper.getItemShippedQuantityBd(orderItem)?if_exists>
+              <#assign inputQty = (orderItemQuantity - shippedQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId))>
               <tr>
-                <td><input type="checkbox" name="sel_${orderItem.orderItemSeqId}" value="Y" checked=""/></td>
+                <td><input type="checkbox" name="sel_${orderItem.orderItemSeqId}" value="Y" <#if (inputQty >0)>checked=""</#if>/></td>
                 <td><div class="tabletext">${orderItem.orderItemSeqId}</td>
                 <td><div class="tabletext">${orderItem.productId?default("N/A")}</td>
                 <td><div class="tabletext">${orderItem.itemDescription?if_exists}</td>
@@ -222,7 +223,6 @@
                 <td align="right"><div class="tabletext">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId)}</td>
                 <td>&nbsp;&nbsp;</td>
                 <td align="center">
-                  <#assign inputQty = (orderItemQuantity - shippedQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId))>
                   <input type="text" class="inputBox" size="7" name="qty_${orderItem.orderItemSeqId}" value="${inputQty}">
                 </td>
                 <td align="center">