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

[hansbak]

Author: hansbak
Date: Wed Mar 14 23:26:38 2007
New Revision: 518496

URL: http://svn.apache.org/viewvc?view=rev&rev=518496
Log:
show picked quantities only fro sales orders

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?view=diff&rev=518496&r1=518495&r2=518496
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Mar 
14 23:26:38 2007
@@ -58,7 +58,7 @@
             <#list orderItemList as orderItem>
               <#assign orderItemContentWrapper = 
Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem,
 request)>
               <#assign orderItemShipGrpInvResList = 
orderReadHelper.getOrderItemShipGrpInvResList(orderItem)>
-              <#assign pickedQty = 
orderReadHelper.getItemPickedQuantityBd(orderItem)>
+              <#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty 
= orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
               <tr><td colspan="8"><hr class="sepbar"/></td></tr>
               <tr>
                 <#assign orderItemType = 
orderItem.getRelatedOne("OrderItemType")?if_exists>
@@ -172,7 +172,9 @@
                         <td>
                           <div class="tabletext">${uiLabelMap.OrderShipRequest}
                           
:&nbsp;${orderReadHelper.getItemReservedQuantity(orderItem)}&nbsp;&nbsp;</div>
-                          <div class="tabletext"><#if pickedQty gt 0 && 
orderHeader.statusId == "ORDER_APPROVED"><font 
color="red">${uiLabelMap.OrderQtyPicked}:&nbsp;${pickedQty?default(0)?string.number}</font><#else>${uiLabelMap.OrderQtyPicked}:&nbsp;${pickedQty?default(0)?string.number}</#if>&nbsp;&nbsp;</div>
+                          <#if orderHeader.orderTypeId == "SALES_ORDER">       
                  
+                               <div class="tabletext"><#if pickedQty gt 0 && 
orderHeader.statusId == "ORDER_APPROVED"><font 
color="red">${uiLabelMap.OrderQtyPicked}:&nbsp;${pickedQty?default(0)?string.number}</font><#else>${uiLabelMap.OrderQtyPicked}:&nbsp;${pickedQty?default(0)?string.number}</#if>&nbsp;&nbsp;</div>
+                          </#if>       
                           <div 
class="tabletext">${uiLabelMap.OrderQtyShipped}:&nbsp;${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.  -->