Author: jleroux
Date: Sun Oct 15 09:13:18 2006
New Revision: 464220
URL: http://svn.apache.org/viewvc?view=rev&rev=464220
Log:
Corrects a bug when quantitySummary.facilityId is not defined (does not exist)
Modified:
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
Modified:
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?view=diff&rev=464220&r1=464219&r2=464220
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
Sun Oct 15 09:13:18 2006
@@ -32,57 +32,59 @@
<td><div
class="tabletext"><b>${uiLabelMap.ProductOutgoingProductionRuns}</b></div></td>
</tr>
<#list quantitySummaryByFacility.values() as quantitySummary>
- <#assign facilityId = quantitySummary.facilityId?if_exists>
- <#assign facility = delegator.findByPrimaryKey("Facility",
Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId))>
- <#assign manufacturingInQuantitySummary =
manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists>
- <#assign manufacturingOutQuantitySummary =
manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists>
- <#assign totalQuantityOnHand =
quantitySummary.totalQuantityOnHand?if_exists>
- <#assign totalAvailableToPromise =
quantitySummary.totalAvailableToPromise?if_exists>
- <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists>
- <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists>
- <#assign incomingShipmentAndItemList =
quantitySummary.incomingShipmentAndItemList?if_exists>
- <#assign incomingProductionRunList =
manufacturingInQuantitySummary.incomingProductionRunList?if_exists>
- <#assign incomingQuantityTotal =
manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists>
- <#assign outgoingProductionRunList =
manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists>
- <#assign outgoingQuantityTotal =
manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists>
-
- <tr>
- <td><div class="tabletext">${(facility.facilityName)?if_exists}
[${facilityId?default("[No Facility]")}]
- <a
href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}"
class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></div></td>
- <td><div class="tabletext"><#if
totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></div></td>
- <td><div class="tabletext"><#if
totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></div></td>
- <td><div class="tabletext"><#if
mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></div></td>
- <td><div class="tabletext"><#if
mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></div></td>
- <td>
- <#if incomingShipmentAndItemList?has_content>
- <#list incomingShipmentAndItemList as
incomingShipmentAndItem>
- <div
class="tabletext">${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if
incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
- </#list>
- <#else>
- <div class="tabletext"> </div>
- </#if>
- </td>
- <td>
- <#if incomingProductionRunList?has_content>
- <#list incomingProductionRunList as incomingProductionRun>
- <div
class="tabletext">${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if
incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
- </#list>
- <div
class="tabletext"><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div>
- <#else>
- <div class="tabletext"> </div>
- </#if>
- </td>
- <td>
- <#if outgoingProductionRunList?has_content>
- <#list outgoingProductionRunList as outgoingProductionRun>
- <div
class="tabletext">${outgoingProductionRun.workEffortParentId}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if
outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
- </#list>
- <div
class="tabletext"><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div>
- <#else>
- <div class="tabletext"> </div>
- </#if>
- </td>
- </tr>
+ <#if quantitySummary.facilityId?exists>
+ <#assign facilityId = quantitySummary.facilityId>
+ <#assign facility = delegator.findByPrimaryKey("Facility",
Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId))>
+ <#assign manufacturingInQuantitySummary =
manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists>
+ <#assign manufacturingOutQuantitySummary =
manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists>
+ <#assign totalQuantityOnHand =
quantitySummary.totalQuantityOnHand?if_exists>
+ <#assign totalAvailableToPromise =
quantitySummary.totalAvailableToPromise?if_exists>
+ <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists>
+ <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists>
+ <#assign incomingShipmentAndItemList =
quantitySummary.incomingShipmentAndItemList?if_exists>
+ <#assign incomingProductionRunList =
manufacturingInQuantitySummary.incomingProductionRunList?if_exists>
+ <#assign incomingQuantityTotal =
manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists>
+ <#assign outgoingProductionRunList =
manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists>
+ <#assign outgoingQuantityTotal =
manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists>
+
+ <tr>
+ <td><div
class="tabletext">${(facility.facilityName)?if_exists}
[${facilityId?default("[No Facility]")}]
+ <a
href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}"
class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></div></td>
+ <td><div class="tabletext"><#if
totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></div></td>
+ <td><div class="tabletext"><#if
totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></div></td>
+ <td><div class="tabletext"><#if
mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></div></td>
+ <td><div class="tabletext"><#if
mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></div></td>
+ <td>
+ <#if incomingShipmentAndItemList?has_content>
+ <#list incomingShipmentAndItemList as
incomingShipmentAndItem>
+ <div
class="tabletext">${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if
incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+ </#list>
+ <#else>
+ <div class="tabletext"> </div>
+ </#if>
+ </td>
+ <td>
+ <#if incomingProductionRunList?has_content>
+ <#list incomingProductionRunList as
incomingProductionRun>
+ <div
class="tabletext">${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if
incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+ </#list>
+ <div
class="tabletext"><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div>
+ <#else>
+ <div class="tabletext"> </div>
+ </#if>
+ </td>
+ <td>
+ <#if outgoingProductionRunList?has_content>
+ <#list outgoingProductionRunList as
outgoingProductionRun>
+ <div
class="tabletext">${outgoingProductionRun.workEffortParentId}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if
outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+ </#list>
+ <div
class="tabletext"><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div>
+ <#else>
+ <div class="tabletext"> </div>
+ </#if>
+ </td>
+ </tr>
+ </#if>
</#list>
</table>
