svn commit: r1812285 [2/4] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/template/ap/invoices/ applications/accounting/template/common/ applications/accounting/template/finaccounttrans/ applications/accounting/template/payment/ application...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1812285 [2/4] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/template/ap/invoices/ applications/accounting/template/common/ applications/accounting/template/finaccounttrans/ applications/accounting/template/payment/ application...

Deepak Dixit-5
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl Mon Oct 16 11:31:40 2017
@@ -22,31 +22,31 @@ under the License.
 <script type="text/javascript">
 //<![CDATA[
 function submitForm(form, mode, value) {
-    if (mode == "DN") {
+    if ("DN" == mode) {
         // done action; checkout
         form.action="<@ofbizUrl>checkoutoptions</@ofbizUrl>";
         form.submit();
-    } else if (mode == "CS") {
+    } else if ("CS" == mode) {
         // continue shopping
         form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NC") {
+    } else if ("NC" == mode) {
         // new credit card
         form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EC") {
+    } else if ("EC" == mode) {
         // edit credit card
         form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "GC") {
+    } else if ("GC" == mode) {
         // edit gift card
         form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NE") {
+    } else if ("NE" == mode) {
         // new eft account
         form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EE") {
+    } else if ("EE" == mode) {
         // edit eft account
         form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
@@ -159,7 +159,7 @@ var issuerId = "";
               </div>
             <#else>
               <#list paymentMethodList as paymentMethod>
-                <#if paymentMethod.paymentMethodTypeId == "GIFT_CARD">
+                <#if "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
                  <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
                   <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false) />
 
@@ -187,7 +187,7 @@ var issuerId = "";
                         <strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
                   </div>
                  </#if>
-                <#elseif paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+                <#elseif "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
                  <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
                   <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) />
                   <div>
@@ -198,7 +198,7 @@ var issuerId = "";
                         <label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
                   </div>
                  </#if>
-                <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+                <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
                  <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
                   <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) />
                   <div>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl Mon Oct 16 11:31:40 2017
@@ -20,19 +20,19 @@ under the License.
 <script type="text/javascript">
 //<![CDATA[
 function submitForm(form, mode, value) {
-    if (mode == "DN") {
+    if ("DN" == mode) {
         // done action; checkout
         form.action="<@ofbizUrl>checkoutoptions</@ofbizUrl>";
         form.submit();
-    } else if (mode == "CS") {
+    } else if ("CS" == mode) {
         // continue shopping
         form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NA") {
+    } else if ("NA" == mode) {
         // new address
         form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutshippingaddress</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EA") {
+    } else if ("EA" == mode) {
         // edit address
         form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>";
         form.submit();

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustSettings.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustSettings.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustSettings.ftl Mon Oct 16 11:31:40 2017
@@ -74,8 +74,8 @@ under the License.
                   &nbsp;ext&nbsp;<input type="text" name="homeExt" value="${requestParameters.homeExt!}" size="6" maxlength="10"/>
                   <br/>
                   <select name="homeSol">
-                    <#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if ("Y" == ((requestParameters.homeSol)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+                    <#if ("N" == ((requestParameters.homeSol)!""))><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -92,8 +92,8 @@ under the License.
                   &nbsp;ext&nbsp;<input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT!}" size="6" maxlength="10"/>
                   <br/>
                   <select name="workSol">
-                    <#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if ("Y" == ((requestParameters.workSol)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+                    <#if ("N" == ((requestParameters.workSol)!""))><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>
@@ -110,8 +110,8 @@ under the License.
                   <input type="text" name="emailAddress" value="" size="60" maxlength="255" />
                   <br/>
                   <select name="emailSol">
-                    <#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                    <#if ("Y" == ((requestParameters.emailSol)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+                    <#if ("N" == ((requestParameters.emailSol)!""))><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
                     <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustomerTaxInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustomerTaxInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustomerTaxInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustomerTaxInfo.ftl Mon Oct 16 11:31:40 2017
@@ -33,7 +33,7 @@ under the License.
         </select>
         <span>${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/>
 
-        <#if productStore.showTaxIsExempt?default("Y") == "Y">
+        <#if "Y" == productStore.showTaxIsExempt?default("Y")>
         <label><span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/></label>
         <#else>
         <input type="hidden" name="isExempt" value="N"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OptionSettings.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OptionSettings.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OptionSettings.ftl Mon Oct 16 11:31:40 2017
@@ -126,7 +126,7 @@ under the License.
                 <tr>
                   <td valign="top">
                   <label>
-                    <input type='radio' <#if cart.getMaySplit(shipGroupIndex)?default("N") == "N">checked="checked"</#if> name='${shipGroupIndex?default("0")}_may_split' value='false' />
+                    <input type='radio' <#if "N" == cart.getMaySplit(shipGroupIndex)?default("N")>checked="checked"</#if> name='${shipGroupIndex?default("0")}_may_split' value='false' />
                     ${uiLabelMap.FacilityWaitEntireOrderReady}
                   </label>
                   </td>
@@ -134,7 +134,7 @@ under the License.
                 <tr>
                   <td valign="top">
                     <label>
-                    <input <#if cart.getMaySplit(shipGroupIndex)?default("N") == "Y">checked="checked"</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true' />
+                    <input <#if "Y" == cart.getMaySplit(shipGroupIndex)?default("N")>checked="checked"</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true' />
                     ${uiLabelMap.FacilityShipAvailable}
                     </label>
                   </td>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl Mon Oct 16 11:31:40 2017
@@ -193,7 +193,7 @@ under the License.
         </td>
       </tr>
 
-      <#if cart.getOrderType() == "PURCHASE_ORDER">
+      <#if "PURCHASE_ORDER" == cart.getOrderType()>
         <tr>
           <td>&nbsp;</td>
           <td align='right' valign='top'>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl Mon Oct 16 11:31:40 2017
@@ -27,7 +27,7 @@ under the License.
     <#else>
     <li class="h3">
         ${uiLabelMap.CommonCreate}&nbsp;
-        <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+        <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
             ${uiLabelMap.OrderPurchaseOrder}
         <#else>
             ${uiLabelMap.OrderSalesOrder}

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl Mon Oct 16 11:31:40 2017
@@ -24,7 +24,7 @@ under the License.
   <div class="screenlet-title-bar">
     <ul>
       <li class="h3">
-        <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+        <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
             ${uiLabelMap.OrderPurchaseOrder}
         <#else>
             ${uiLabelMap.OrderSalesOrder}
@@ -32,7 +32,7 @@ under the License.
         :&nbsp;${stepTitle!}
       </li>
 
-      <#if isLastStep == "N">
+      <#if "N" == isLastStep>
         <li><a href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
       <#else>
         <li><a href="<@ofbizUrl>processorder</@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
@@ -40,7 +40,7 @@ under the License.
 
       <#list checkoutSteps?reverse as checkoutStep>
         <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
-        <#if checkoutStep.enabled == "N">
+        <#if "N" == checkoutStep.enabled>
             <li><span class="disabled">${stepUiLabel}</span></li>
         <#else>
             <li><a href="<@ofbizUrl>${checkoutStep.uri}</@ofbizUrl>">${stepUiLabel}</a></li>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Mon Oct 16 11:31:40 2017
@@ -22,14 +22,14 @@ under the License.
     <ul>
       <li class="h3">
         ${uiLabelMap.CommonCreate}&nbsp;
-        <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+        <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
             ${uiLabelMap.OrderPurchaseOrder}
         <#else>
             ${uiLabelMap.OrderSalesOrder}
         </#if>
       </li>
-      <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
-        <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)>
+      <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
+        <#if "_NA_" == shoppingCart.getOrderPartyId() || (shoppingCart.size() = 0)>
           <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
         <#else>
           <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&amp;finalizeReqCustInfo=false&amp;finalizeReqShipInfo=false&amp;finalizeReqOptions=false&amp;finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl Mon Oct 16 11:31:40 2017
@@ -25,18 +25,18 @@ under the License.
     </div>
     <div class="screenlet-body">
         <ul>
-            <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+            <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
               <li><a href="<@ofbizUrl>RequirementsForSupplier</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderRequirements}</a></li>
             </#if>
             <#if shoppingCart.getOrderType()?has_content && shoppingCart.items()?has_content>
               <li><a href="<@ofbizUrl>createQuoteFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateQuoteFromCart}</a></li>
               <li><a href="<@ofbizUrl>FindQuoteForCart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderQuotes}</a></li>
             </#if>
-            <#if shoppingCart.getOrderType() == "SALES_ORDER">
+            <#if "SALES_ORDER" == shoppingCart.getOrderType()>
               <li><a href="<@ofbizUrl>createCustRequestFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a></li>
             </#if>
             <li><a href="/partymgr/control/findparty?${externalKeyParam!}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li>
-            <#if shoppingCart.getOrderType() == "SALES_ORDER">
+            <#if "SALES_ORDER" == shoppingCart.getOrderType()>
               <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a></li>
             </#if>
             <li><a href="<@ofbizUrl>checkinits</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a></li>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SetAdditionalParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SetAdditionalParty.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SetAdditionalParty.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SetAdditionalParty.ftl Mon Oct 16 11:31:40 2017
@@ -35,7 +35,7 @@ under the License.
       <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
         <tr>
           <td align="right">
-            <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?? && additionalPartyType == "Person")> checked="checked"</#if> />
+            <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?? && "Person" == additionalPartyType)> checked="checked"</#if> />
       </td>
           <td>
             <label for="additionalPartyType_Person">${uiLabelMap.CommonPerson}</label>
