Posted by
sichen on
Aug 30, 2006; 12:38am
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r438295-in-incubator-ofbiz-trunk-applications-order-webapp-ordermgr-WEB-INF-actions-orderl-tp208931.html
Author: sichen
Date: Tue Aug 29 16:38:23 2006
New Revision: 438295
URL:
http://svn.apache.org/viewvc?rev=438295&view=revLog:
Show marketing package QOH/ATP from components on a separate line for order items which are also marketing packages
Modified:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh?rev=438295&r1=438294&r2=438295&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh Tue Aug 29 16:38:23 2006
@@ -242,6 +242,8 @@
inventorySummary = dispatcher.runSync("getProductInventorySummaryForItems", UtilMisc.toMap("orderItems", orderItems));
context.put("availableToPromiseMap", inventorySummary.get("availableToPromiseMap"));
context.put("quantityOnHandMap", inventorySummary.get("quantityOnHandMap"));
+ context.put("mktgPkgATPMap", inventorySummary.get("mktgPkgATPMap"));
+ context.put("mktgPkgQOHMap", inventorySummary.get("mktgPkgQOHMap"));
// get a list of facilities for purchase orders to receive against. These facilities must be owned by the bill-to party of the purchase order.
if ("PURCHASE_ORDER".equals(orderType)) {
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?rev=438295&r1=438294&r2=438295&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Aug 29 16:38:23 2006
@@ -80,8 +80,11 @@
<#-- INVENTORY -->
<#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?exists && quantityOnHandMap?exists && availableToPromiseMap.get(productId)?exists && quantityOnHandMap.get(productId)?exists>
<#assign quantityToProduce = 0>
+ <#assign product = orderItem.getRelatedOneCache("Product")>
<#assign atpQuantity = availableToPromiseMap.get(productId)?default(0)>
<#assign qohQuantity = quantityOnHandMap.get(productId)?default(0)>
+ <#assign mktgPkgATP = mktgPkgATPMap.get(productId)?default(0)>
+ <#assign mktgPkgQOH = mktgPkgQOHMap.get(productId)?default(0)>
<#assign requiredQuantity = requiredProductQuantityMap.get(productId)?default(0)>
<#assign onOrderQuantity = onOrderProductQuantityMap.get(productId)?default(0)>
<#assign inProductionQuantity = productionProductQuantityMap.get(productId)?default(0)>
@@ -96,6 +99,10 @@
<td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr>
<tr><td align="left">${uiLabelMap.ProductInInventory} ${uiLabelMap.ProductQoh}</td>
<td style="padding-left: 15px; text-align: left;">${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})</a></td></tr>
+ <#if (product != null) && (product.productTypeId != null) && (product.productTypeId == "MARKETING_PKG_AUTO")>
+ <tr><td align="left">${uiLabelMap.ProductMarketingPackageQOH}</td>
+ <td style="padding-left: 15px; text-align: left;">${mktgPkgQOH} (${uiLabelMap.ProductAtp}: ${mktgPkgATP})</a></td></tr>
+ </#if>
<tr><td align="left">${uiLabelMap.OrderOnOrder}</td>
<td style="padding-left: 15px; text-align: left;">${onOrderQuantity}</td></tr>
<tr><td align="left">${uiLabelMap.OrderInProduction}</td>