svn commit: r1812285 [1/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 [1/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
Author: deepak
Date: Mon Oct 16 11:31:40 2017
New Revision: 1812285

URL: http://svn.apache.org/viewvc?rev=1812285&view=rev
Log:
Improved: Inconsistent String Comparisons, Applied patch for ftl file.
Thanks Devanshu Vyas for your contribution. (OFBIZ-9254)

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/common/CreditCardFields.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualTx.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransSearchResult.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/ChartOfAccount.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/DepositSlip.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSContentEdit.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/survey/ViewSurveyResponses.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/BomSimulation.ftl
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/AdditionalPartyListing.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustSettings.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CustomerTaxInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OptionSettings.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCatalogTabBar.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryCheckOutTabBar.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SetAdditionalParty.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCartItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CompareProducts.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportBody.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportConditions.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/Transitions.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItemInc.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItems.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/setup/PaymentSetup.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/visit/ShowVisits.ftl
    ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl
    ofbiz/ofbiz-framework/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl
    ofbiz/ofbiz-framework/trunk/applications/workeffort/template/workeffort/EventReminderEmail.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityRefMain.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewLabels.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewReferences.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameter.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/includes/GeoLocation.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Simple.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
    ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl Mon Oct 16 11:31:40 2017
@@ -24,7 +24,7 @@ function toggleInvoiceId(master) {
     var invoices = form.elements.length;
     for (var i = 0; i < invoices; i++) {
         var element = form.elements[i];
-        if (element.name == "invoiceIds") {
+        if ("invoiceIds" == element.name) {
             element.checked = master.checked;
         }
     }
@@ -39,7 +39,7 @@ function runAction() {
     var invoices = form.elements.length;
     for (var i = 0; i < invoices; i++) {
         var element = form.elements[i];
-        if (element.name == "invoiceIds") {
+        if ("invoiceIds" == element.name) {
             element.disabled = false;
         }
     }
@@ -52,7 +52,7 @@ function enableSubmitButton() {
     var isAllSelected = true;
     for (var i = 0; i < invoices; i++) {
         var element = form.elements[i];
-        if (element.name == "invoiceIds") {
+        if ("invoiceIds" == element.name) {
             if (element.checked) {
                 isSingle = false;
             } else {

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/common/CreditCardFields.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/common/CreditCardFields.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/common/CreditCardFields.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/common/CreditCardFields.ftl Mon Oct 16 11:31:40 2017
@@ -38,10 +38,10 @@ under the License.
     <td width="74%">
       <select name="titleOnCard">
         <option value="">${uiLabelMap.CommonSelectOne}</option>
-        <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected="selected"</#if>>${uiLabelMap.CommonTitleMr}</option>
-        <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected="selected"</#if>>${uiLabelMap.CommonTitleMrs}</option>
-        <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected="selected"</#if>>${uiLabelMap.CommonTitleMs}</option>
-        <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected="selected"</#if>>${uiLabelMap.CommonTitleDr}</option>
+        <option<#if ("${uiLabelMap.CommonTitleMr}" == (creditCard.titleOnCard)?default(""))> selected="selected"</#if>>${uiLabelMap.CommonTitleMr}</option>
+        <option<#if ("Mrs." == (creditCard.titleOnCard)?default(""))> selected="selected"</#if>>${uiLabelMap.CommonTitleMrs}</option>
+        <option<#if ("Ms." == (creditCard.titleOnCard)?default(""))> selected="selected"</#if>>${uiLabelMap.CommonTitleMs}</option>
+        <option<#if ("Dr." == (creditCard.titleOnCard)?default(""))> selected="selected"</#if>>${uiLabelMap.CommonTitleDr}</option>
       </select>
     </td>
   </tr>
@@ -72,13 +72,13 @@ under the License.
     <td width="74%">
       <select name="suffixOnCard">
         <option value="">${uiLabelMap.CommonSelectOne}</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected="selected"</#if>>Jr.</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected="selected"</#if>>Sr.</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected="selected"</#if>>I</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected="selected"</#if>>II</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected="selected"</#if>>III</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected="selected"</#if>>IV</option>
-        <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected="selected"</#if>>V</option>
+        <option<#if ("Jr." == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>Jr.</option>
+        <option<#if ("Sr." == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>Sr.</option>
+        <option<#if ("I" == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>I</option>
+        <option<#if ("II" == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>II</option>
+        <option<#if ("III" == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>III</option>
+        <option<#if ("IV" == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>IV</option>
+        <option<#if ("V" == (creditCard.suffixOnCard)?default(""))> selected="selected"</#if>>V</option>
       </select>
     </td>
   </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl Mon Oct 16 11:31:40 2017
@@ -23,7 +23,7 @@ function togglefinAccountTransId(master)
     var finAccountTransList = form.elements.length;
     for (var i = 0; i < finAccountTransList; i++) {
         var element = form.elements[i];
-        if (element.type == "checkbox") {
+        if ("checkbox" == element.type) {
             element.checked = master.checked;
         }
     }
@@ -96,7 +96,7 @@ function getFinAccountTransRunningTotalA
         <input name="reconciledBalanceWithUom" type="hidden" id="reconciledBalanceWithUom" value="<@ofbizCurrency amount=(glReconciliation.reconciledBalance)?default('0')/>"/>
       </#if>
       <#assign glReconciliations = delegator.findByAnd("GlReconciliation", {"glAccountId" : finAccount.postToGlAccountId!, "statusId" : "GLREC_CREATED"}, Static["org.apache.ofbiz.base.util.UtilMisc"].toList("reconciledDate DESC"), false)>
-      <#if (glReconciliationId?has_content && (glReconciliationId == "_NA_" && finAccountTransList?has_content)) || !grandTotal??>
+      <#if (glReconciliationId?has_content && ("_NA_" == glReconciliationId && finAccountTransList?has_content)) || !grandTotal??>
         <div align="right">
           <#if grandTotal??>
             <#if glReconciliations?has_content>
@@ -138,7 +138,7 @@ function getFinAccountTransRunningTotalA
               <th>${uiLabelMap.AccountingRemoveFromGlReconciliation}</th>
             </#if>
           </#if>
-          <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??>
+          <#if ((glReconciliationId?has_content && "_NA_" == glReconciliationId) && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??>
             <th><label>${uiLabelMap.CommonSelectAll} <input name="selectAll" type="checkbox" value="N" id="checkAllTransactions" onclick="javascript:togglefinAccountTransId(this);"/></label></th>
           </#if>
         </tr>
@@ -264,13 +264,13 @@ function getFinAccountTransRunningTotalA
             </#if>
             <#if !(grandTotal??)>
               <#if (parameters.glReconciliationId?has_content && parameters.glReconciliationId != "_NA_")>
-                <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED">
+                <#if "FINACT_TRNS_CREATED" == finAccountTrans.statusId>
                   <td><a href="javascript:document.removeFinAccountTransFromReconciliation_${finAccountTrans.finAccountTransId}.submit();" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
                 </#if>
               </#if>
             </#if>
-            <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??>
-              <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED">
+            <#if ((glReconciliationId?has_content && "_NA_" == glReconciliationId) && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??>
+              <#if "FINACT_TRNS_CREATED" == finAccountTrans.statusId>
                 <td><input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="checkbox" value="Y" onclick="javascript:getFinAccountTransRunningTotalAndBalances();"/></td>
               </#if>
             </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Oct 16 11:31:40 2017
@@ -187,7 +187,7 @@ under the License.
               <td><#if paymentMethodType?has_content>${paymentMethodType.description!}</#if></td>
               <td><#if status?has_content>${status.description!}</#if></td>
               <td>${finAccountTrans.comments!}</td>
-              <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED">
+              <#if "FINACT_TRNS_CREATED" == finAccountTrans.statusId>
                 <td align="center"><a href="javascript:document.reomveFinAccountTransAssociation_${finAccountTrans.finAccountTransId}.submit();" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
               <#else>
                 <td/>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl Mon Oct 16 11:31:40 2017
@@ -76,7 +76,7 @@ under the License.
        <td>
          <#if acctgTransEntry.organizationPartyId?has_content>
            <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : acctgTransEntry.organizationPartyId}, false)>
-           <#if partyName.partyTypeId == "PERSON">
+           <#if "PERSON" == partyName.partyTypeId>
              ${partyName.firstName!} ${partyName.lastName!}
            <#elseif (partyName.partyTypeId) != "PARTY_GROUP">
              ${partyName.groupName!}

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl Mon Oct 16 11:31:40 2017
@@ -23,7 +23,7 @@ function togglePaymentId(master) {
     var payments = form.elements.length;
     for (var i = 0; i < payments; i++) {
         var element = form.elements[i];
-        if (element.name == "paymentIds") {
+        if ("paymentIds" == element.name) {
             element.checked = master.checked;
         }
     }
@@ -36,7 +36,7 @@ function getPaymentRunningTotal() {
     var isAllSelected = true;
     for (var i = 0; i < payments; i++) {
         var element = form.elements[i];
-        if (element.name == "paymentIds") {
+        if ("paymentIds" == element.name) {
             if (element.checked) {
                 isSingle = false;
             } else {

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl Mon Oct 16 11:31:40 2017
@@ -18,8 +18,8 @@ under the License.
 -->
 
     <#-- reference number -->
-    <#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_CAPTURE" ||
-         txType?default("") == "PRDS_PAY_RELEASE" || txType?default("") == "PRDS_PAY_REFUND">
+    <#if "PRDS_PAY_CREDIT" == txType?default("") || "PRDS_PAY_CAPTURE" == txType?default("") ||
+         "PRDS_PAY_RELEASE" == txType?default("") || "PRDS_PAY_REFUND" == txType?default("")>
       ${setRequestAttribute("validTx", "true")}
       <#assign validTx = true>
       <tr><td colspan="3"><hr /></td></tr>
@@ -41,7 +41,7 @@ under the License.
       </tr>
     </#if>
     <#-- manual credit card information -->
-    <#if txType?default("") == "PRDS_PAY_RELEASE">
+    <#if "PRDS_PAY_RELEASE" == txType?default("")>
       <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">
@@ -51,7 +51,7 @@ under the License.
       </script>
       </td></tr>
     </#if>
-    <#if txType?default("") == "PRDS_PAY_REFUND">
+    <#if "PRDS_PAY_REFUND" == txType?default("")>
       <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">
@@ -61,7 +61,7 @@ under the License.
       </script>
       </td></tr>
     </#if>
-    <#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_AUTH">
+    <#if "PRDS_PAY_CREDIT" == txType?default("") || "PRDS_PAY_AUTH" == txType?default("")>
       <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualTx.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualTx.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualTx.ftl Mon Oct 16 11:31:40 2017
@@ -78,13 +78,13 @@ under the License.
       </tr>
 
       <#-- payment method information -->
-      <#if paymentMethodType?has_content && paymentMethodTypeId == "CREDIT_CARD">
+      <#if paymentMethodType?has_content && "CREDIT_CARD" == paymentMethodTypeId>
         ${screens.render("component://accounting/widget/PaymentScreens.xml#manualCCTx")}
-      <#elseif paymentMethodType?has_content && paymentMethodTypeId == "GIFT_CARD">
+      <#elseif paymentMethodType?has_content && "GIFT_CARD" == paymentMethodTypeId>
         ${screens.render("component://accounting/widget/PaymentScreens.xml#manualGCTx")}
       </#if>
 
-     <#if requestAttributes.validTx?default("false") == "true">
+     <#if "true" == requestAttributes.validTx?default("false")>
         <tr><td colspan="3"><hr/></td></tr>
         <#-- amount field -->
         <tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl Mon Oct 16 11:31:40 2017
@@ -159,7 +159,7 @@ by hand from a real template using a rul
                                                             <fo:block text-align="end">${paymentApplication.getBigDecimal("amountApplied").setScale(decimals, rounding).toString()}</fo:block>
                                                         </fo:table-cell>
                                                     </fo:table-row>
-                                                        <#if invoice.invoiceTypeId! == "PAYROL_INVOICE">
+                                                        <#if "PAYROL_INVOICE" == invoice.invoiceTypeId!>
                                                             <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!>
                                                             <#assign PayrolGroups = PayrolGroup!>
                                                             <#list PayrolGroups as payrolGroup>
@@ -345,7 +345,7 @@ by hand from a real template using a rul
                                                         </fo:table-cell>
                                                     </fo:table-row>
                                                     
-                                                    <#if invoice.invoiceTypeId! == "PAYROL_INVOICE">
+                                                    <#if "PAYROL_INVOICE" == invoice.invoiceTypeId!>
                                                         <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!>
                                                         <#assign PayrolGroups = PayrolGroup!>
                                                         <#list PayrolGroups as payrolGroup>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl Mon Oct 16 11:31:40 2017
@@ -31,9 +31,9 @@ under the License.
                 <#if acctgTransEntryList?has_content>
                     <fo:block>${uiLabelMap.AccountingAcctgTransEntriesFor}
                         <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : parameters.get('ApplicationDecorator|organizationPartyId')}, false))!>
-                        <#if partyName.partyTypeId == "PERSON">
+                        <#if "PERSON" == partyName.partyTypeId>
                             ${(partyName.firstName)!} ${(partyName.lastName)!}
-                        <#elseif (partyName.partyTypeId)! == "PARTY_GROUP">
+                        <#elseif "PARTY_GROUP" == (partyName.partyTypeId)!>
                             ${(partyName.groupName)!}
                         </#if>
                     </fo:block>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransSearchResult.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransSearchResult.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransSearchResult.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/AcctgTransSearchResult.fo.ftl Mon Oct 16 11:31:40 2017
@@ -31,9 +31,9 @@ under the License.
                     <fo:block>${uiLabelMap.AccountingAcctgTransFor}
                         <#if (organizationPartyId)??>
                             <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!>
-                            <#if partyName.partyTypeId == "PERSON">
+                            <#if "PERSON" == partyName.partyTypeId>
                                 ${(partyName.firstName)!} ${(partyName.lastName)!}
-                            <#elseif (partyName.partyTypeId)! == "PARTY_GROUP">
+                            <#elseif "PARTY_GROUP" == (partyName.partyTypeId)!>
                                 ${(partyName.groupName)!}
                             </#if>
                         </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/ChartOfAccount.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/ChartOfAccount.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/ChartOfAccount.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/ChartOfAccount.fo.ftl Mon Oct 16 11:31:40 2017
@@ -31,9 +31,9 @@ under the License.
                     <fo:block>${uiLabelMap.AccountingChartOfAcctsFor}
                         <#if (organizationPartyId)??>
                             <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!>
-                            <#if partyName.partyTypeId == "PERSON">
+                            <#if "PERSON" == partyName.partyTypeId>
                                 ${(partyName.firstName)!} ${(partyName.lastName)!}
-                            <#elseif (partyName.partyTypeId)! == "PARTY_GROUP">
+                            <#elseif "PARTY_GROUP" == (partyName.partyTypeId)!>
                                 ${(partyName.groupName)!}
                             </#if>
                         </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/DepositSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/DepositSlip.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/DepositSlip.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/DepositSlip.fo.ftl Mon Oct 16 11:31:40 2017
@@ -70,7 +70,7 @@ under the License.
                         </#if>
                         <#if payment.paymentMethodTypeId?has_content>
                             <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, false)/>
-                            <#if payment.paymentMethodTypeId! == "CREDIT_CARD">
+                            <#if "CREDIT_CARD" == payment.paymentMethodTypeId!>
                                 <#assign creditCard = delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false)/>
                             </#if>
                         </#if>
@@ -89,9 +89,9 @@ under the License.
                             <fo:table-cell padding="2pt" border="1pt solid" border-width=".1mm">
                                 <fo:block text-align="right">
                                     <#if partyName?has_content>
-                                        <#if partyName.partyTypeId == "PERSON">
+                                        <#if "PERSON" == partyName.partyTypeId>
                                             ${(partyName.firstName)!} ${(partyName.lastName)!}
-                                        <#elseif (partyName.partyTypeId)! == "PARTY_GROUP">
+                                        <#elseif "PARTY_GROUP" == (partyName.partyTypeId)!>
                                             ${(partyName.groupName)!}
                                         </#if>
                                     </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl Mon Oct 16 11:31:40 2017
@@ -112,10 +112,10 @@ under the License.
                                     <fo:block text-align="center">${(acctgTransAndEntry.origCurrencyUomId)!}</fo:block>
                                 </fo:table-cell>
                                 <fo:table-cell  border="1pt solid" border-width=".1mm">
-                                    <fo:block text-align="center"><#if (acctgTransAndEntry.debitCreditFlag)! == "D">${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
+                                    <fo:block text-align="center"><#if "D" == (acctgTransAndEntry.debitCreditFlag)!>${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
                                 </fo:table-cell>
                                 <fo:table-cell  border="1pt solid" border-width=".1mm">
-                                    <fo:block text-align="center"><#if (acctgTransAndEntry.debitCreditFlag)! == "C">${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
+                                    <fo:block text-align="center"><#if "C" == (acctgTransAndEntry.debitCreditFlag)!>${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
                                 </fo:table-cell>
                                 <fo:table-cell  border="1pt solid" border-width=".1mm">
                                     <fo:block text-align="center"></fo:block>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.ftl Mon Oct 16 11:31:40 2017
@@ -58,8 +58,8 @@ under the License.
                                     <td ALIGN="left">${(acctgTransAndEntry.transDescription)!}</td>
                                     <td ALIGN="left">${(acctgTransAndEntry.currencyUomId)!}</td>
                                     <td ALIGN="left">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
-                                    <td ALIGN="right"><#if (acctgTransAndEntry.debitCreditFlag)! == "D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
-                                    <td ALIGN="right"><#if (acctgTransAndEntry.debitCreditFlag)! == "C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+                                    <td ALIGN="right"><#if "D" == (acctgTransAndEntry.debitCreditFlag)!>${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+                                    <td ALIGN="right"><#if "C" == (acctgTransAndEntry.debitCreditFlag)!>${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
                                     <td ALIGN="right"></td>
                                     <td ALIGN="right"></td>
                                 </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSContentEdit.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSContentEdit.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSContentEdit.ftl Mon Oct 16 11:31:40 2017
@@ -105,7 +105,7 @@ under the License.
                     <#assign rowCount = 0 />
                     <#list featureList as feature>
                        <#assign checked=""/>
-                       <#if feature.action?has_content && feature.action == "Y">
+                       <#if feature.action?has_content && "Y" == feature.action>
                            <#assign checked="checked='checked'"/>
                        </#if>
                        <tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl Mon Oct 16 11:31:40 2017
@@ -227,7 +227,7 @@ function call_fieldlookup4(rootForumId,
             <#list blogRoleIdList as roleTypeId>
               <#assign cappedSiteRole= Static["org.apache.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) />
               <td align="center">
-              <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if siteRoleMap[cappedSiteRole]! == "Y">checked="checked"</#if>/>
+              <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if "Y" == siteRoleMap[cappedSiteRole]!>checked="checked"</#if>/>
               </td>
           <input type="hidden" name="${cappedSiteRole}FromDate_o_${rowCount}" value="${siteRoleMap[cappedSiteRole + "FromDate"]!}"/>
             </#list>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl Mon Oct 16 11:31:40 2017
@@ -29,8 +29,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/content/template/contentsetup/UserPermissions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl Mon Oct 16 11:31:40 2017
@@ -94,7 +94,7 @@ function call_fieldlookup3(view_name) {
             <#list blogRoleIdList as roleTypeId>
               <#assign cappedSiteRole= Static["org.apache.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) />
               <td align="center">
-              <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if map[cappedSiteRole]?has_content && map[cappedSiteRole] == "Y">checked="checked"</#if>/>
+              <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if map[cappedSiteRole]?has_content && "Y" == map[cappedSiteRole]>checked="checked"</#if>/>
               </td>
             </#list>
           </tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl Mon Oct 16 11:31:40 2017
@@ -25,7 +25,7 @@ under the License.
 </#macro>
 
 <#macro renderSurveyQuestionRequired surveyQuestionAndAppl>
-  <#if surveyQuestionAndAppl.requiredField?default("N") == "Y">
+  <#if "Y" == surveyQuestionAndAppl.requiredField?default("N")>
     <span>*[required]</span>
   <#else>
     <span>[optional]</span>
@@ -33,7 +33,7 @@ under the License.
 </#macro>
 
 <#macro renderSurveyQuestionInput surveyQuestionAndAppl questionFieldName>
-  <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
+  <#if "BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId>
     <#assign selectedOption = (answer.booleanResponse)?default("Y")>
     <select name="${questionFieldName}">
       <#if surveyQuestionAndAppl.requiredField?default("N") != "Y">
@@ -42,41 +42,41 @@ under the License.
       <option <#if "Y" == selectedOption>selected="selected"</#if>>Y</option>
       <option <#if "N" == selectedOption>selected="selected"</#if>>N</option>
     </select>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"/>
+  <#elseif "TEXTAREA" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <textarea cols="40" rows="5" name="${questionFieldName}">${(answer.textResponse)!}</textarea>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"/>
+  <#elseif "TEXT_SHORT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="15" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"/>
+  <#elseif "TEXT_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="35" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"/>
+  <#elseif "EMAIL" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="30" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"/>
+  <#elseif "URL" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="40" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"/>
+  <#elseif "DATE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="12" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"/>
+  <#elseif "CREDIT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"/>
+  <#elseif "GIFT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"/>
+  <#elseif "NUMBER_CURRENCY" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.currencyResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"/>
+  <#elseif "NUMBER_FLOAT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.floatResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"/>
+  <#elseif "NUMBER_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.numericResponse?default(defValue)?string("#"))!}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"/>
+  <#elseif "PASSWORD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <input type="password" size="30" class="textBox" name="${questionFieldName}" autocomplete="off" value="${(answer.textResponse)?default(defValue!)}" />
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"/>
+  <#elseif "CONTENT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
      <#if (answer.contentId)?has_content>
       <#assign content = answer.getRelatedOne("Content", false)>
       <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a>&nbsp;-&nbsp;${content.contentName!}&nbsp;&nbsp;&nbsp;
     </#if>
     <input type="file" size="15" name="${questionFieldName}" class="inputBox"/>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"/>
+  <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!/>
     <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")/>
     <select name="${questionFieldName}">
-      <#if surveyQuestionAndAppl.requiredField?default("N") != "Y">
+      <#if "Y" != surveyQuestionAndAppl.requiredField?default("N")>
         <option value=""></option>
       </#if>
       <#if options?has_content>
@@ -87,7 +87,7 @@ under the License.
         <option value="">Nothing to choose</option>
       </#if>
     </select>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "ENUMERATION"/>
+  <#elseif "ENUMERATION" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <select name="${questionFieldName}">
     <#assign formatString = surveyQuestionAndAppl.get("formatString")!/>
     <#assign enums = surveyQuestionAndAppl.getRelated("Enumeration", null, null, false)/>
@@ -104,7 +104,7 @@ under the License.
         <option value='${enum.enumId}' ${selected}>${description}</option>
     </#list>
     </select>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GEO"/>
+  <#elseif "GEO" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <select name="${questionFieldName}">
     <#assign formatString = surveyQuestionAndAppl.get("formatString")!/>
     <#assign parentGeoId = surveyQuestionAndAppl.get("geoId")!/>
@@ -122,14 +122,14 @@ under the License.
         <option value='${geo.geoId}' ${selected}>${description}</option>
     </#list>
     </select>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "STATE_PROVINCE"/>
+  <#elseif "STATE_PROVINCE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <select name="${questionFieldName}">
     <#assign states = Static["org.apache.ofbiz.common.CommonWorkers"].getStateList(delegator)>
     <#list states as state>
         <option value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
     </#list>
     </select>
-  <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "COUNTRY"/>
+  <#elseif "COUNTRY" == surveyQuestionAndAppl.surveyQuestionTypeId/>
     <select name="${questionFieldName}">
       ${screens.render("component://common/widget/CommonScreens.xml#countries")}
     </select>
@@ -178,7 +178,7 @@ under the License.
     <#if surveyMultiResp?has_content>
       <#assign surveyMultiRespColumnList = surveyMultiResp.getRelated("SurveyMultiRespColumn", null, Static["org.apache.ofbiz.base.util.UtilMisc"].toList("sequenceNum"), true)/>
 
-      <#if lastSurveyMultiRespId == "">
+      <#if "" == lastSurveyMultiRespId>
         <#assign openMultiRespHeader = true/>
       <#elseif lastSurveyMultiRespId != surveyMultiResp.surveyMultiRespId>
         <#assign openMultiRespHeader = true/>
@@ -250,7 +250,7 @@ under the License.
     <#-- special formatting for select boxes -->
     <#assign align = "left"/>
     <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content>
-        <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")>
+        <#if ("BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId || "CONTENT" == surveyQuestionAndAppl.surveyQuestionTypeId || "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId)>
               <#assign align = "right"/>
         </#if>
     </#if>
@@ -268,9 +268,9 @@ under the License.
     <tr>
     <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content>
       <#-- seperator options -->
-      <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT">
+      <#if "SEPERATOR_TEXT" == surveyQuestionAndAppl.surveyQuestionTypeId>
         <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td>
-      <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/>
+      <#elseif "SEPERATOR_LINE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
         <td colspan="5"><hr /></td>
       <#else>
         <#-- standard question options -->

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/survey/ViewSurveyResponses.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/survey/ViewSurveyResponses.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/survey/ViewSurveyResponses.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/survey/ViewSurveyResponses.ftl Mon Oct 16 11:31:40 2017
@@ -27,9 +27,9 @@ under the License.
 
         <tr>
           <#-- seperator options -->
-          <#if question.surveyQuestionTypeId == "SEPERATOR_TEXT">
+          <#if "SEPERATOR_TEXT" == question.surveyQuestionTypeId>
             <td colspan="5" class="label">${question.question!}</td>
-          <#elseif question.surveyQuestionTypeId == "SEPERATOR_LINE">
+          <#elseif "SEPERATOR_LINE" == question.surveyQuestionTypeId>
             <td colspan="5"><hr/></td>
           <#else>
 
@@ -48,7 +48,7 @@ under the License.
 
             <#-- answers -->
             <td>
-              <#if question.surveyQuestionTypeId == "BOOLEAN">
+              <#if "BOOLEAN" == question.surveyQuestionTypeId>
                 <#assign selectedOption = (answer.booleanResponse)?default("Y")>
                 <div>
                   <span style="white-space: nowrap;">${uiLabelMap.CommonY}&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</span>
@@ -56,7 +56,7 @@ under the License.
                 <div>
                   <span style="white-space: nowrap;">${uiLabelMap.CommonN}&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</span>
                 </div>
-              <#elseif question.surveyQuestionTypeId == "OPTION">
+              <#elseif "OPTION" == question.surveyQuestionTypeId>
                 <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)!>
                 <#if options?has_content>
                   <#list options as option>
@@ -73,31 +73,31 @@ under the License.
                 <#assign answers = surveyWrapper.getQuestionResponses(question, 0, 0)>
                 <#if answers?has_content>
                   <#list answers as answer>
-                    <#if question.surveyQuestionTypeId == "TEXTAREA">
+                    <#if "TEXTAREA" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "TEXT_SHORT">
+                    <#elseif "TEXT_SHORT" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "TEXT_LONG">
+                    <#elseif "TEXT_LONG" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "EMAIL">
+                    <#elseif "EMAIL" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "URL">
+                    <#elseif "URL" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "DATE">
+                    <#elseif "DATE" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "CREDIT_CARD">
+                    <#elseif "CREDIT_CARD" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "GIFT_CARD">
+                    <#elseif "GIFT_CARD" == question.surveyQuestionTypeId>
                       <div>${(answer.textResponse)!}</div>
-                    <#elseif question.surveyQuestionTypeId == "NUMBER_CURRENCY">
+                    <#elseif "NUMBER_CURRENCY" == question.surveyQuestionTypeId>
                       <div>${answer.currencyResponse?default(0)}</div>
-                    <#elseif question.surveyQuestionTypeId == "NUMBER_FLOAT">
+                    <#elseif "NUMBER_FLOAT" == question.surveyQuestionTypeId>
                       <div>${answer.floatResponse?default(0)?string("#")}</div>
-                    <#elseif question.surveyQuestionTypeId == "NUMBER_LONG">
+                    <#elseif "NUMBER_LONG" == question.surveyQuestionTypeId>
                       <div>${answer.numericResponse?default(0)?string("#")}&nbsp;${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}</div>
-                    <#elseif question.surveyQuestionTypeId == "PASSWORD">
+                    <#elseif "PASSWORD" == question.surveyQuestionTypeId>
                       <div>${uiLabelMap.CommonNotShown}</div>
-                    <#elseif question.surveyQuestionTypeId == "CONTENT">
+                    <#elseif "CONTENT" == question.surveyQuestionTypeId>
                        <#if answer.contentId?has_content>
                          <#assign content = answer.getRelatedOne("Content", false)>
                          <a href="<@ofbizUrl>img?imgId=${content.dataResourceId}</@ofbizUrl>" class="buttontext">${answer.contentId}</a>&nbsp;-&nbsp;${content.contentName!}

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl Mon Oct 16 11:31:40 2017
@@ -35,7 +35,7 @@
         var isUpload = form.elements['isUploadObject'];
         if (isUpload && isUpload.value == 'Y') {
             var uploadValue = form.elements['uploadedFile'].value;
-            if (uploadValue == null || uploadValue == "") {
+            if (uploadValue == null || "" == uploadValue) {
                 form.action = simpleFormAction;
             }
 
@@ -123,7 +123,7 @@
 <#-- form action -->
 <#if (dataResourceTypeId?has_content)>
     <#assign actionSuffix = "ContentCms"/>
-    <#if (dataResourceTypeId == "NONE" || (content?has_content && !content.dataResourceId?has_content))>
+    <#if ("NONE" == dataResourceTypeId || (content?has_content && !content.dataResourceId?has_content))>
         <#assign actionMiddle = ""/>
     <#else>
         <#if (dataResourceTypeId?ends_with("_OBJECT"))>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/BomSimulation.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/BomSimulation.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/BomSimulation.ftl Mon Oct 16 11:31:40 2017
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<#if requestParameters.lookupFlag?default("N") == "Y">
+<#if "Y" == requestParameters.lookupFlag?default("N")>
     <#if selectedFeatures?has_content>
 <div class="screenlet">
   <div class="screenlet-title-bar">
@@ -76,7 +76,7 @@ under the License.
               </table>
               </td>
               <td>
-                <#if node.product.isVirtual?default("N") == "Y">
+                <#if "Y" == node.product.isVirtual?default("N")>
                     ${node.product.isVirtual}
                 </#if>
                 ${(node.ruleApplied.ruleId)!}

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl Mon Oct 16 11:31:40 2017
@@ -43,7 +43,7 @@ function lookupInventory() {
               <td></td>
               <td align='right'>
                 <p>
-                  <#if requestParameters.hideFields?default("N") == "Y">
+                  <#if "Y" == requestParameters.hideFields?default("N")>
                     <a href="<@ofbizUrl>FindInventoryEventPlan?hideFields=N${paramList}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonShowLookupFields}</a>
                   <#else>
                     <#if inventoryList??>
@@ -99,7 +99,7 @@ document.lookupinventory.productId.focus
 //-->
 </script>
 </#if>
-<#if requestParameters.lookupFlag?default("N") == "Y">
+<#if "Y" == requestParameters.lookupFlag?default("N")>
 <table class="basic-table" cellspacing="0">
   <tr>
     <td width='100%'>
@@ -212,7 +212,7 @@ document.lookupinventory.productId.focus
               <td>${MrpEventType.get("description",locale)}</td>
               <td>&nbsp;</td>
               <td>${inven.eventName!}</td>
-              <td><font <#if inven.isLate?default("N") == "Y">color='red'</#if>>${inven.getString("eventDate")}</font></td>
+              <td><font <#if "Y" == inven.isLate?default("N")>color='red'</#if>>${inven.getString("eventDate")}</font></td>
               <td>&nbsp;</td>
               <td align="right">${inven.getString("quantity")}</td>
               <td align="right">${quantityAvailableAtDate!}</td>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/reports/PRunsComponentsByFeature.fo.ftl Mon Oct 16 11:31:40 2017
@@ -32,7 +32,7 @@ under the License.
     <fo:page-sequence master-reference="first" language="en" hyphenate="true">
         <fo:static-content flow-name="xsl-region-before">
             <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
-                <#if showLocation == "Y">
+                <#if "Y" == showLocation>
                     <#if mrpName??>
                       Doc.F0
                     <#else>
@@ -158,7 +158,7 @@ under the License.
         </fo:table-cell>
         <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
             <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
-                <#if showLocation == "Y">
+                <#if "Y" == showLocation>
                     ${uiLabelMap.ManufacturingQtyM2}
                 <#else>
                     ${uiLabelMap.CommonQuantity}
@@ -167,7 +167,7 @@ under the License.
         </fo:table-cell>
         <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
             <fo:block line-height="12pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="center">
-                <#if showLocation == "Y">
+                <#if "Y" == showLocation>
                     ${uiLabelMap.ManufacturingPanelNumber}
                 <#else>
                     ${uiLabelMap.ProductFacilityLocation}
@@ -202,7 +202,7 @@ under the License.
         </fo:table-cell>
         <fo:table-cell border-style="solid" border-color="black" border-width="1pt">
             <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
-                <#if showLocation == "Y">
+                <#if "Y" == showLocation>
                 ${product.panelQuantity!}
                 <#else>
                     ${product.Location!}

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/AdditionalPartyListing.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/AdditionalPartyListing.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/AdditionalPartyListing.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/AdditionalPartyListing.ftl Mon Oct 16 11:31:40 2017
@@ -37,7 +37,7 @@ under the License.
               <td><div>${party}</div></td>
               <td>
                 <div>
-                  <#if partyData[party].type == "person">
+                  <#if "person" == partyData[party].type>
                     ${partyData[party].firstName!}
                   <#else>
                     ${partyData[party].groupName!}
@@ -46,7 +46,7 @@ under the License.
               </td>
               <td>
                 <div>
-                  <#if partyData[party].type == "person">
+                  <#if "person" == partyData[party].type>
                     ${partyData[party].lastName!}
                   </#if>
                 </div>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl Mon Oct 16 11:31:40 2017
@@ -78,7 +78,7 @@ function makeExpDate() {
               <tr>
                 <td>
                   <label for="checkOutPaymentId_EXT_OFFLINE">
-                  <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
+                  <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
                   ${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
                 </td>
               </tr>
@@ -86,14 +86,14 @@ function makeExpDate() {
               <tr>
                 <td>
                   <label for="checkOutPaymentId_EXT_COD">
-                  <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
+                  <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
                   ${uiLabelMap.OrderCOD}</label>
                 </td>
               </tr>
              <tr><td colspan="3"><hr /></td></tr>
               <#if paymentMethodList?has_content>
                 <#list paymentMethodList as paymentMethod>
-                  <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+                  <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
                     <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
                     <tr>
                       <td>
@@ -108,7 +108,7 @@ function makeExpDate() {
                       </td>
                       <td align="right"><a href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
                     </tr>
-                  <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+                  <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
                     <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
                     <tr>
                       <td>
@@ -128,9 +128,9 @@ function makeExpDate() {
               </#if>
             </table>
           </form>
-        <#elseif paymentMethodType?? || finalizeMode?default("") == "payment">
+        <#elseif paymentMethodType?? || "payment" == finalizeMode?default("")>
           <#-- after initial screen; show detailed screens for selected type -->
-          <#if paymentMethodType == "CC">
+          <#if "CC" == paymentMethodType>
             <#if postalAddress?has_content>
               <form method="post" action="<@ofbizUrl>updateCreditCardAndPostalAddress</@ofbizUrl>" name="checkoutsetupform">
                 <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
@@ -141,7 +141,7 @@ function makeExpDate() {
               <form method="post" action="<@ofbizUrl>createCreditCardAndPostalAddress</@ofbizUrl>" name="checkoutsetupform">
             </#if>
           </#if>
-          <#if paymentMethodType == "EFT">
+          <#if "EFT" == paymentMethodType>
             <#if postalAddress?has_content>
               <form method="post" action="<@ofbizUrl>updateEftAndPostalAddress</@ofbizUrl>" name="checkoutsetupform">
                 <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
@@ -260,7 +260,7 @@ function makeExpDate() {
             </tr>
 
             <#-- credit card fields -->
-            <#if paymentMethodType == "CC">
+            <#if "CC" == paymentMethodType>
               <#if !creditCard?has_content>
                 <#assign creditCard = requestParameters>
               </#if>
@@ -282,10 +282,10 @@ function makeExpDate() {
                 <td width="74%">
                   <select name="titleOnCard">
                     <option value="">${uiLabelMap.CommonSelectOne}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
+                    <option<#if ("Mr." == (creditCard.titleOnCard)?default(""))> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
+                    <option<#if ("Mrs." == (creditCard.titleOnCard)?default(""))> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
+                    <option<#if ("Ms." == (creditCard.titleOnCard)?default(""))> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
+                    <option<#if ("Dr." == (creditCard.titleOnCard)?default(""))> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
                    </select>
                 </td>
               </tr>
@@ -316,13 +316,13 @@ function makeExpDate() {
                 <td width="74%">
                   <select name="suffixOnCard">
                     <option value="">${uiLabelMap.CommonSelectOne}</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> checked="checked"</#if>>Jr.</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> checked="checked"</#if>>Sr.</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "I")> checked="checked"</#if>>I</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "II")> checked="checked"</#if>>II</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "III")> checked="checked"</#if>>III</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> checked="checked"</#if>>IV</option>
-                    <option<#if ((creditCard.suffixOnCard)?default("") == "V")> checked="checked"</#if>>V</option>
+                    <option<#if ("Jr." == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>Jr.</option>
+                    <option<#if ("Sr." == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>Sr.</option>
+                    <option<#if ("I" == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>I</option>
+                    <option<#if ("II" == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>II</option>
+                    <option<#if ("III" == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>III</option>
+                    <option<#if ("IV" == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>IV</option>
+                    <option<#if ("V" == (creditCard.suffixOnCard)?default(""))> checked="checked"</#if>>V</option>
                   </select>
                 </td>
               </tr>
@@ -470,11 +470,11 @@ function makeExpDate() {
             <table width="100%" border="0" cellpadding="1" cellspacing="0">
               <#if "Y" != requestParameters.createNew?default("")>
               <tr>
-                <td nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderPaymentOfflineCheckMoney}</label></td>
+                <td nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderPaymentOfflineCheckMoney}</label></td>
               </tr>
               <tr><td colspan="2"><hr /></td></tr>
               <tr>
-                <td width="1%" nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderCOD}</label></td>
+                <td width="1%" nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && "EXT_COD" == checkOutPaymentId>checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderCOD}</label></td>
               </tr>
               <tr><td colspan="2"><hr /></td></tr>
               </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl Mon Oct 16 11:31:40 2017
@@ -150,7 +150,7 @@ under the License.
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
-              <select name="billToCustomerPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
+              <select name="billToCustomerPartyId"<#if "SALES_ORDER" == sessionAttributes.orderMode?default("")> disabled</#if>>
                 <#list organizations as organization>
                   <#assign organizationName = Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(organization, true)/>
                     <#if (organizationName.length() != 0)>
@@ -178,7 +178,7 @@ under the License.
           <td>&nbsp;</td>
           <td valign='middle'>
             <div class='tabletext'>
-              <select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
+              <select name="supplierPartyId"<#if "SALES_ORDER" == sessionAttributes.orderMode?default("")> disabled</#if>>
                 <option value="">${uiLabelMap.OrderSelectSupplier}</option>
                 <#list suppliers as supplier>
                   <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected="selected"</#if>>[${supplier.partyId}] - ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl Mon Oct 16 11:31:40 2017
@@ -20,51 +20,51 @@ 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>checkout</@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?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EA") {
+    } else if ("EA" == mode) {
         // edit address
         form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&contactMechId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NC") {
+    } else if ("NC" == mode) {
         // new credit card
         form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EC") {
+    } else if ("EC" == mode) {
         // edit credit card
         form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "GC") {
+    } else if ("GC" == mode) {
         // edit gift card
         form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NE") {
+    } else if ("NE" == mode) {
         // new eft account
         form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
         form.submit();
-    } else if (mode == "EE") {
+    } else if ("EE" == mode) {
         // edit eft account
         form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SP") {
+    } else if ("SP" == mode) {
         // split payment
         form.action="<@ofbizUrl>updateCheckoutOptions/checkoutpayment?partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SA") {
+    } else if ("SA" == mode) {
         // selected shipping address
         form.action="<@ofbizUrl>updateCheckoutOptions/quickcheckout</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SC") {
+    } else if ("SC" == mode) {
         // selected ship to party
         form.action="<@ofbizUrl>cartUpdateShipToCustomerParty</@ofbizUrl>";
         form.submit();
@@ -199,7 +199,7 @@ function submitForm(form, mode, value) {
                   <tr>
                     <td valign="top">
                     <label>
-                      <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
+                      <input type="radio" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false"/>
                       ${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.
                     </label>
                     </td>
@@ -207,7 +207,7 @@ function submitForm(form, mode, value) {
                   <tr>
                     <td valign="top">
                     <label>
-                      <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/>
+                      <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true"/>
                       ${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.
                     </label>
                     </td>
@@ -235,8 +235,8 @@ function submitForm(form, mode, value) {
                     <td colspan="2">
                       <div>
                         <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span>
-                        <label><input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span></label>
-                        <label><input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span></label>
+                        <label><input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span></label>
+                        <label><input type="radio" <#if "N" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span></label>
                       </div>
                     </td>
                   </tr>
@@ -375,7 +375,7 @@ function submitForm(form, mode, value) {
                     </#if>
                   <#else>
                   <#list paymentMethodList as paymentMethod>
-                    <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+                    <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
                      <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
                       <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
                       <tr>
@@ -390,7 +390,7 @@ function submitForm(form, mode, value) {
                         </td>
                       </tr>
                      </#if>
-                    <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+                    <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
                      <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
                       <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
                       <tr>
@@ -404,7 +404,7 @@ function submitForm(form, mode, value) {
                         </td>
                       </tr>
                      </#if>
-                    <#elseif paymentMethod.paymentMethodTypeId == "GIFT_CARD">
+                    <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
                      <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
                       <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>