You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2017/07/22 12:38:44 UTC

svn commit: r1802685 - in /ofbiz/ofbiz-framework/trunk: applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl framework/webtools/template/datafile/ViewDataFile.ftl

Author: arunpatidar
Date: Sat Jul 22 12:38:44 2017
New Revision: 1802685

URL: http://svn.apache.org/viewvc?rev=1802685&view=rev
Log:
Fixed issue due to incorrect comparision operation.(OFBIZ-9254)
Thanks Rohit Rai for reporting.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl?rev=1802685&r1=1802684&r2=1802685&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl Sat Jul 22 12:38:44 2017
@@ -150,7 +150,7 @@ document.lookupinventory.productId.focus
             <#assign product = inven.getRelatedOne("Product", false)>
             <#if facilityId?has_content>
             </#if>
-            <#if !product == productTmp>
+            <#if !(product == productTmp)>
                 <#assign quantityAvailableAtDate = 0>
                 <#assign errorEvents = delegator.findByAnd("MrpEvent", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("mrpEventTypeId", "ERROR", "productId", inven.productId), null, false)>
                 <#assign qohEvents = delegator.findByAnd("MrpEvent", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("mrpEventTypeId", "INITIAL_QOH", "productId", inven.productId), null, false)>

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl?rev=1802685&r1=1802684&r2=1802685&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl Sat Jul 22 12:38:44 2017
@@ -81,7 +81,7 @@ under the License.
         <#list records as record>
           <#assign modelRecord = record.getModelRecord()>
           <#-- if record is different than the last displayed, make a new table and header row -->
-          <#if !modelRecord.name == lastRecordName>
+          <#if !(modelRecord.name == lastRecordName)>
             <#if lastRecordName??>
               </table><br />
             </#if>