Author: sichen Date: Wed Nov 8 16:30:49 2006 New Revision: 472715 URL: http://svn.apache.org/viewvc?view=rev&rev=472715 Log: unplanned inventory quantity should take into account marketing package QOH quantities
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=472715&r1=472714&r2=472715 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Nov 8 16:30:49 2006 @@ -93,7 +93,7 @@ <#assign requiredQuantity = requiredProductQuantityMap.get(productId)?default(0)> <#assign onOrderQuantity = onOrderProductQuantityMap.get(productId)?default(0)> <#assign inProductionQuantity = productionProductQuantityMap.get(productId)?default(0)> - <#assign unplannedQuantity = requiredQuantity - qohQuantity - inProductionQuantity - onOrderQuantity> + <#assign unplannedQuantity = requiredQuantity - qohQuantity - inProductionQuantity - onOrderQuantity - mktgPkgQOH> <#if unplannedQuantity < 0><#assign unplannedQuantity = 0></#if> <div class="tabletext" style="margin-top: 15px; margin-left: 20px;"> <table cellspacing="0" cellpadding="0" border="0">