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/08 11:33:19 UTC
svn commit: r1801280 [1/2] - in
/ofbiz/ofbiz-framework/trunk/applications/product/template: category/
config/ facility/ feature/ find/ imagemanagement/ inventory/ price/
product/ promo/ returns/ shipment/ store/ thesaurus/
Author: arunpatidar
Date: Sat Jul 8 11:33:19 2017
New Revision: 1801280
URL: http://svn.apache.org/viewvc?rev=1801280&view=rev
Log:
Improved: Inconsistent String Comparisons. (OFBIZ-9254).
Thanks Devanshu Vyas for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProducts.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryRollup.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/facility/FindFacilityLocation.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/facility/Picklist.fo.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistOptions.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/feature/BulkAddFeature.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureGroups.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/find/FindProductById.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductFeatures.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductInventoryItems.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditVirtualProductInventory.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/ProductInventorySummary.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoCode.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoStores.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/returns/UpdatedInventoryItemStatus.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/thesaurus/EditKeywordThesaurus.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl Sat Jul 8 11:33:19 2017
@@ -40,7 +40,7 @@ under the License.
<#list productFeatureCatGrpAppls as productFeatureCatGrpAppl>
<#assign line = line + 1>
<#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup", false))?default(null)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureGroup??>${(productFeatureGroup.description)!}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)!}]</a></td>
<#assign hasntStarted = false>
<#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
@@ -67,7 +67,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -119,7 +119,7 @@ under the License.
<#list productFeatureCategoryAppls as productFeatureCategoryAppl>
<#assign line = line + 1>
<#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory", false))?default(null)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productFeatureCategory??>${(productFeatureCategory.description)!}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)!}]</a></td>
<#assign hasntStarted = false>
<#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
@@ -146,7 +146,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryParties.ftl Sat Jul 8 11:33:19 2017
@@ -36,7 +36,7 @@ under the License.
<#list productCategoryRoles as productCategoryRole>
<#assign line = line + 1>
<#assign curRoleType = productCategoryRole.getRelatedOne("RoleType", true)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)!}" target="_blank" class="buttontext">${(productCategoryRole.partyId)!}</a></td>
<td>${(curRoleType.get("description",locale))!}</td>
<#assign hasntStarted = false>
@@ -67,7 +67,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl Sat Jul 8 11:33:19 2017
@@ -37,7 +37,7 @@ under the License.
<#assign line = line + 1>
<#assign prodCatalog = prodCatalogCategory.getRelatedOne("ProdCatalog", false)>
<#assign curProdCatalogCategoryType = prodCatalogCategory.getRelatedOne("ProdCatalogCategoryType", true)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if prodCatalog??>${(prodCatalog.catalogName)!}</#if> [${(prodCatalogCategory.prodCatalogId)!}]</a></td>
<td>
${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}
@@ -70,7 +70,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProducts.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProducts.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryProducts.ftl Sat Jul 8 11:33:19 2017
@@ -72,7 +72,7 @@ under the License.
<#if productCategoryMember.fromDate?? && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
<#if productCategoryMember.thruDate?? && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>
<#if (product.smallImageUrl)??>
<a href="<@o...@ofbizUrl>"><img alt="Small Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" align="middle" /></a>
@@ -96,7 +96,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryRollup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryRollup.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryRollup.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategoryRollup.ftl Sat Jul 8 11:33:19 2017
@@ -53,7 +53,7 @@ under the License.
<#if productCategoryRollup.fromDate?? && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
<#if productCategoryRollup.thruDate?? && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><#if curCategory?has_content>
<a href="<@o...@ofbizUrl>" >
<#assign catContentWrapper = Static["org.apache.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)!>
@@ -80,7 +80,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -161,7 +161,7 @@ under the License.
<#if productCategoryRollup.fromDate?? && nowTimestamp.before(productCategoryRollup.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
<#assign hasExpired = false>
<#if productCategoryRollup.thruDate?? && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><#if curCategory?has_content>
<a href="<@o...@ofbizUrl>" >
<#assign catContentWrapper = Static["org.apache.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)!>
@@ -188,7 +188,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl Sat Jul 8 11:33:19 2017
@@ -54,7 +54,7 @@ function insertImageName(size,nameValue)
<#list productContentList as entry>
<#assign productContent=entry.productContent/>
<#assign productContentType=productContent.getRelatedOne("ProdConfItemContentType", true)/>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${entry.content.description?default("[${uiLabelMap.ProductNoDescription}]")} [${entry.content.contentId}]</td>
<td>${productContentType.description?default(productContent.confItemContentTypeId)}</td>
<td>${productContent.fromDate?default("N/A")}</td>
@@ -70,7 +70,7 @@ function insertImageName(size,nameValue)
<td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey!}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/FindFacilityLocation.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/FindFacilityLocation.ftl Sat Jul 8 11:33:19 2017
@@ -90,7 +90,7 @@ under the License.
<#assign rowClass = "2">
<#list foundLocations as location>
<#assign locationTypeEnum = location.getRelatedOne("TypeEnumeration", true)!>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>">${(location.facilityId)!}</a></td>
<td><a href="<@o...@ofbizUrl>">${(location.locationSeqId)!}</a></td>
<td>${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId!)}</td>
@@ -108,7 +108,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/Picklist.fo.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/Picklist.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/Picklist.fo.ftl Sat Jul 8 11:33:19 2017
@@ -56,7 +56,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
@@ -94,7 +94,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
@@ -278,7 +278,7 @@ under the License.
</#if>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistOptions.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistOptions.ftl Sat Jul 8 11:33:19 2017
@@ -53,7 +53,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<#if pickMoveInfoList?has_content || rushOrderInfo?has_content>
<tr class="header-row">
- <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<td>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
<#else>
<td>${uiLabelMap.ProductShipmentMethod}</td>
@@ -115,7 +115,7 @@ under the License.
<input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems!}"/>
<input type="hidden" name="facilityId" value="${facilityId!}"/>
</form>
- <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<#if groupName1?has_content>
<a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName1}</a>
</#if>
@@ -134,14 +134,14 @@ under the License.
</#if>
</td>
<td>
- <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<#if orderReadyToPickInfoListSize == 0 >${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if>
<#else>
${orderReadyToPickInfoListSize}
</#if>
</td>
<td>
- <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<#if orderNeedsStockMoveInfoListSize == 0>${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if>
<#else>
${orderNeedsStockMoveInfoListSize}
@@ -159,7 +159,7 @@ under the License.
<#list orderIdsForPickList as orderIdForPickList>
<input type="hidden" name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
</#list>
- <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<span class="label">${uiLabelMap.ProductPickFirst}</span>
<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
</#if>
@@ -177,7 +177,7 @@ under the License.
<input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod!}"/>
<input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea!}"/>
<input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems!}"/>
- <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/>
<input type="hidden" name="orderId" value="${groupName!}"/>
<#else>
@@ -194,7 +194,7 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
- <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && "Y" == requestParameters.groupByShippingMethod) || (requestParameters.groupByWarehouseArea?? && "Y" == requestParameters.groupByWarehouseArea) || (requestParameters.groupByNoOfOrderItems?? && "Y" == requestParameters.groupByNoOfOrderItems))>
<tr<#if alt_row> class="alternate-row"</#if>>
<th>${uiLabelMap.CommonAllMethods}</div></th>
<td> </td>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl Sat Jul 8 11:33:19 2017
@@ -191,7 +191,7 @@ under the License.
<fo:table-cell><fo:block font-size="10pt"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></fo:block></fo:table-cell>
</fo:table-row>
</#if>
- <#if product.productTypeId == "MARKETING_PKG_AUTO">
+ <#if "MARKETING_PKG_AUTO" == product.productTypeId>
<fo:table-row background-color="${rowColor}">
<fo:table-cell number-columns-spanned="6">
<fo:block text-align="left" font-weight="bold">
@@ -250,7 +250,7 @@ under the License.
</#if>
</#if>
</#if>
- <#if rowColor == "#D4D0C8">
+ <#if "#D4D0C8" == rowColor>
<#assign rowColor = "white"/>
<#else>
<#assign rowColor = "#D4D0C8"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/feature/BulkAddFeature.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/feature/BulkAddFeature.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/feature/BulkAddFeature.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/feature/BulkAddFeature.ftl Sat Jul 8 11:33:19 2017
@@ -35,7 +35,7 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list 0..featureNum-1 as feature>
- <tr id="productFeatureTypeId_tableRow_${feature_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr id="productFeatureTypeId_tableRow_${feature_index}" valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><input type="text" size='15' name="description_o_${feature_index}" /></td>
<td><select name='productFeatureTypeId_o_${feature_index}' size="1">
<#list productFeatureTypes as productFeatureType>
@@ -49,7 +49,7 @@ under the License.
<td align="right"><input type="checkbox" name="_rowSubmit_o_${feature_index}" value="Y" onclick="highlightRow(this,'productFeatureTypeId_tableRow_${feature_index}');" /></td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl Sat Jul 8 11:33:19 2017
@@ -88,7 +88,7 @@ under the License.
<#assign rowClass = "2">
<#list productFeatures as productFeature>
<#assign curProductFeatureType = productFeature.getRelatedOne("ProductFeatureType", true)>
- <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
<td><input type="text" size='15' name="description_o_${rowCount}" value="${productFeature.description}" /></td>
@@ -121,7 +121,7 @@ under the License.
</tr>
<#assign rowCount = rowCount + 1>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureGroups.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureGroups.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/feature/EditFeatureGroups.ftl Sat Jul 8 11:33:19 2017
@@ -31,7 +31,7 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list productFeatureGroups as productFeatureGroup>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href='<@o...@ofbizUrl>' class="buttontext">${productFeatureGroup.productFeatureGroupId}</a></td>
<td>
<form method='post' action='<@o...@ofbizUrl>'>
@@ -43,7 +43,7 @@ under the License.
<td><a href='<@o...@ofbizUrl>' class="buttontext">${uiLabelMap.ProductFeatureGroupAppls}</a></td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/AdvancedSearch.ftl Sat Jul 8 11:33:19 2017
@@ -106,8 +106,8 @@ under the License.
<td valign="middle">
<div>
<input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/>
- <label>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/></label>
- <label>${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/></label>
+ <label>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if>/></label>
+ <label>${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if "AND" == searchOperator>checked="checked"</#if>/></label>
</div>
</td>
</tr>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/FindProductById.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/FindProductById.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/find/FindProductById.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/FindProductById.ftl Sat Jul 8 11:33:19 2017
@@ -35,7 +35,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<#assign rowClass = "1">
<#if idProduct?has_content>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>
${idProduct.productId}
</td>
@@ -48,14 +48,14 @@ under the License.
</#if>
<#list goodIdentifications as goodIdentification>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
</#if>
<#assign product = goodIdentification.getRelatedOne("Product", true)/>
<#assign goodIdentificationType = goodIdentification.getRelatedOne("GoodIdentificationType", true)/>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>
${product.productId}
</td>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl Sat Jul 8 11:33:19 2017
@@ -74,7 +74,7 @@ under the License.
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
</#if>
</#if>
- <#if paging == "Y">
+ <#if "Y" == paging>
<#if parameters.ACTIVE_PRODUCT?has_content && parameters.GOOGLE_SYNCED?has_content && parameters.DISCONTINUED_PRODUCT?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPagingOff}</a>
<#else>
@@ -100,14 +100,14 @@ under the License.
<#assign rowClass = "2">
<#list productIds as productId><#-- note that there is no boundary range because that is being done before the list is put in the content -->
<#assign product = delegator.findOne("Product", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productId", productId), false)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>
<input type="checkbox" name="selectResult" value="${productId}" onchange="checkProductToBagTextArea(this, '${productId}');"/>
<a href="<@o...@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)!}</a>
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -138,7 +138,7 @@ under the License.
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
</#if>
</#if>
- <#if paging == "Y">
+ <#if "Y" == paging>
<#if parameters.ACTIVE_PRODUCT?has_content && parameters.GOOGLE_SYNCED?has_content && parameters.DISCONTINUED_PRODUCT?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPagingOff}</a>
<#else>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl Sat Jul 8 11:33:19 2017
@@ -44,11 +44,11 @@ under the License.
</div>
<div>
<label for="keywordSearchCointains">${uiLabelMap.CommonNoContains}</label>
- <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if requestParameters.SEARCH_CONTAINS! == "N">checked="checked"</#if> />
+ <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if "N" == requestParameters.SEARCH_CONTAINS!>checked="checked"</#if> />
<label for="keywordSearchOperatorOr">${uiLabelMap.CommonAny}</label>
- <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if requestParameters.SEARCH_OPERATOR! != "AND">checked="checked"</#if> />
+ <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if "AND" != requestParameters.SEARCH_OPERATOR!>checked="checked"</#if> />
<label for="keywordSearchOperatorAnd">${uiLabelMap.CommonAll}</label>
- <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if requestParameters.SEARCH_OPERATOR! == "AND">checked="checked"</#if> />
+ <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if "AND" == requestParameters.SEARCH_OPERATOR!>checked="checked"</#if> />
</div>
<div>
<input type="submit" name="find" value="${uiLabelMap.CommonFind}" class="buttontext" />
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl Sat Jul 8 11:33:19 2017
@@ -77,7 +77,7 @@ jQuery(document).ready(function(){
</table>
</td>
</#list>
- <#if userMap.checkUser == "REJECTED">
+ <#if "REJECTED" == userMap.checkUser>
<td>
<div><b>Rejected</b></div>
</td>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl Sat Jul 8 11:33:19 2017
@@ -177,7 +177,7 @@ under the License.
<td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductQuantityToTransfer}</span></td>
<td width="6%"> </td>
<td width="74%">
- <#if inventoryItem?? && "SERIALIZED_INV_ITEM" == inventoryItem.inventoryItemTypeId>
+ <#if inventoryItem?? && "NON_SERIAL_INV_ITEM" == inventoryItem.inventoryItemTypeId>
<input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)!}" />
<#elseif inventoryItem?? && "SERIALIZED_INV_ITEM" == inventoryItem.inventoryItemTypeId>
<input type="hidden" name="xferQty" value="1" />
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/price/EditProductPriceRules.ftl Sat Jul 8 11:33:19 2017
@@ -41,7 +41,7 @@ under the License.
<@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- <#assign saleRule = productPriceRule.isSale?? && productPriceRule.isSale == "Y">
+ <#assign saleRule = productPriceRule.isSale?? && "Y" == productPriceRule.isSale>
<div>
<span class="label"><b>${uiLabelMap.ProductNotifySale}</b></span>
<label><input type="radio" name="isSale" value="Y" <#if saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes}</label>
@@ -72,7 +72,7 @@ under the License.
<#assign maxCondSeqId = 1>
<#assign rowClass = "2">
<#list productPriceConds as productPriceCond>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<#-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
<#assign curCondSeqId = productPriceCond.productPriceCondSeqId?number>
<#if (curCondSeqId >= maxCondSeqId)><#assign maxCondSeqId = curCondSeqId + 1></#if>
@@ -118,7 +118,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -158,7 +158,7 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list productPriceActions as productPriceAction>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td class="label"><b>${productPriceAction.productPriceActionSeqId}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>">
@@ -189,7 +189,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl Sat Jul 8 11:33:19 2017
@@ -72,7 +72,7 @@ under the License.
<#if (listSize > 0)>
<#list productFeatures as productFeature>
<#assign curProductFeatureType = productFeature.getRelatedOne("ProductFeatureType", true)>
- <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<td><a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
<td>${productFeature.description!}</td>
@@ -98,7 +98,7 @@ under the License.
</tr>
<#assign rowCount = rowCount + 1>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductFeatures.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductFeatures.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductFeatures.ftl Sat Jul 8 11:33:19 2017
@@ -45,7 +45,7 @@ under the License.
<#assign curProductFeatureType = productFeatureAndAppl.getRelatedOne("ProductFeatureType", true)>
<#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOne("ProductFeatureApplType", true)>
<#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOne("ProductFeatureCategory", true)!)>
- <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>
<input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)!}" />
<input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)!}" />
@@ -86,7 +86,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductInventoryItems.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductInventoryItems.ftl Sat Jul 8 11:33:19 2017
@@ -52,15 +52,15 @@ under the License.
<#assign rowClass = "2">
<#list productInventoryItems as inventoryItem>
<#-- NOTE: Delivered for serialized inventory means shipped to customer so they should not be displayed here any more -->
- <#if showEmpty || (inventoryItem.inventoryItemTypeId! == "SERIALIZED_INV_ITEM" && inventoryItem.statusId! != "INV_DELIVERED")
- || (inventoryItem.inventoryItemTypeId! == "NON_SERIAL_INV_ITEM" && ((inventoryItem.availableToPromiseTotal?? && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?? && inventoryItem.quantityOnHandTotal != 0)))>
+ <#if showEmpty || ("SERIALIZED_INV_ITEM" == inventoryItem.inventoryItemTypeId! && "INV_DELIVERED" != inventoryItem.statusId!)
+ || ("NON_SERIAL_INV_ITEM" == inventoryItem.inventoryItemTypeId! && ((inventoryItem.availableToPromiseTotal?? && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?? && inventoryItem.quantityOnHandTotal != 0)))>
<#assign curInventoryItemType = inventoryItem.getRelatedOne("InventoryItemType", false)>
<#assign curStatusItem = inventoryItem.getRelatedOne("StatusItem", true)!>
<#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation", false)!>
<#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))!>
<#assign inventoryItemDetailFirst = Static["org.apache.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", null, Static["org.apache.ofbiz.base.util.UtilMisc"].toList("effectiveDate"), false))!>
<#if curInventoryItemType??>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${(inventoryItem.inventoryItemId)!}</a></td>
<td> ${(curInventoryItemType.get("description",locale))!}</td>
<td>
@@ -98,12 +98,12 @@ under the License.
</#if>
</td>
<td align="right">${(inventoryItemDetailFirst.quantityOnHandDiff)!}</td>
- <#if inventoryItem.inventoryItemTypeId! == "NON_SERIAL_INV_ITEM">
+ <#if "NON_SERIAL_INV_ITEM" == inventoryItem.inventoryItemTypeId!>
<td align="right">
<div>${(inventoryItem.availableToPromiseTotal)?default("NA")}
/ ${(inventoryItem.quantityOnHandTotal)?default("NA")}</div>
</td>
- <#elseif inventoryItem.inventoryItemTypeId! == "SERIALIZED_INV_ITEM">
+ <#elseif "SERIALIZED_INV_ITEM" == inventoryItem.inventoryItemTypeId!>
<td align="right"> ${(inventoryItem.serialNumber)!}</td>
<#else>
<td align="right" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)!} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)!})
@@ -113,7 +113,7 @@ under the License.
</#if>
</#if>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl Sat Jul 8 11:33:19 2017
@@ -64,7 +64,7 @@ function doPublish() {
<!-- Name update section -->
<form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="editProduct">
<input type="hidden" name="productId" value="${productId!}"/>
- <#if (product.isVirtual)! == "Y">
+ <#if "Y" == (product.isVirtual)!>
<input type="hidden" name="isVirtual" value="Y"/>
</#if>
<table cellspacing="0" class="basic-table">
@@ -77,7 +77,7 @@ function doPublish() {
</form>
</div>
</div>
-<#if (product.isVirtual)! == "Y">
+<#if "Y" == (product.isVirtual)!>
<div class="screenlet">
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductSelectableFeatures}</h3>
@@ -121,7 +121,7 @@ function doPublish() {
<#assign rowClass = "2">
<#list productAssocs as productAssoc>
<#assign assocProduct = productAssoc.getRelatedOne("AssocProduct", false)/>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td nowrap="nowrap">
<input type="hidden" name="productId${idx}" value="${assocProduct.productId!}"/>
<a class="buttontext" href="<@o...@ofbizUrl>">${assocProduct.productId!}</a></td>
@@ -140,7 +140,7 @@ function doPublish() {
</tr>
<#assign idx = idx + 1/>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -167,7 +167,7 @@ function doPublish() {
</div>
</div>
</#if>
-<#if (product.isVariant)! == "Y">
+<#if "Y" == (product.isVariant)!>
<div class="screenlet">
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductDistinguishingFeatures}</h3>
@@ -182,14 +182,14 @@ function doPublish() {
<#assign idx=0/>
<#assign rowClass = "2">
<#list distinguishingFeatures as distinguishingFeature>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">x</a>
${distinguishingFeature.productFeatureId} ${productFeatureTypeLookup.get(distinguishingFeature.productFeatureId).get("description",locale)}: ${distinguishingFeature.get("description",locale)}
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -227,11 +227,11 @@ function doPublish() {
<td><b>${uiLabelMap.ProductST}</b></td>
<td><b>${uiLabelMap.ProductTD}</b></td>
</tr>
- <#if (product.isVirtual)! == "Y">
+ <#if "Y" == (product.isVirtual)!>
<#assign idx=0/>
<#assign rowClass = "2">
<#list assocProducts as assocProduct>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><input type="text" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight!}"/></td>
<td><input type="text" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth!}"/></td>
<td><input type="text" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth!}"/></td>
@@ -246,7 +246,7 @@ function doPublish() {
</tr>
<#assign idx = idx + 1/>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -298,7 +298,7 @@ function doPublish() {
<table cellspacing="0" class="basic-table">
<#assign rowClass = "2">
<#list addedFeatureTypeIds as addedFeatureTypeId>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td align="right">${addedFeatureTypes.get(addedFeatureTypeId).description}</td>
<td>
<select name="productFeatureId">
@@ -310,7 +310,7 @@ function doPublish() {
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -328,7 +328,7 @@ function doPublish() {
<#assign rowClass = "2">
<#list standardFeatureAppls as standardFeatureAppl>
<#assign featureId = standardFeatureAppl.productFeatureId/>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td colspan="2">
<form name="quickAdminRemoveFeature_${standardFeatureAppl_index}" action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="productId" value="${standardFeatureAppl.productId!}" />
@@ -340,7 +340,7 @@ function doPublish() {
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -410,7 +410,7 @@ function doPublish() {
<#assign rowClass = "2">
<#list productCategoryMembers as prodCatMemb>
<#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory", false)/>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td colspan="2">
<form name="quickAdminRemoveProductFromCategory_${prodCatMemb_index}" action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="productId" value="${prodCatMemb.productId!}" />
@@ -422,7 +422,7 @@ function doPublish() {
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
@@ -441,7 +441,7 @@ function doPublish() {
</div>
<div class="screenlet-body">
<!-- **************************************************** publish section -->
- <#if (showPublish == "true")>
+ <#if ("true" == showPublish)>
<form action="<@o...@ofbizUrl>" name="publish">
<input type="hidden" name="productId" value="${product.productId!}"/>
<input type="hidden" name="categoryId" value="${allCategoryId!}"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditVirtualProductInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditVirtualProductInventory.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditVirtualProductInventory.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditVirtualProductInventory.ftl Sat Jul 8 11:33:19 2017
@@ -33,7 +33,7 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list variantInventorySummaries as variantSummary>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${variantSummary.productId}</a></td>
<#list featureTypeIds as featureTypeId>
<td>${(variantSummary[featureTypeId].description)?default(featureTypeId)}</td>
@@ -42,7 +42,7 @@ under the License.
<td>${variantSummary.availableToPromiseTotal}</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/ProductInventorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/ProductInventorySummary.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/ProductInventorySummary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/ProductInventorySummary.ftl Sat Jul 8 11:33:19 2017
@@ -32,7 +32,7 @@ under the License.
<td><b>${uiLabelMap.ProductFacility}</b></td>
<td><b>${uiLabelMap.ProductAtp}</b></td>
<td><b>${uiLabelMap.ProductQoh}</b></td>
- <#if isMarketingPackage == "true">
+ <#if "true" == isMarketingPackage>
<td><b>${uiLabelMap.ProductMarketingPackageATP}</b></td>
<td><b>${uiLabelMap.ProductMarketingPackageQOH}</b></td>
</#if>
@@ -56,12 +56,12 @@ under the License.
<#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal!>
<#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList!>
<#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal!>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td>${(facility.facilityName)!} [${facilityId?default("[No Facility]")}]
<a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td>
<td><#if totalAvailableToPromise??>${totalAvailableToPromise}<#else> </#if></td>
<td><#if totalQuantityOnHand??>${totalQuantityOnHand}<#else> </#if></td>
- <#if isMarketingPackage == "true">
+ <#if "true" == isMarketingPackage>
<td><#if mktgPkgATP??>${mktgPkgATP}<#else> </#if></td>
<td><#if mktgPkgQOH??>${mktgPkgQOH}<#else> </#if></td>
</#if>
@@ -98,7 +98,7 @@ under the License.
</#if>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl Sat Jul 8 11:33:19 2017
@@ -71,7 +71,7 @@ function clickAll(e) {
<#assign curProductFeatureAndAppls = featureCombinationInfo.curProductFeatureAndAppls>
<#assign existingVariantProductIds = featureCombinationInfo.existingVariantProductIds>
<#assign defaultVariantProductId = featureCombinationInfo.defaultVariantProductId>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<#assign productFeatureIds = "">
<#list curProductFeatureAndAppls as productFeatureAndAppl>
<td>
@@ -100,7 +100,7 @@ function clickAll(e) {
<#assign defaultSequenceNum = defaultSequenceNum + 10>
<#assign rowCount = rowCount + 1>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoCode.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoCode.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoCode.ftl Sat Jul 8 11:33:19 2017
@@ -39,7 +39,7 @@ under the License.
<span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress" />
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
- <#if productPromoCode.requireEmailOrParty! == "N">
+ <#if "N" == productPromoCode.requireEmailOrParty!>
<div class="tooltip">${uiLabelMap.ProductNoteRequireEmailParty}</div>
</#if>
<form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl Sat Jul 8 11:33:19 2017
@@ -36,7 +36,7 @@ under the License.
<#if productPromoRule_index != 0>
<tr><td colspan="3"><hr /></td></tr>
</#if>
- <tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
+ <tr valign="middle" class="row-level-one<#if "1" == ruleClass> alternate-row</#if>">
<td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)!}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>">
@@ -57,14 +57,14 @@ under the License.
</td>
</tr>
<tr><td><hr /></td><td colspan="2"></td></tr>
- <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
+ <tr valign="top" class="row-level-one<#if "1" == ruleClass> alternate-row</#if>">
<td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)!} :</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
<#assign maxCondSeqId = 1>
<#assign condClass = "2">
<#list productPromoConds as productPromoCond>
- <tr class="row-level-two<#if condClass == "1"> alternate-row</#if>">
+ <tr class="row-level-two<#if "1" == condClass> alternate-row</#if>">
<!-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
<#if (productPromoCond.productPromoCondSeqId)??>
<#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))>
@@ -228,7 +228,7 @@ under the License.
<td></td>
</tr>
<#-- toggle the row color -->
- <#if condClass == "2">
+ <#if "1" == condClass>
<#assign condClass = "1">
<#else>
<#assign condClass = "2">
@@ -269,13 +269,13 @@ under the License.
</td>
</tr>
<tr><td><hr /></td><td colspan="2"></td></tr>
- <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
+ <tr valign="top" class="row-level-one<#if "1" == ruleClass> alternate-row</#if>">
<td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)!} :</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
<#assign actionClass = "2">
<#list productPromoActions as productPromoAction>
- <tr class="row-level-two<#if actionClass == "1"> alternate-row</#if>">
+ <tr class="row-level-two<#if "1" == actionClass> alternate-row</#if>">
<td></td>
<td>
<div>
@@ -415,7 +415,7 @@ under the License.
<td></td>
</tr>
<#-- toggle the row color -->
- <#if actionClass == "2">
+ <#if "2" == actionClass>
<#assign actionClass = "1">
<#else>
<#assign actionClass = "2">
@@ -456,7 +456,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if ruleClass == "2">
+ <#if "2" == ruleClass>
<#assign ruleClass = "1">
<#else>
<#assign ruleClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoStores.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoStores.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoStores.ftl Sat Jul 8 11:33:19 2017
@@ -34,7 +34,7 @@ under the License.
<#list productStorePromoAppls as productStorePromoAppl>
<#assign line = line + 1>
<#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore", false)>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productStore??>${(productStore.storeName)!}</#if>[${productStorePromoAppl.productStoreId}]</a></td>
<#assign hasntStarted = false>
<#if (productStorePromoAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
@@ -62,7 +62,7 @@ under the License.
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "2">
+ <#if "2" == rowClass>
<#assign rowClass = "1">
<#else>
<#assign rowClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl Sat Jul 8 11:33:19 2017
@@ -187,7 +187,7 @@ under the License.
<select name="statusId_o_${rowCount}" size='1' id = "statusId_o_${rowCount}">
<option value="INV_RETURNED">${uiLabelMap.ProductReturned}</option>
<option value="INV_AVAILABLE">${uiLabelMap.ProductAvailable}</option>
- <option value="INV_NS_DEFECTIVE" <#if returnItem.returnReasonId?default("") == "RTN_DEFECTIVE_ITEM">Selected</#if>>${uiLabelMap.ProductDefective}</option>
+ <option value="INV_NS_DEFECTIVE" <#if "RTN_DEFECTIVE_ITEM" == returnItem.returnReasonId?default("")>Selected</#if>>${uiLabelMap.ProductDefective}</option>
</select>
</td>
<#if serializedInv?has_content>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/returns/UpdatedInventoryItemStatus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/returns/UpdatedInventoryItemStatus.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/returns/UpdatedInventoryItemStatus.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/returns/UpdatedInventoryItemStatus.ftl Sat Jul 8 11:33:19 2017
@@ -18,12 +18,12 @@ under the License.
-->
<#assign inventoryItemType = parameters.inventoryItemType?default("NON_SERIAL_INV_ITEM")>
<#assign inventoryItemStatus = parameters.inventoryItemStatus?default("INV_RETURNED")>
-<#if inventoryItemType == "NON_SERIAL_INV_ITEM">
- <option value="INV_RETURNED" <#if inventoryItemStatus == "INV_RETURNED">selected="selected"</#if>>${uiLabelMap.ProductReturned}</option>
- <option value="INV_AVAILABLE" <#if inventoryItemStatus == "INV_AVAILABLE">selected="selected"</#if>>${uiLabelMap.ProductAvailable}</option>
- <option value="INV_NS_DEFECTIVE" <#if inventoryItemStatus == "INV_DEFECTIVE">selected="selected"</#if>>${uiLabelMap.ProductDefective}</option>
+<#if "NON_SERIAL_INV_ITEM" == inventoryItemType>
+ <option value="INV_RETURNED" <#if "INV_RETURNED" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductReturned}</option>
+ <option value="INV_AVAILABLE" <#if "INV_AVAILABLE" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductAvailable}</option>
+ <option value="INV_NS_DEFECTIVE" <#if "INV_DEFECTIVE" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductDefective}</option>
<#else>
- <option value="INV_RETURNED" <#if inventoryItemStatus == "INV_RETURNED">selected="selected"</#if>>${uiLabelMap.ProductReturned}</option>
- <option value="INV_AVAILABLE" <#if inventoryItemStatus == "INV_AVAILABLE">selected="selected"</#if>>${uiLabelMap.ProductAvailable}</option>
- <option value="INV_DEFECTIVE" <#if inventoryItemStatus == "INV_NS_DEFECTIVE">selected="selected"</#if>>${uiLabelMap.ProductDefective}</option>
+ <option value="INV_RETURNED" <#if "INV_RETURNED" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductReturned}</option>
+ <option value="INV_AVAILABLE" <#if "INV_AVAILABLE" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductAvailable}</option>
+ <option value="INV_DEFECTIVE" <#if "INV_NS_DEFECTIVE" == inventoryItemStatus>selected="selected"</#if>>${uiLabelMap.ProductDefective}</option>
</#if>
\ No newline at end of file
Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl Sat Jul 8 11:33:19 2017
@@ -51,17 +51,17 @@ under the License.
<h3 style="color: red;"><#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/>.</h3>
</#if>
<#if orderHeader??>
- <#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId! != "SALES_SHIPMENT">
+ <#if "SALES_ORDER" == orderHeader.orderTypeId && "SALES_SHIPMENT" != shipment.shipmentTypeId!>
<h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}, ${uiLabelMap.ProductNotSalesShipment}.</h3>
- <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId! != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId! != "DROP_SHIPMENT">
+ <#elseif "PURCHASE_ORDER" == orderHeader.orderTypeId && "PURCHASE_SHIPMENT" != shipment.shipmentTypeId! && "DROP_SHIPMENT" != shipment.shipmentTypeId!>
<h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}, ${uiLabelMap.ProductNotPurchaseShipment}.</h3>
<#else>
<h3>${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}.</h3>
<h3>${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId!}.</h3>
</#if>
- <#if shipment.shipmentTypeId! == "SALES_SHIPMENT">
+ <#if "SALES_SHIPMENT" == shipment.shipmentTypeId!>
<h3>${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility??>${originFacility.facilityName!} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3>
- <#elseif shipment.shipmentTypeId! == "PURCHASE_SHIPMENT">
+ <#elseif "PURCHASE_SHIPMENT" == shipment.shipmentTypeId!>
<h3>${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility??>${destinationFacility.facilityName!} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3>
</#if>
<#if "ORDER_APPROVED" == orderHeader.statusId || "ORDER_BACKORDERED" == orderHeader.statusId>