You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/04/18 12:09:06 UTC
svn commit: r1674477 -
/ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
Author: deepak
Date: Sat Apr 18 10:09:06 2015
New Revision: 1674477
URL: http://svn.apache.org/r1674477
Log:
Applied fix from trunk r#1674464
============================================================
Applied slightly modified patch from jira issue OFBIZ-6202 - Expected hash" Freemarker error in FindInventoryEventPlan
Thanks Paul Foxworthy for reporting and providing the patch for the issue.
Modified:
ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
Modified: ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1674477&r1=1674476&r2=1674477&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Sat Apr 18 10:09:06 2015
@@ -103,8 +103,7 @@ document.lookupinventory.productId.focus
<table class="basic-table" cellspacing="0">
<tr>
<td width='100%'>
- <#if inventoryList?exists>
- <#if 0 < inventoryList?size>
+ <#if inventoryList?has_content>
<#assign rowClass = "alternate-row">
<table class="basic-table" cellspacing="0">
<tr>
@@ -149,7 +148,7 @@ document.lookupinventory.productId.focus
<#assign productTmp = "">
<#list inventoryList[lowIndex..highIndex-1] as inven>
<#assign product = inven.getRelatedOne("Product")>
- <#if facilityId?exists && facilityId?has_content>
+ <#if facilityId?has_content>
</#if>
<#if ! product.equals( productTmp )>
<#assign quantityAvailableAtDate = 0>
@@ -161,7 +160,7 @@ document.lookupinventory.productId.focus
<#if qohEvents?has_content>
<#assign initialQohEvent = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(qohEvents)>
</#if>
- <#if initialQohEvent??>
+ <#if initialQohEvent?has_content>
<#if initialQohEvent.quantity?has_content>
<#assign quantityAvailableAtDate = initialQohEvent.quantity>
</#if>
@@ -227,7 +226,6 @@ document.lookupinventory.productId.focus
<div align="center">${uiLabelMap.CommonNoElementFound}</div>
<br />
</#if>
- </#if>
</td>
</tr>
</table>