You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/10/30 19:52:04 UTC
svn commit: r590268 - in /ofbiz/trunk/applications/order/webapp/ordermgr:
WEB-INF/actions/order/orderview.bsh order/orderitems.ftl
Author: jaz
Date: Tue Oct 30 11:52:03 2007
New Revision: 590268
URL: http://svn.apache.org/viewvc?rev=590268&view=rev
Log:
now checked in just the order item display (inventory) changes from rev 590265
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh?rev=590268&r1=590267&r2=590268&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh Tue Oct 30 11:52:03 2007
@@ -253,6 +253,16 @@
context.put("mktgPkgATPMap", inventorySummary.get("mktgPkgATPMap"));
context.put("mktgPkgQOHMap", inventorySummary.get("mktgPkgQOHMap"));
+ // get inventory summary with respect to facility
+ productStore = orderHeader.getRelatedOne("ProductStore");
+ if (productStore != null) {
+ facility = productStore.getRelatedOne("Facility");
+ inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", UtilMisc.toMap("orderItems", orderItems, "facilityId", facility.getString("facilityId")));
+ context.put("availableToPromiseByFacilityMap", inventorySummaryByFacility.get("availableToPromiseMap"));
+ context.put("quantityOnHandByFacilityMap", inventorySummaryByFacility.get("quantityOnHandMap"));
+ context.put("facility", facility);
+ }
+
// 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.
// For a given ship group, the allowed facilities are the ones associated
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=590268&r1=590267&r2=590268&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Oct 30 11:52:03 2007
@@ -111,7 +111,13 @@
</td><td> </td></tr>
<tr><td align="left">${uiLabelMap.OrderRequiredForSO}</td>
<td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr>
- <tr><td align="left">${uiLabelMap.ProductInInventory} ${uiLabelMap.ProductQoh}</td>
+ <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists>
+ <#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)>
+ <#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)>
+ <tr><td align="left">${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}</td>
+ <td style="padding-left: 15px; text-align: left;">${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility})</td></tr>
+ </#if>
+ <tr><td align="left">${uiLabelMap.ProductInInventory} [${uiLabelMap.CommonAll} ${uiLabelMap.ProductFacilities}] ${uiLabelMap.ProductQoh}</td>
<td style="padding-left: 15px; text-align: left;">${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})</td></tr>
<#if (product != null) && (product.productTypeId != null) && (product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK")>
<tr><td align="left">${uiLabelMap.ProductMarketingPackageQOH}</td>