@@ -43,7 +43,7 @@ under the License.
         </tr>
         <tr>
           <td align="right">
-            <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?? && additionalPartyType == "Group"> checked="checked"</#if> />
+            <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?? && "Group" == additionalPartyType> checked="checked"</#if> />
           </td>
           <td>
             <label for="additionalPartyType_Group">${uiLabelMap.CommonGroup}</label>
@@ -66,7 +66,7 @@ under the License.
   </tr>
 
   <#if additionalPartyType?? && additionalPartyType != "" && additionalPartyType != "None">
-    <#if additionalPartyType == "Person">
+    <#if "Person" == additionalPartyType>
       <#assign lookupPartyView="LookupPerson">
     <#else>
       <#assign lookupPartyView="LookupPartyGroup">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl Mon Oct 16 11:31:40 2017
@@ -20,23 +20,23 @@ under the License.
 <script language="javascript" type="text/javascript">
 //<![CDATA[
 function submitForm(form, mode, value) {
-    if (mode == "DN") {
+    if ("DN" == mode) {
         // done action; payment info
         form.action="<@ofbizUrl>updateShippingOptions/checkoutpayment</@ofbizUrl>";
         form.submit();
-    } else if (mode == "CS") {
+    } else if ("CS" == mode) {
         // continue shopping
         form.action="<@ofbizUrl>updateShippingOptions/showcart</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NA") {
+    } else if ("NA" == mode) {
         // new address
         form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=splitship&partyId=${cart.getPartyId()}&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SV") {
+    } else if ("SV" == mode) {
         // save option; return to current screen
         form.action="<@ofbizUrl>updateShippingOptions/splitship</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SA") {
+    } else if ("SA" == mode) {
         // selected shipping address
         form.action="<@ofbizUrl>updateShippingAddress/splitship</@ofbizUrl>";
         form.submit();
@@ -118,16 +118,16 @@ function submitForm(form, mode, value) {
                       <select name="maySplit" class="selectBox">
                         <#assign maySplitStr = cart.getMaySplit(groupIdx)?default("")>
                         <option value="">${uiLabelMap.OrderSplittingPreference}</option>
-                        <option value="false" <#if maySplitStr == "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
-                        <option value="true" <#if maySplitStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+                        <option value="false" <#if "N" == maySplitStr>selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+                        <option value="true" <#if "Y" == maySplitStr>selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
                       </select>
                     </div>
                     <div>
                       <select name="isGift" class="selectBox">
                         <#assign isGiftStr = cart.getIsGift(groupIdx)?default("")>
                         <option value="">${uiLabelMap.OrderIsGift} ?</option>
-                        <option value="false" <#if isGiftStr == "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
-                        <option value="true" <#if isGiftStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+                        <option value="false" <#if "N" == isGiftStr>selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+                        <option value="true" <#if "Y" == isGiftStr>selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
                       </select>
                     </div>
 

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl Mon Oct 16 11:31:40 2017
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#if (shoppingCart.getOrderType() == "SALES_ORDER")>
+<#if ("SALES_ORDER" == shoppingCart.getOrderType())>
     <#assign associatedProducts = Static["org.apache.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)!>
 </#if>
 

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl Mon Oct 16 11:31:40 2017
@@ -31,7 +31,7 @@ function gwAll(e) {
     var cform = document.cartform;
     var len = cform.elements.length;
     var selectedValue = e.value;
-    if (selectedValue == "") {
+    if ("" == selectedValue) {
         return;
     }
 
@@ -41,7 +41,7 @@ function gwAll(e) {
         var element = cform.elements[i];
         var ename = element.name;
         var sname = ename.substring(0,16);
-        if (sname == "option^GIFT_WRAP") {
+        if ("option^GIFT_WRAP" == sname) {
             var options = element.options;
             var olen = options.length;
             var matching = -1;
@@ -67,7 +67,7 @@ function quicklookup_popup(element) {
     obj_lookupwindow.focus();
 }
 function quicklookup(element) {
-    <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+    <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
     window.location='<@ofbizUrl>LookupBulkAddSupplierProducts</@ofbizUrl>?productId='+element.value;
     <#else>
     window.location='<@ofbizUrl>LookupBulkAddProducts</@ofbizUrl>?productId='+element.value;

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl Mon Oct 16 11:31:40 2017
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#if shoppingCart.getOrderType() == "SALES_ORDER">
+<#if "SALES_ORDER" == shoppingCart.getOrderType()>
 <div class="screenlet">
     <div class="screenlet-title-bar">
         <div class="h3">&nbsp;${uiLabelMap.OrderPromotionCouponCodes}</div>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl Mon Oct 16 11:31:40 2017
@@ -26,14 +26,14 @@ under the License.
         window.location='AddGiftCertificate';
     }
 </script>
-<#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+<#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
   <#assign target="productAvailabalityByFacility">
 <#else>
   <#assign target="getProductInventoryAvailable">
 </#if>
 <div class="screenlet">
     <div class="screenlet-body">
-      <#if shoppingCart.getOrderType() == "SALES_ORDER">
+      <#if "SALES_ORDER" == shoppingCart.getOrderType()>
         <div>
           <#if quantityOnHandTotal?? && availableToPromiseTotal?? && (productId)??>
             <ul>
@@ -135,7 +135,7 @@ under the License.
                     </div>
                   </td>
                 </tr>
-                <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+                <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
                 <tr>
                   <td align="right"><div>${uiLabelMap.OrderOrderItemType} :</div></td>
                   <td>
@@ -170,7 +170,7 @@ under the License.
             </form>
           </td>
         </tr>
-        <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+        <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
         <tr><td><hr /></td></tr>
         <tr>
           <td>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCartItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCartItems.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCartItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCartItems.ftl Mon Oct 16 11:31:40 2017
@@ -34,7 +34,7 @@ under the License.
   <#if (shoppingCartSize > 0)>
     <form method="post" action="<@ofbizUrl>modifycart</@ofbizUrl>" name="cartform" style="margin: 0;">
       <input type="hidden" name="removeSelected" value="false"/>
-      <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+      <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
         <input type="hidden" name="finalizeReqShipInfo" value="false"/>
         <input type="hidden" name="finalizeReqOptions" value="false"/>
         <input type="hidden" name="finalizeReqPayInfo" value="false"/>
@@ -169,7 +169,7 @@ under the License.
                 </td>
               </tr>
             </#if>
-            <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+            <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
               <#assign currentOrderItemType = cartLine.getItemTypeGenericValue()!/>
                 <tr>
                   <td>
@@ -280,7 +280,7 @@ under the License.
             </td>
             <td nowrap="nowrap" align="right">
               <div>
-                <#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))>
+                <#if cartLine.getIsPromo() || ("SALES_ORDER" == shoppingCart.getOrderType() && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))>
                   <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/>
                 <#else>
                     <#if (cartLine.getSelectedAmount() > 0) >

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl Mon Oct 16 11:31:40 2017
@@ -46,8 +46,8 @@ under the License.
       <td valign="middle">
         <div>
           <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" />&nbsp;
-          <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/order/template/entry/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl Mon Oct 16 11:31:40 2017
@@ -87,7 +87,7 @@ under the License.
         <a href="javascript:document.thecategoryform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</span></a>
       </form>
     </#if>
-    <#if searchInCategory?default("Y") == "Y">
+    <#if "Y" == searchInCategory?default("Y")>
         <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchInCategory}</a>
     </#if>
     <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", "html")!/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CompareProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CompareProducts.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CompareProducts.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CompareProducts.ftl Mon Oct 16 11:31:40 2017
@@ -42,7 +42,7 @@ under the License.
             <#assign priceStyle = "regularPrice">
         </#if>
 
-        <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")>
+        <#if (price.price?default(0) > 0 && "N" == product.requireAmount?default("N"))>
                 <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
         </#if>
     </#if>
@@ -54,18 +54,18 @@ under the License.
     <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)/>
                 <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
     <#-- check to see if it is a rental item; will enter parameters on the detail screen-->
-    <#elseif product.productTypeId! == "ASSET_USAGE"/>
+    <#elseif "ASSET_USAGE" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a>
-    <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/>
+    <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderRent}...</a>
     <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen-->
-    <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"/>
+    <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderConfigure}...</a>
     <#-- check to see if the product is a virtual product -->
-    <#elseif product.isVirtual?? && product.isVirtual == "Y"/>
+    <#elseif product.isVirtual?? && "Y" == product.isVirtual/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
     <#-- check to see if the product requires an amount -->
-    <#elseif product.requireAmount?? && product.requireAmount == "Y"/>
+    <#elseif product.requireAmount?? && "Y" == product.requireAmount/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
     <#else>
                 <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compareFormAdd${product_index}">
@@ -158,18 +158,18 @@ under the License.
     <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)/>
                 <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
     <#-- check to see if it is a rental item; will enter parameters on the detail screen-->
-    <#elseif product.productTypeId! == "ASSET_USAGE"/>
+    <#elseif "ASSET_USAGE" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a>
-    <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/>
+    <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderRent}...</a>
     <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen-->
-    <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"/>
+    <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderConfigure}...</a>
     <#-- check to see if the product is a virtual product -->
-    <#elseif product.isVirtual?? && product.isVirtual == "Y"/>
+    <#elseif product.isVirtual?? && "Y" == product.isVirtual/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
     <#-- check to see if the product requires an amount -->
-    <#elseif product.requireAmount?? && product.requireAmount == "Y"/>
+    <#elseif product.requireAmount?? && "Y" == product.requireAmount/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
     <#else>
                 <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compare2FormAdd${product_index}">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl Mon Oct 16 11:31:40 2017
@@ -58,15 +58,15 @@ ${virtualJavaScript!}
 
     function popupDetail() {
         var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
-        if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+        if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) {
             defaultDetailImage = "_NONE_";
         }
 
-        if (detailImageUrl == null || detailImageUrl == "null") {
+        if (detailImageUrl == null || "null" == detailImageUrl) {
             detailImageUrl = defaultDetailImage;
         }
 
-        if (detailImageUrl == "_NONE_") {
+        if ("_NONE_" == detailImageUrl) {
             hack = document.createElement('span');
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
@@ -287,7 +287,7 @@ function getConfigDetails() {
       <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style='margin: 0;'>
         <#assign inStock = true>
         <#-- Variant Selection -->
-        <#if product.isVirtual?? && product.isVirtual?upper_case == "Y">
+        <#if product.isVirtual?? && "Y" == product.isVirtual?upper_case>
           <#if variantTree?? && 0 < variantTree.size()>
             <#list featureSet as currentType>
               <div>
@@ -330,7 +330,7 @@ function getConfigDetails() {
         <#-- check to see if the product requires inventory check and has inventory -->
         <#else>
           <#if inStock>
-            <#if product.requireAmount?default("N") == "Y">
+            <#if "Y" == product.requireAmount?default("N")>
               <#assign hiddenStyle = "visible">
             <#else>
               <#assign hiddenStyle = "hidden">
@@ -628,7 +628,7 @@ function getConfigDetails() {
   </#if>
   <#if assocProducts?has_content>
     <tr><td>&nbsp;</td></tr>
-    <tr><td colspan="2"><h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2></td></tr>
+    <tr><td colspan="2"><h2>${beforeName!}<#if "Y" == showName>${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2></td></tr>
     <tr><td><hr /></td></tr>
     <#list assocProducts as productAssoc>
       <tr><td>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl Mon Oct 16 11:31:40 2017
@@ -26,15 +26,15 @@ ${virtualJavaScript!}
      function popupDetailInline(inlineCounter) {
         var imageField = 'detailImage' + inlineCounter;
         var defaultDetailImage = document.getElementById(imageField);
-        if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+        if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) {
             defaultDetailImage = "_NONE_";
         }
         var fieldName = 'detailImageUrl' + inlineCounter;
-        if (window[fieldName] == null || window[fieldName] == "null") {
+        if (window[fieldName] == null || "null" == window[fieldName]) {
             window[fieldName] = defaultDetailImage;
         }
 
-        if (window[fieldName] == "_NONE_") {
+        if ("_NONE_" == window[fieldName]) {
             hack = document.createElement('span');
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
@@ -230,7 +230,7 @@ ${virtualJavaScript!}
  </script>
 </#if>
 
-<#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+<#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
   <script language="JavaScript" type="text/javascript">
         function checkRadioButtoninline${inlineCounter}(inlineCounter, productId) {
         var add_product_id = 'add_product_id' + inlineCounter;
@@ -269,8 +269,8 @@ ${virtualJavaScript!}
     </td>
     <td align="right" valign="top" width="100%">
         <#assign inStock = true>
-        <#if product.isVirtual!?upper_case == "Y">
-        <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+        <#if "Y" == product.isVirtual!?upper_case>
+        <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
             <#list featureLists as featureList>
                 <#list featureList as feature>
                     <#if feature_index == 0>
@@ -286,7 +286,7 @@ ${virtualJavaScript!}
               <input type="hidden" name="product_id${inlineCounter}" value="${product.productId}"/>
               <input type="hidden" name="add_product_id${inlineCounter}" value="NULL"/>
           </#if>
-          <#if !product.virtualVariantMethodEnum?? || product.virtualVariantMethodEnum == "VV_VARIANTTREE">
+          <#if !product.virtualVariantMethodEnum?? || "VV_VARIANTTREE" == product.virtualVariantMethodEnum>
            <#if variantTree?? && (variantTree.size() > 0)>
             <#list featureSet as currentType>
               <div>
@@ -334,7 +334,7 @@ ${virtualJavaScript!}
         <#-- check to see if the product requires inventory check and has inventory -->
         <#elseif product.virtualVariantMethodEnum! != "VV_FEATURETREE">
           <#if inStock>
-            <#if product.requireAmount?default("N") == "Y">
+            <#if "Y" == product.requireAmount?default("N")>
               <#assign hiddenStyle = "visible">
             <#else>
               <#assign hiddenStyle = "hidden">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl Mon Oct 16 11:31:40 2017
@@ -48,8 +48,8 @@ under the License.
           <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" />
         </#if>
         <div>
-          <label for="SEARCH_OPERATOR_OR"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> />${uiLabelMap.CommonAny}</label>
-          <label for="SEARCH_OPERATOR_AND"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if searchOperator == "AND">checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
+          <label for="SEARCH_OPERATOR_OR"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAny}</label>
+          <label for="SEARCH_OPERATOR_AND"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
           <input type="submit" value="${uiLabelMap.CommonFind}" class="button" />
         </div>
       </fieldset>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl Mon Oct 16 11:31:40 2017
@@ -96,15 +96,15 @@ ${virtualJavaScript!}
 
     function popupDetail() {
         var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
-        if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+        if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) {
             defaultDetailImage = "_NONE_";
         }
 
-        if (detailImageUrl == null || detailImageUrl == "null") {
+        if (detailImageUrl == null || "null" == detailImageUrl) {
             detailImageUrl = defaultDetailImage;
         }
 
-        if (detailImageUrl == "_NONE_") {
+        if ("_NONE_" == detailImageUrl) {
             hack = document.createElement('span');
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
@@ -212,7 +212,7 @@ ${virtualJavaScript!}
     }
 
     function additemSubmit(){
-        <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+        <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
         newdatevalue = validate(document.addform.reservStart.value);
         if (newdatevalue == false) {
             document.addform.reservStart.focus();
@@ -226,8 +226,8 @@ ${virtualJavaScript!}
     }
 
     function addShoplistSubmit(){
-        <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
-        if (document.addToShoppingList.reservStartStr.value == "") {
+        <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
+        if ("" == document.addToShoppingList.reservStartStr.value) {
             document.addToShoppingList.submit();
         } else {
             newdatevalue = validate(document.addToShoppingList.reservStartStr.value);
@@ -245,7 +245,7 @@ ${virtualJavaScript!}
         </#if>
     }
 
-    <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+    <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
         function checkRadioButton() {
             var block1 = document.getElementById("addCart1");
             var block2 = document.getElementById("addCart2");
@@ -358,7 +358,7 @@ ${virtualJavaScript!}
             <#assign priceStyle = "regularPrice">
           </#if>
             ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
-             <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+             <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
             <#if product.reserv2ndPPPerc?? && product.reserv2ndPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?? || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons!1}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
             <#if product.reservNthPPPerc?? &&product.reservNthPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?? || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons!1}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
             <#if (!product.reserv2ndPPPerc?? || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?? || product.reservNthPPPerc == 0)><br />${uiLabelMap.ProductMaximum} ${product.reservMaxPersons!1} ${uiLabelMap.ProductPersons}.</#if>
@@ -371,7 +371,7 @@ ${virtualJavaScript!}
         <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
       </#if>
       <#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
-      <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")>
+      <#if (showPriceDetails?? && "Y" == showPriceDetails?default("N"))>
           <#if price.orderItemPriceInfos??>
               <#list price.orderItemPriceInfos as orderItemPriceInfo>
                   <div>${orderItemPriceInfo.description!}</div>
@@ -441,8 +441,8 @@ ${virtualJavaScript!}
         </#if>
         <#assign inStock = true>
         <#-- Variant Selection -->
-        <#if product.isVirtual!?upper_case == "Y">
-          <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+        <#if "Y" == product.isVirtual!?upper_case>
+          <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
             <#list featureLists as featureList>
                 <#list featureList as feature>
                     <#if feature_index == 0>
@@ -470,7 +470,7 @@ ${virtualJavaScript!}
               &nbsp;
             </div>
           </#if>
-          <#if !product.virtualVariantMethodEnum?? || product.virtualVariantMethodEnum == "VV_VARIANTTREE">
+          <#if !product.virtualVariantMethodEnum?? || "VV_VARIANTTREE" == product.virtualVariantMethodEnum>
            <#if variantTree?? && (variantTree.size() > 0)>
             <#list featureSet as currentType>
               <div>
@@ -520,7 +520,7 @@ ${virtualJavaScript!}
         <#-- check to see if the product requires inventory check and has inventory -->
         <#elseif product.virtualVariantMethodEnum! != "VV_FEATURETREE">
           <#if inStock>
-            <#if product.requireAmount?default("N") == "Y">
+            <#if "Y" == product.requireAmount?default("N")>
               <#assign hiddenStyle = "visible">
             <#else>
               <#assign hiddenStyle = "hidden">
@@ -529,7 +529,7 @@ ${virtualJavaScript!}
               <span style="white-space: nowrap;"><b>${uiLabelMap.CommonAmount}:</b></span>&nbsp;
               <input type="text" size="5" name="add_amount" value=""/>
             </div>
-            <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+            <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
                 <table width="100%"><tr>
                     <@htmlTemplate.renderDateTimeField name="reservStart" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="startDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     <@htmlTemplate.renderDateTimeField name="reservEnd" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="endDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
@@ -543,7 +543,7 @@ ${virtualJavaScript!}
                   </tr>
                 </table>
             <#else>
-                <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual!?upper_case == "Y"> disabled="disabled"</#if>/>
+                <input type="text" size="5" name="quantity" value="1"<#if "Y" == product.isVirtual!?upper_case> disabled="disabled"</#if>/>
             </#if>
             <#-- This calls addItem() so that variants of virtual products cant be added before distinguishing features are selected, it should not be changed to additemSubmit() -->
             <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>&nbsp;
@@ -571,7 +571,7 @@ ${virtualJavaScript!}
             <option value="">${uiLabelMap.OrderNewShoppingList}</option>
           </select>
           &nbsp;&nbsp;
-          <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+          <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
               <table><tr><td>&nbsp;</td><td align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" /></td><td>Number of&nbsp;days</td><td><input type="text" size="4" name="reservLength" /></td><td>&nbsp;</td><td align="right">Number of&nbsp;persons</td><td><input type="text" size="4" name="reservPersons" value="1" /></td><td align="right">Qty&nbsp;</td><td><input type="text" size="5" name="quantity" value="1" /></td></tr></table>
           <#else>
               <input type="text" size="5" name="quantity" value="1"/>
@@ -651,7 +651,7 @@ ${virtualJavaScript!}
     <#assign targetRequest = targetRequestName>
   </#if>
   <#if assocProducts?has_content>
-    <h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2>
+    <h2>${beforeName!}<#if "Y" == showName>${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2>
 
     <div class="productsummary-container">
     <#list assocProducts as productAssoc>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl Mon Oct 16 11:31:40 2017
@@ -53,7 +53,7 @@ ${virtualJavaScript!}
 </script>
 <#if product??>
     <#-- variable setup -->
-    <#if backendPath?default("N") == "Y">
+    <#if "Y" == backendPath?default("N")>
         <#assign productUrl><@ofbizCatalogUrl productId=product.productId productCategoryId=categoryId/></#assign>
     <#else>
         <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId productCategoryId=categoryId/></#assign>
@@ -111,18 +111,18 @@ ${virtualJavaScript!}
           <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
             <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
           <#-- check to see if it is a rental item; will enter parameters on the detail screen-->
-          <#elseif product.productTypeId! == "ASSET_USAGE">
+          <#elseif "ASSET_USAGE" == product.productTypeId!>
             <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a>
           <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen-->
-          <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE">
+          <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!>
             <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderConfigure}...</a>
           <#-- check to see if the product is a virtual product -->
-          <#elseif product.isVirtual?? && product.isVirtual == "Y">
+          <#elseif product.isVirtual?? && "Y" == product.isVirtual>
             <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
           <#-- check to see if the product requires an amount -->
-          <#elseif product.requireAmount?? && product.requireAmount == "Y">
+          <#elseif product.requireAmount?? && "Y" == product.requireAmount>
             <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
-          <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN">
+          <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!>
             <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderRent}...</a>
           <#else>
             <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}form" style="margin: 0;">
@@ -210,7 +210,7 @@ ${virtualJavaScript!}
                     <#assign priceStyle = "regularPrice">
                   </#if>
 
-                  <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")>
+                  <#if (price.price?default(0) > 0 && "N" == product.requireAmount?default("N"))>
                     ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
                   </#if>
                 </b>
@@ -221,7 +221,7 @@ ${virtualJavaScript!}
                 </#if>
                 </#if>
                 <#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
-                <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")>
+                <#if (showPriceDetails?? && "Y" == showPriceDetails?default("N"))>
                     <#if price.orderItemPriceInfos??>
                         <#list price.orderItemPriceInfos as orderItemPriceInfo>
                             <div>${orderItemPriceInfo.description!}</div>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl Mon Oct 16 11:31:40 2017
@@ -50,7 +50,7 @@ under the License.
     <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
       ${uiLabelMap.ProductNoLongerAvailable}
     <#-- check to see if the product is a virtual product -->
-    <#elseif product.isVirtual?default("N") == "Y">
+    <#elseif "Y" == product.isVirtual?default("N")>
         <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
     <#else>
         <input type="text" size="5" name="quantity_${product.productId}" value="" />

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl Mon Oct 16 11:31:40 2017
@@ -115,8 +115,8 @@ under the License.
                 <td width="5">&nbsp;</td>
                 <td valign="top" width="80%">
                     <div>
-                        <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if>
-                        <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if>
+                        <#if "N" == maySplit?default("N")>${uiLabelMap.FacilityWaitEntireOrderReady}</#if>
+                        <#if "Y" == maySplit?default("Y")>${uiLabelMap.FacilityShipAvailable}</#if>
                     </div>
                 </td>
             </tr>
@@ -143,8 +143,8 @@ under the License.
                 <td width="5">&nbsp;</td>
                 <td valign="top" width="80%">
                     <div>
-                        <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if>
-                        <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if>
+                        <#if "N" == isGift?default("N")>${uiLabelMap.OrderThisOrderNotGift}</#if>
+                        <#if "Y" == isGift?default("N")>${uiLabelMap.OrderThisOrderGift}</#if>
                     </div>
                 </td>
             </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderItems.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderItems.ftl Mon Oct 16 11:31:40 2017
@@ -40,7 +40,7 @@ under the License.
             <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)!>
             <tr><td colspan="6"><hr /></td></tr>
             <tr>
-              <#if orderItem.productId?? && orderItem.productId == "_?_">
+              <#if orderItem.productId?? && "_?_" == orderItem.productId>
                 <td colspan="1" valign="top">
                   <b><div> &gt;&gt; ${orderItem.itemDescription}</div></b>
                 </td>
@@ -75,7 +75,7 @@ under the License.
               </#if>
             </tr>
             <#-- show info from workeffort if it was a rental item -->
-            <#if orderItem.orderItemTypeId?? && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
+            <#if orderItem.orderItemTypeId?? && "RENTAL_ORDER_ITEM" == orderItem.orderItemTypeId>
                 <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!>
                 <#if WorkOrderItemFulfillments?has_content>
                     <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
@@ -95,7 +95,7 @@ under the License.
                     <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}</b>&nbsp;
                     <#if orderItemAdjustment.description?has_content>: ${StringUtil.wrapString(orderItemAdjustment.get("description",locale))}</#if>
 
-                    <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
+                    <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId>
                       <#if orderItemAdjustment.primaryGeoId?has_content>
                         <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
                         <#if primaryGeo.geoName?has_content>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl Mon Oct 16 11:31:40 2017
@@ -28,7 +28,7 @@ under the License.
         <#-- offline payment address infomation :: change this to use Company's address -->
         <#if !paymentMethod?has_content && paymentMethodType?has_content>
           <tr>
-            <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE">
+            <#if "EXT_OFFLINE" == paymentMethodType.paymentMethodTypeId>
               <td colspan="3" valign="top">
                 <div align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div>
                 <#if orderHeader?has_content && paymentAddress?has_content>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl Mon Oct 16 11:31:40 2017
@@ -105,7 +105,7 @@ under the License.
                     </select>
                   </td>
                 </tr>
-                <#if orderHeader.orderTypeId == "PURCHASE_ORDER" && purchaseOrderItemTypeList?has_content>
+                <#if "PURCHASE_ORDER" == orderHeader.orderTypeId && purchaseOrderItemTypeList?has_content>
                 <tr>
                   <td class="label">${uiLabelMap.OrderOrderItemType}</td>
                   <td>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl Mon Oct 16 11:31:40 2017
@@ -70,7 +70,7 @@ under the License.
                       <tr>
                           <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!>
                           <#assign productId = orderItem.productId!>
-                          <#if productId?? && productId == "shoppingcart.CommentLine">
+                          <#if productId?? && "shoppingcart.CommentLine" == productId>
                               <td colspan="8" valign="top">
                                   <span class="label">&gt;&gt; ${orderItem.itemDescription}</span>
                               </td>
@@ -151,7 +151,7 @@ under the License.
                                     </#if>
                                   </#list>
                                 </#if>
-                                <#if orderHeader.orderTypeId == "PURCHASE_ORDER">
+                                <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>
                                   <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)>
                                 <#else>
                                   <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double)>
@@ -162,7 +162,7 @@ under the License.
                               </td>
                               <td class="align-text" valign="top" nowrap="nowrap">
                                   <#-- check for permission to modify price -->
-                                  <#if (allowPriceChange) && !(orderItem.statusId == "ITEM_CANCELLED" || orderItem.statusId == "ITEM_COMPLETED")>
+                                  <#if (allowPriceChange) && !("ITEM_CANCELLED" == orderItem.statusId || "ITEM_COMPLETED" == orderItem.statusId)>
                                       <input type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/>
                                       &nbsp;<input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/>
                                   <#else>
@@ -213,7 +213,7 @@ under the License.
                                       <span class="label">${uiLabelMap.OrderAdjustment}</span>&nbsp;${adjustmentType.get("description",locale)}&nbsp;
                                       ${orderItemAdjustment.get("description",locale)!} (${orderItemAdjustment.comments?default("")})
 
-                                      <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
+                                      <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId>
                                       <#if orderItemAdjustment.primaryGeoId?has_content>
                                       <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
                                       <span class="label">${uiLabelMap.OrderJurisdiction}</span>&nbsp;${primaryGeo.geoName} [${primaryGeo.abbreviation!}]
@@ -300,7 +300,7 @@ under the License.
             <#assign adjustmentAmount = Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)>
             <#assign orderAdjustmentId = orderHeaderAdjustment.get("orderAdjustmentId")>
             <#assign productPromoCodeId = ''>
-            <#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT" && orderHeaderAdjustment.get("productPromoId")?has_content>
+            <#if "PROMOTION_ADJUSTMENT" == adjustmentType.get("orderAdjustmentTypeId") && orderHeaderAdjustment.get("productPromoId")?has_content>
                 <#assign productPromo = orderHeaderAdjustment.getRelatedOne("ProductPromo", false)>
                 <#assign productPromoCodes = delegator.findByAnd("ProductPromoCode", {"productPromoId":productPromo.productPromoId}, null, false)>
                 <#assign orderProductPromoCode = ''>
@@ -344,7 +344,7 @@ under the License.
                 <form name="deleteOrderAdjustment${orderAdjustmentId}" method="post" action="<@ofbizUrl>deleteOrderAdjustment</@ofbizUrl>">
                     <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/>
                     <input type="hidden" name="orderId" value="${orderId!}"/>
-                    <#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT">
+                    <#if "PROMOTION_ADJUSTMENT" == adjustmentType.get("orderAdjustmentTypeId")>
                         <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/>
                     </#if>
                 </form>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl Mon Oct 16 11:31:40 2017
@@ -38,7 +38,7 @@ function toggleOrderId(master) {
     var orders = form.elements.length;
     for (var i = 0; i < orders; i++) {
         var element = form.elements[i];
-        if (element.name == "orderIdList") {
+        if ("orderIdList" == element.name) {
             element.checked = master.checked;
         }
     }
@@ -57,7 +57,7 @@ function toggleOrderIdList() {
     var isAllSelected = true;
     for (var i = 0; i < orders; i++) {
         var element = form.elements[i];
-        if (element.name == "orderIdList" && !element.checked)
+        if ("orderIdList" == element.name && !element.checked)
             isAllSelected = false;
     }
     jQuery('#checkAllOrders').attr("checked", isAllSelected);
@@ -127,7 +127,7 @@ function toggleOrderIdList() {
   <div class="screenlet-title-bar">
     <ul>
       <li class="h3">${uiLabelMap.OrderFindOrder}</li>
-      <#if requestParameters.hideFields?default("N") == "Y">
+      <#if "Y" == requestParameters.hideFields?default("N")>
         <li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li>
       <#else>
         <#if orderList??><li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields?default("Y")}.submit()">${uiLabelMap.CommonHideFields}</a></li></#if>
@@ -415,7 +415,7 @@ function toggleOrderIdList() {
                     <tr>
                       <td nowrap="nowrap">
                         <input type="checkbox" id="filterInventoryProblems" name="filterInventoryProblems" value="Y"
-                            <#if requestParameters.filterInventoryProblems?default("N") == "Y">checked="checked"</#if> />
+                            <#if "Y" == requestParameters.filterInventoryProblems?default("N")>checked="checked"</#if> />
                       </td>
                     </tr>
                   </table>
@@ -429,7 +429,7 @@ function toggleOrderIdList() {
                     <tr>
                       <td nowrap="nowrap">
                         <input type="checkbox" id="filterPartiallyReceivedPOs" name="filterPartiallyReceivedPOs" value="Y"
-                            <#if requestParameters.filterPartiallyReceivedPOs?default("N") == "Y">checked="checked"</#if> />
+                            <#if "Y" == requestParameters.filterPartiallyReceivedPOs?default("N")>checked="checked"</#if> />
                       </td>
                     </tr>
                   </table>
@@ -443,7 +443,7 @@ function toggleOrderIdList() {
                     <tr>
                       <td nowrap="nowrap">
                         <input type="checkbox" id="filterPOsOpenPastTheirETA" name="filterPOsOpenPastTheirETA" value="Y"
-                            <#if requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y">checked="checked"</#if> />
+                            <#if "Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")>checked="checked"</#if> />
                       </td>
                     </tr>
                   </table>
@@ -457,7 +457,7 @@ function toggleOrderIdList() {
                     <tr>
                       <td nowrap="nowrap">
                         <input type="checkbox" id="filterPOsWithRejectedItems" name="filterPOsWithRejectedItems" value="Y"
-                            <#if requestParameters.filterPOsWithRejectedItems?default("N") == "Y">checked="checked"</#if> />
+                            <#if "Y" == requestParameters.filterPOsWithRejectedItems?default("N")>checked="checked"</#if> />
                       </td>
                     </tr>
                   </table>
@@ -605,7 +605,7 @@ document.lookuporder.orderId.focus();
           <td width="10%" align="right">${uiLabelMap.OrderRemainingSubTotal}</td>
           <td width="10%" align="right">${uiLabelMap.OrderOrderTotal}</td>
           <td width="5%">&nbsp;</td>
-            <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
+            <#if ("Y" == requestParameters.filterInventoryProblems?default("N")) || ("Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" == requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" == requestParameters.filterPartiallyReceivedPOs?default("N"))>
               <td width="10%">${uiLabelMap.CommonStatus}</td>
               <td width="5%">${uiLabelMap.CommonFilter}</td>
             <#else>
@@ -621,7 +621,7 @@ document.lookuporder.orderId.focus();
             <#assign orh = Static["org.apache.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
             <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)>
             <#assign orderType = orderHeader.getRelatedOne("OrderType", true)>
-            <#if orderType.orderTypeId == "PURCHASE_ORDER">
+            <#if "PURCHASE_ORDER" == orderType.orderTypeId>
               <#assign displayParty = orh.getSupplierAgent()!>
             <#else>
               <#assign displayParty = orh.getPlacingParty()!>
@@ -658,7 +658,7 @@ document.lookuporder.orderId.focus();
               <td>&nbsp;</td>
               <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
               </td>
-              <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
+              <#if ("Y" == requestParameters.filterInventoryProblems?default("N")) || ("Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" == requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" == requestParameters.filterPartiallyReceivedPOs?default("N"))>
                   <td>
                       <#if filterInventoryProblems.contains(orderHeader.orderId)>
                         Inv&nbsp;

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl Mon Oct 16 11:31:40 2017
@@ -24,7 +24,7 @@ under the License.
       <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId!}" />
       <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId!}" />
       <select name="contactMechId">
-        <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
+        <#if "POSTAL_ADDRESS" == contactMech.contactMechTypeId>
           <option value="${contactMechAddress.contactMechId}">${(contactMechAddress.address1)?default("")} - ${contactMechAddress.city?default("")}</option>
           <option value="${contactMechAddress.contactMechId}"></option>
           <#list contactMechList as contactMech>
@@ -36,7 +36,7 @@ under the License.
               </#if>
             </#list>
           </#list>
-        <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER">
+        <#elseif "TELECOM_NUMBER" == contactMech.contactMechTypeId>
           <option value="${contactMechAddress.contactMechId}">${contactMechAddress.countryCode!} <#if contactMechAddress.areaCode??>${contactMechAddress.areaCode}-</#if>${contactMechAddress.contactNumber}</option>
           <option value="${contactMechAddress.contactMechId}"></option>
           <#list contactMechList as contactMech>
@@ -48,7 +48,7 @@ under the License.
                </#if>
              </#list>
           </#list>
-        <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS">
+        <#elseif "EMAIL_ADDRESS" == contactMech.contactMechTypeId>
           <option value="${contactMechAddress.contactMechId}">${(contactMechAddress.infoString)?default("")}</option>
           <option value="${contactMechAddress.contactMechId}"></option>
           <#list contactMechList as contactMech>
@@ -113,7 +113,7 @@ under the License.
             </td>
             <td width="1%">&nbsp;</td>
             <td valign="top" width="80%">
-              <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
+              <#if "POSTAL_ADDRESS" == contactMech.contactMechTypeId>
                 <#assign postalAddress = orderContactMechValueMap.postalAddress>
                 <#if postalAddress?has_content>
                   <div>
@@ -122,18 +122,18 @@ under the License.
                   </div>
                   <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=postalContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=postalAddress! />
                 </#if>
-              <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER">
+              <#elseif "TELECOM_NUMBER" == contactMech.contactMechTypeId>
                 <#assign telecomNumber = orderContactMechValueMap.telecomNumber>
                 <div>
                   ${telecomNumber.countryCode!}
                   <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}
-                  <#if !telecomNumber.countryCode?? || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1">
+                  <#if !telecomNumber.countryCode?? || "011" == telecomNumber.countryCode || "1" == telecomNumber.countryCode>
                     <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
                    <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
                   </#if>
                 </div>
                 <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=telecomContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=telecomNumber! />
-              <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS">
+              <#elseif "EMAIL_ADDRESS" == contactMech.contactMechTypeId>
                 <div>
                   ${contactMech.infoString}
                   <#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)>
@@ -143,7 +143,7 @@ under the License.
                   </#if>
                 </div>
                 <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=emailContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=contactMech! />
-              <#elseif contactMech.contactMechTypeId == "WEB_ADDRESS">
+              <#elseif "WEB_ADDRESS" == contactMech.contactMechTypeId>
                 <div>
                   ${contactMech.infoString}
                   <#assign openString = contactMech.infoString>