You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/10/16 11:31:42 UTC
svn commit: r1812285 [3/4] - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/template/ap/invoices/
applications/accounting/template/common/
applications/accounting/template/finaccounttrans/
applications/accounting/template/payment/ application...
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl Mon Oct 16 11:31:40 2017
@@ -25,7 +25,7 @@ under the License.
</#if>
<#assign orderType = orderHeader.getRelatedOne("OrderType", false)/>
<li class="h3"> ${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder!} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
- <#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER">
+ <#if "ORDER_APPROVED" == currentStatus.statusId && "SALES_ORDER" == orderHeader.orderTypeId>
<li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
<form name="PrintOrderPickSheet" method="post" action="<@o...@ofbizUrl>" target="_BLANK">
<input type="hidden" name="facilityId" value="${storeFacilityId!}"/>
@@ -34,7 +34,7 @@ under the License.
</form>
</li>
</#if>
- <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING">
+ <#if "ORDER_CREATED" == currentStatus.statusId || "ORDER_PROCESSING" == currentStatus.statusId>
<li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
@@ -47,7 +47,7 @@ under the License.
<input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
- <#elseif currentStatus.statusId == "ORDER_APPROVED">
+ <#elseif "ORDER_APPROVED" == currentStatus.statusId>
<li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a>
<form name="OrderHold" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_HOLD"/>
@@ -58,7 +58,7 @@ under the License.
<input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
- <#elseif currentStatus.statusId == "ORDER_HOLD">
+ <#elseif "ORDER_HOLD" == currentStatus.statusId>
<li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
@@ -242,9 +242,9 @@ under the License.
<form name="setOrderReservationPriority" method="post" action="<@o...@ofbizUrl>">
<input type = "hidden" name="orderId" value="${orderId}"/>
<select name="priority">
- <option value="1" <#if (orderHeader.priority)! == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
- <option value="2" <#if (orderHeader.priority)! == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option>
- <option value="3" <#if (orderHeader.priority)! == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option>
+ <option value="1" <#if "1" == (orderHeader.priority)!>selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
+ <option value="2" <#if "2" == (orderHeader.priority)!>selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option>
+ <option value="3" <#if "3" == (orderHeader.priority)!>selected="selected" </#if>>${uiLabelMap.CommonLow}</option>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/>
</form>
@@ -259,15 +259,15 @@ under the License.
<form name="setInvoicePerShipment" method="post" action="<@o...@ofbizUrl>">
<input type = "hidden" name="orderId" value="${orderId}"/>
<select name="invoicePerShipment">
- <option value="Y" <#if (orderHeader.invoicePerShipment)! == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option>
- <option value="N" <#if (orderHeader.invoicePerShipment)! == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option>
+ <option value="Y" <#if "Y" == (orderHeader.invoicePerShipment)!>selected="selected" </#if>>${uiLabelMap.CommonYes}</option>
+ <option value="N" <#if "N" == (orderHeader.invoicePerShipment)!>selected="selected" </#if>>${uiLabelMap.CommonNo}</option>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
- <#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y">
+ <#if orderHeader.isViewed?has_content && "Y" == orderHeader.isViewed>
<tr>
<td class="label">${uiLabelMap.OrderViewed}</td>
<td width="5%"></td>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl Mon Oct 16 11:31:40 2017
@@ -47,11 +47,11 @@ under the License.
<#list orderItemList as orderItem>
<#assign orderItemContentWrapper = Static["org.apache.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)>
<#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)>
- <#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <#if "SALES_ORDER" == orderHeader.orderTypeId><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!>
<#assign productId = orderItem.productId!>
- <#if productId?? && productId == "shoppingcart.CommentLine">
+ <#if productId?? && "shoppingcart.CommentLine" == productId>
<td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td>
<#else>
<td colspan="7">
@@ -103,8 +103,8 @@ under the License.
</td>
</#if>
</tr>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
- <#if productId?? && productId == "shoppingcart.CommentLine">
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
+ <#if productId?? && "shoppingcart.CommentLine" == productId>
<td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td>
<#else>
<td valign="top">
@@ -242,11 +242,11 @@ under the License.
</#if>
</#list>
</#if>
- <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED">
+ <#if "SERVICE" == product.productTypeId && "ITEM_COMPLETED" == currentItemStatus.statusId>
<#assign shippedQuantity = orderItem.quantity?default(0)/>
<#assign totalReceived = orderItem.quantity?default(0)>
</#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)>
@@ -266,8 +266,8 @@ under the License.
<tr valign="top">
<td><b>${uiLabelMap.OrderCancelled}</b></td>
<td>${orderItem.cancelQuantity?default(0)?string.number}</td>
- <#if orderHeader.orderTypeId == "SALES_ORDER">
- <#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED">
+ <#if "SALES_ORDER" == orderHeader.orderTypeId>
+ <#if pickedQty gt 0 && "ORDER_APPROVED" == orderHeader.statusId>
<td><font color="red"><b>${uiLabelMap.OrderQtyPicked}</b></font></td>
<td><font color="red">${pickedQty?default(0)?string.number}</font></td>
<#else>
@@ -282,7 +282,7 @@ under the License.
<tr valign="top">
<td><b>${uiLabelMap.OrderRemaining}</b></td>
<td>${remainingQuantity}</td>
- <#if orderHeader.orderTypeId == "PURCHASE_ORDER">
+ <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>
<td><b>${uiLabelMap.OrderPlannedInReceive}</b></td>
<td>${totalReceived}</td>
<#else>
@@ -296,11 +296,11 @@ under the License.
<td><b>${uiLabelMap.OrderOutstanding}</b></td>
<td>
<#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity. -->
- <#if (orderItem.statusId?has_content) && (orderItem.statusId == "ITEM_COMPLETED")>
+ <#if (orderItem.statusId?has_content) && ("ITEM_COMPLETED" == orderItem.statusId)>
0
- <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER">
+ <#elseif "PURCHASE_ORDER" == orderHeader.orderTypeId>
${(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double}
- <#elseif orderHeader.orderTypeId == "SALES_ORDER">
+ <#elseif "SALES_ORDER" == orderHeader.orderTypeId>
${(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double}
</#if>
</td>
@@ -337,7 +337,7 @@ under the License.
<#if workOrderItemFulfillments?has_content>
<#list workOrderItemFulfillments as workOrderItemFulfillment>
<#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
<#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM">
@@ -367,7 +367,7 @@ under the License.
<#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("ToOrderItem", false)>
<#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)>
<#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
<span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${description!})
@@ -384,7 +384,7 @@ under the License.
<#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("FromOrderItem", false)>
<#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)>
<#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
<span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> (${description!})
@@ -398,7 +398,7 @@ under the License.
<#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)!>
<#if linkedRequirements?has_content>
<#list linkedRequirements as linkedRequirement>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
<span class="label">${uiLabelMap.OrderLinkedToRequirement}</span>
@@ -411,7 +411,7 @@ under the License.
<#-- show linked quote -->
<#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)!>
<#if linkedQuote?has_content>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
<span class="label">${uiLabelMap.OrderLinkedToQuote}</span>
@@ -425,7 +425,7 @@ under the License.
<#if orderItemAdjustments?? && orderItemAdjustments?has_content>
<#list orderItemAdjustments as orderItemAdjustment>
<#assign adjustmentType = orderItemAdjustment.getRelatedOne("OrderAdjustmentType", true)>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
${StringUtil.wrapString(orderItemAdjustment.get("description",locale)!)}
@@ -436,7 +436,7 @@ under the License.
<a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}${StringUtil.wrapString(externalKeyParam)}"
>${orderItemAdjustment.getRelatedOne("ProductPromo", false).getString("promoName")}</a>
</#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>
@@ -470,11 +470,11 @@ under the License.
<#-- now show price info per line item -->
<#assign orderItemPriceInfos = orderReadHelper.getOrderItemPriceInfos(orderItem)>
<#if orderItemPriceInfos?? && orderItemPriceInfos?has_content>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td colspan="7"> </td>
</tr>
<#list orderItemPriceInfos as orderItemPriceInfo>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId!}:${orderItemPriceInfo.productPriceActionSeqId!}]
${orderItemPriceInfo.description!}
@@ -491,7 +491,7 @@ under the License.
<#assign orderItemSurveyResponses = Static["org.apache.ofbiz.order.order.OrderReadHelper"].getOrderItemSurveyResponse(orderItem)>
<#if orderItemSurveyResponses?? && orderItemSurveyResponses?has_content>
<#list orderItemSurveyResponses as survey>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.CommonSurveys}</span>
<a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}${StringUtil.wrapString(externalKeyParam)}"
@@ -503,7 +503,7 @@ under the License.
</#if>
<#-- display the ship estimated/before/after dates -->
<#if orderItem.estimatedShipDate??>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!}
</td>
@@ -511,7 +511,7 @@ under the License.
</tr>
</#if>
<#if orderItem.estimatedDeliveryDate??>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!}
</td>
@@ -519,7 +519,7 @@ under the License.
</tr>
</#if>
<#if orderItem.shipAfterDate??>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!}
</td>
@@ -527,7 +527,7 @@ under the License.
</tr>
</#if>
<#if orderItem.shipBeforeDate??>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!}
</td>
@@ -540,7 +540,7 @@ under the License.
<#list orderItemShipGroupAssocs as shipGroupAssoc>
<#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)>
<#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}]
${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
@@ -555,7 +555,7 @@ under the License.
<#-- now show inventory reservation info per line item -->
<#if orderItemShipGrpInvResList?? && orderItemShipGrpInvResList?has_content>
<#list orderItemShipGrpInvResList as orderItemShipGrpInvRes>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.CommonInventory}</span>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}"
@@ -582,7 +582,7 @@ under the License.
<#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)!>
<#if orderShipments?has_content>
<#list orderShipments as orderShipment>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a
target="facility"
@@ -600,7 +600,7 @@ under the License.
<#assign itemIssuances = itemIssuancesPerItem.get(orderItem.get("orderItemSeqId"))!>
<#if itemIssuances?has_content>
<#list itemIssuances as itemIssuance>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<#if itemIssuance.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span>
@@ -621,7 +621,7 @@ under the License.
<#-- now show item issuances (inventory item) per line item -->
<#if itemIssuances?has_content>
<#list itemIssuances as itemIssuance>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<#if itemIssuance.inventoryItemId?has_content>
<#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem", false)/>
@@ -646,7 +646,7 @@ under the License.
<#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)!>
<#if shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td align="right" colspan="2">
<#if shipmentReceipt.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderShipmentReceived}</span>
@@ -667,7 +667,7 @@ under the License.
</#list>
</#if>
<#if orderItem.comments?has_content>
- <tr<#if itemClass == "1"> class="alternate-row"</#if>>
+ <tr<#if "1" == itemClass> class="alternate-row"</#if>>
<td> </td>
<td>
<div class= "screenlet">
@@ -707,7 +707,7 @@ under the License.
<td></td>
</tr>
</#if>
- <#if itemClass == "2">
+ <#if "2" == itemClass>
<#assign itemClass = "1">
<#else>
<#assign itemClass = "2">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl Mon Oct 16 11:31:40 2017
@@ -47,7 +47,7 @@ under the License.
${note.noteInfo?replace("\n", "<br/>")}
</td>
<td align="right" valign="top" width="15%">
- <#if note.internalNote! == "N">
+ <#if "N" == note.internalNote!>
${uiLabelMap.OrderPrintableNote}
<form name="privateNotesForm_${note_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
@@ -56,7 +56,7 @@ under the License.
<a href="javascript:document.privateNotesForm_${note_index}.submit()" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
</form>
</#if>
- <#if note.internalNote! == "Y">
+ <#if "Y" == note.internalNote!>
${uiLabelMap.OrderNotPrintableNote}
<form name="publicNotesForm_${note_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl Mon Oct 16 11:31:40 2017
@@ -41,7 +41,7 @@ under the License.
<div class="screenlet-body">
<table class="basic-table" cellspacing='0'>
<#assign orderTypeId = orderReadHelper.getOrderTypeId()>
- <#if orderTypeId == "PURCHASE_ORDER">
+ <#if "PURCHASE_ORDER" == orderTypeId>
<tr>
<th>${uiLabelMap.AccountingPaymentID}</th>
<th>${uiLabelMap.CommonTo}</th>
@@ -115,7 +115,7 @@ under the License.
<#assign paymentList = orderPaymentPreference.getRelated("Payment", null, null, false)>
<#assign pmBillingAddress = {}>
<#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem", false)>
- <#if outputted?default("false") == "true">
+ <#if "true" == outputted?default("false")>
<tr><td colspan="4"><hr /></td></tr>
</#if>
<#assign outputted = "true">
@@ -123,11 +123,11 @@ under the License.
<#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false)!>
<#if !paymentMethod?has_content>
<#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)>
- <#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT">
+ <#if "EXT_BILLACT" == paymentMethodType.paymentMethodTypeId>
<#assign outputted = "false">
<#-- billing account -->
<#if billingAccount??>
- <#if outputted?default("false") == "true">
+ <#if "true" == outputted?default("false")>
<tr><td colspan="4"><hr /></td></tr>
</#if>
<tr>
@@ -171,7 +171,7 @@ under the License.
</td>
</tr>
</#if>
- <#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT">
+ <#elseif "FIN_ACCOUNT" == paymentMethodType.paymentMethodTypeId>
<#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)!/>
<#if (finAccount?has_content)>
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
@@ -198,10 +198,10 @@ under the License.
<#-- Authorize and Capture transactions -->
<div>
- <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
+ <#if "PAYMENT_SETTLED" != orderPaymentPreference.statusId>
<a href="/accounting/control/AuthorizeTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
- <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
+ <#if "PAYMENT_AUTHORIZED" == orderPaymentPreference.statusId>
<a href="/accounting/control/CaptureTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
@@ -312,7 +312,7 @@ under the License.
</#if>
</#if>
<#else>
- <#if paymentMethod.paymentMethodTypeId! == "CREDIT_CARD">
+ <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId!>
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)!>
<#if creditCard?has_content>
@@ -351,10 +351,10 @@ under the License.
<#-- Authorize and Capture transactions -->
<div>
- <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
+ <#if "PAYMENT_SETTLED" != orderPaymentPreference.statusId>
<a href="/accounting/control/AuthorizeTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
- <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
+ <#if "PAYMENT_AUTHORIZED" == orderPaymentPreference.statusId>
<a href="/accounting/control/CaptureTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
@@ -393,7 +393,7 @@ under the License.
</#if>
</td>
</tr>
- <#elseif paymentMethod.paymentMethodTypeId! == "EFT_ACCOUNT">
+ <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId!>
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<#if eftAccount?has_content>
<#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)!>
@@ -448,7 +448,7 @@ under the License.
</td>
</tr>
</#if>
- <#elseif paymentMethod.paymentMethodTypeId! == "GIFT_CARD">
+ <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId!>
<#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
<#if giftCard??>
<#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)!>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportBody.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportBody.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportBody.fo.ftl Mon Oct 16 11:31:40 2017
@@ -64,7 +64,7 @@ under the License.
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <#if orderHeader.orderTypeId == "PURCHASE_ORDER">
+ <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>
<#if internalImageUrl?has_content>
<fo:external-graphic src="${internalImageUrl}" overflow="hidden" content-width="100"/>
</#if>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportConditions.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportConditions.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportConditions.fo.ftl Mon Oct 16 11:31:40 2017
@@ -50,12 +50,12 @@ under the License.
<fo:block space-after="40pt"/>
-<#if orderHeader.getString("orderTypeId") == "SALES_ORDER">
+<#if "SALES_ORDER" == orderHeader.getString("orderTypeId")>
<fo:block font-size="14pt" font-weight="bold" text-align="center">THANK YOU FOR YOUR PATRONAGE!</fo:block>
<fo:block font-size="8pt">
<#-- Here is a good place to put policies and return information. -->
</fo:block>
-<#elseif orderHeader.getString("orderTypeId") == "PURCHASE_ORDER">
+<#elseif "PURCHASE_ORDER" == orderHeader.getString("orderTypeId")>
<fo:block font-size="8pt">
<#-- Here is a good place to put boilerplate terms and conditions for a purchase order. -->
</fo:block>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl Mon Oct 16 11:31:40 2017
@@ -18,7 +18,7 @@ under the License.
-->
<#escape x as x?xml>
-<#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER">
+<#if "PURCHASE_ORDER" == orderHeader.getString("orderTypeId")>
<#if supplierGeneralContactMechValueMap??>
<#assign contactMech = supplierGeneralContactMechValueMap.contactMech>
<fo:block font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:block>
@@ -52,7 +52,7 @@ under the License.
<#list orderContactMechValueMaps as orderContactMechValueMap>
<#assign contactMech = orderContactMechValueMap.contactMech>
<#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
- <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
+ <#if "POSTAL_ADDRESS" == contactMech.contactMechTypeId>
<#assign postalAddress = orderContactMechValueMap.postalAddress>
<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}:</fo:block>
<fo:block text-indent="0.2in">
@@ -81,7 +81,7 @@ under the License.
<#list orderPaymentPreferences as orderPaymentPreference>
<fo:block text-indent="0.2in">
<#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)!>
- <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
+ <#if (orderPaymentPreference?? && ("CREDIT_CARD" == orderPaymentPreference.getString("paymentMethodTypeId")) && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
<#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod", false).getRelatedOne("CreditCard", false)>
${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
<#else>
@@ -90,7 +90,7 @@ under the License.
</fo:block>
</#list>
</#if>
-<#if orderHeader.getString("orderTypeId") == "SALES_ORDER" && shipGroups?has_content>
+<#if "SALES_ORDER" == orderHeader.getString("orderTypeId") && shipGroups?has_content>
<fo:block font-weight="bold">${uiLabelMap.OrderShipmentInformation}:</fo:block>
<#list shipGroups as shipGroup>
<fo:block text-indent="0.2in">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl Mon Oct 16 11:31:40 2017
@@ -56,16 +56,16 @@ under the License.
</div>
<div class="screenlet-body">
<ul>
- <#if security.hasEntityPermission("FACILITY", "_CREATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
+ <#if security.hasEntityPermission("FACILITY", "_CREATE", session) && (("ORDER_APPROVED" == orderHeader.statusId) || ("ORDER_SENT" == orderHeader.statusId))>
<#-- Special shipment options -->
- <#if orderHeader.orderTypeId == "SALES_ORDER" && backorderQuantity < 1>
+ <#if "SALES_ORDER" == orderHeader.orderTypeId && backorderQuantity < 1>
<li>
<form name="quickShipOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
</form>
<a href="javascript:document.quickShipOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a></li>
<#else> <#-- PURCHASE_ORDER -->
- <span class="label"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
+ <span class="label"> <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>${uiLabelMap.ProductDestinationFacility}</#if></span>
<#if ownedFacilities?has_content>
<#if !allShipments?has_content>
<li>
@@ -144,7 +144,7 @@ under the License.
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></li>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_RETURN", session)>
- <#if orderHeader.statusId == "ORDER_COMPLETED" && returnableItems?has_content>
+ <#if "ORDER_COMPLETED" == orderHeader.statusId && returnableItems?has_content>
<li>
<form name="quickRefundOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
@@ -178,7 +178,7 @@ under the License.
</li>
</#if>
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateAsNewOrder}</a></li>
- <#if orderHeader.statusId == "ORDER_COMPLETED">
+ <#if "ORDER_COMPLETED" == orderHeader.statusId>
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReplacementOrder}</a></li>
</#if>
</#if>
@@ -230,7 +230,7 @@ under the License.
<td><div>${quantityOrdered}</div></td>
<td><div>${quantityNotAvailable}</div></td>
<td>
- <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED">
+ <#if !orderItem.statusId?exists || "ITEM_CREATED" == orderItem.statusId || "ITEM_APPROVED" == orderItem.statusId>
<div class="tabletext" id="display${index}">
<a name="display${index}" href="javascript: showEdit('edit', '${index}');" class="smallSubmit"> ${uiLabelMap.CommonEdit}</a>
</div>
@@ -258,11 +258,11 @@ under the License.
<td colspan="2"> </td>
<td colspan="2">
<div class="tabletext"> [${OISG.shipGroupSeqId}] <#if OISG.shipByDate?has_content>, ${uiLabelMap.OrderShipBeforeDate} : ${OISG.shipByDate?date}</#if></div>
- <#if orderType == "SALES_ORDER">
+ <#if "SALES_ORDER" == orderType>
<#list orderShipments as orderShipment>
<div>${uiLabelMap.OrderPlannedInShipment} : </b><a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId!}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId!}</a>:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}</div>
</#list>
- <#elseif orderType == "PURCHASE_ORDER">
+ <#elseif "PURCHASE_ORDER" == orderType>
<#list orderShipments as orderShipment>
<#if orderShipment.quantity?has_content & orderShipment.quantity!=0.0 >
<div>${uiLabelMap.OrderPlannedInReceive} : </b><a target="facility" href="/facility/control/ViewReceiveShipment?shipmentId=${orderShipment.shipmentId!}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId!}</a>:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}</div>
@@ -287,7 +287,7 @@ under the License.
</#list>
<input type="hidden" name="_rowCount" value="${rowCount}"/>
</form>
- <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED" && (orderHeader.statusId != "ORDER_SENT" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED" && orderHeader.statusId != "ORDER_CANCELLED")>
+ <#if !orderItem.statusId?exists || "ITEM_CREATED" == orderItem.statusId || "ITEM_APPROVED" == orderItem.statusId && ("ORDER_SENT" != orderHeader.statusId && "ORDER_COMPLETED" != orderHeader.statusId && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId)>
<tr>
<form method="post" action="<@o...@ofbizUrl>" name="addOISGForm${index}"/>
<input type="hidden" name="editQuantity" value="edit"/>
@@ -386,7 +386,7 @@ under the License.
</tr>
<#-- the setting of shipping method is only supported for sales orders at this time -->
- <#if orderHeader.orderTypeId == "SALES_ORDER">
+ <#if "SALES_ORDER" == orderHeader.orderTypeId>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> <b>${uiLabelMap.CommonMethod}</b></span>
@@ -626,7 +626,7 @@ under the License.
<td width="5"> </td>
<td valign="top" width="80%">
<div>
- <#if shipGroup.maySplit?upper_case == "N">
+ <#if "N" == shipGroup.maySplit?upper_case>
${uiLabelMap.FacilityWaitEntireOrderReady}
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
<#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
@@ -777,16 +777,16 @@ under the License.
</#if>
<#-- shipment actions -->
- <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_CREATED") || (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
+ <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (("ORDER_CREATED" == orderHeader.statusId) || ("ORDER_APPROVED" == orderHeader.statusId) || ("ORDER_SENT" == orderHeader.statusId))>
<#-- Manual shipment options -->
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td colspan="3" valign="top" width="100%" align="center">
- <#if orderHeader.orderTypeId == "SALES_ORDER">
+ <#if "SALES_ORDER" == orderHeader.orderTypeId>
<#if !shipGroup.supplierPartyId?has_content>
- <#if orderHeader.statusId == "ORDER_APPROVED">
+ <#if "ORDER_APPROVED" == orderHeader.statusId>
<a href="/facility/control/PackOrder?facilityId=${storeFacilityId!}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a>
<br />
</#if>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/Transitions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/Transitions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/Transitions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/Transitions.ftl Mon Oct 16 11:31:40 2017
@@ -30,7 +30,7 @@ under the License.
<tr>
<td>
<!-- Suspended Processes -->
- <#if workEffortStatus == "WF_SUSPENDED">
+ <#if "WF_SUSPENDED" == workEffortStatus>
<form action="<@o...@ofbizUrl>" method="post" name="activityForm">
<input type="hidden" name="workEffortId" value="${workEffortId}" />
<table class="basic-table" cellspacing='0'>
@@ -44,7 +44,7 @@ under the License.
</form>
</#if>
<!-- Active Processes -->
- <#if workEffortStatus == "WF_RUNNING">
+ <#if "WF_RUNNING" == workEffortStatus>
<form action="<@o...@ofbizUrl>" method="post" name="activityForm">
<input type="hidden" name="workEffortId" value="${workEffortId}" />
<table class="basic-table" cellspacing='0'>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl Mon Oct 16 11:31:40 2017
@@ -111,7 +111,7 @@ under the License.
</fo:table-row>
</#list>
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl Mon Oct 16 11:31:40 2017
@@ -19,7 +19,7 @@ under the License.
<div class="screenlet">
<div class="screenlet-title-bar">
<div class="boxlink">
- <#if maySelectItems?default("N") == "Y">
+ <#if "Y" == maySelectItems?default("N")>
<a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
</#if>
</div>
@@ -68,7 +68,7 @@ under the License.
<tr <#if alt_row>class="alternate-row" </#if>>
<td >
<div>
- <#if showQuoteManagementLinks?? && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED">
+ <#if showQuoteManagementLinks?? && "N" == quoteItem.isPromo?default("N") && "QUO_CREATED" == quote.statusId>
<a href="<@o...@ofbizUrl>" class="buttontext">${quoteItem.quoteItemSeqId}</a>
<#else>
${quoteItem.quoteItemSeqId}
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl Mon Oct 16 11:31:40 2017
@@ -104,7 +104,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl Mon Oct 16 11:31:40 2017
@@ -114,7 +114,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl Mon Oct 16 11:31:40 2017
@@ -81,7 +81,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/reports/SalesByStoreReport.fo.ftl Mon Oct 16 11:31:40 2017
@@ -91,7 +91,7 @@ under the License.
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
- <#if rowColor == "white">
+ <#if "white" == rowColor>
<#assign rowColor = "#D4D0C8">
<#else>
<#assign rowColor = "white">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItemInc.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItemInc.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItemInc.ftl Mon Oct 16 11:31:40 2017
@@ -59,7 +59,7 @@ under the License.
<#assign rowCount = 0>
<#assign alt_row = false>
<#list returnableItems.keySet() as orderItem>
- <#if orderItem.getEntityName() == "OrderAdjustment">
+ <#if "OrderAdjustment" == orderItem.getEntityName()>
<#-- this is an order item adjustment -->
<#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/>
<#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType", false)/>
@@ -79,7 +79,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if "RTN_REFUND" == type.returnTypeId>selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
@@ -124,7 +124,7 @@ under the License.
<td>
<#if orderItem.productId??>
<#assign product = orderItem.getRelatedOne("Product", false)/>
- <#if product.productTypeId == "ASSET_USAGE_OUT_IN">
+ <#if "ASSET_USAGE_OUT_IN" == product.productTypeId>
<input type="text" size="8" name="returnPrice_o_${rowCount}" value="0.00"/>
<#else>
<input type="text" size="8" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")?string("##0.00")}"/>
@@ -196,7 +196,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if "RTN_REFUND" == type.returnTypeId>selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
@@ -233,7 +233,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if "RTN_REFUND" == type.returnTypeId>selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItems.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnItems.ftl Mon Oct 16 11:31:40 2017
@@ -69,12 +69,12 @@ under the License.
</#macro>
<#if returnHeader?has_content>
- <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")>
+ <#if returnHeader.destinationFacilityId?has_content && "RETURN_ACCEPTED" == returnHeader.statusId && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")>
<#list returnShipmentIds as returnShipmentId>
<a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a>
<a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId!}&shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a>
</#list>
- <#elseif returnHeader.statusId == "SUP_RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "VENDOR_RETURN">
+ <#elseif "SUP_RETURN_ACCEPTED" == returnHeader.statusId && "VENDOR_RETURN" == returnHeader.returnHeaderTypeId>
<#if returnShipmentIds?has_content>
<#list returnShipmentIds as returnShipmentId>
<a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a>
@@ -234,7 +234,7 @@ under the License.
</#if></div></td>
<#if (readOnly)>
<td>
- <#if returnHeader.statusId == "RETURN_COMPLETED" || returnHeader.statusId == "SUP_RETURN_COMPLETED">
+ <#if "RETURN_COMPLETED" == returnHeader.statusId || "SUP_RETURN_COMPLETED" == returnHeader.statusId>
<#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)!>
<#if itemResp?has_content>
<#if itemResp.paymentId?has_content>
@@ -252,7 +252,7 @@ under the License.
</#if>
</td>
</#if>
- <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED">
+ <#if "RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId>
<td align='right'><a href='javascript:document.removeReturnItem_${item_index}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a></td>
<#else>
<td> </td>
@@ -315,7 +315,7 @@ under the License.
</form>
</#list>
</#if>
- <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)>
+ <#if ("RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId) && (rowCount > 0)>
<br />
<form name="acceptReturn" method="post" action="<@o...@ofbizUrl>">
<#if returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")>
@@ -330,7 +330,7 @@ under the License.
</form>
</#if>
- <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED">
+ <#if "RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId>
<br />
<form name="returnItems" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="returnId" value="${returnId}" />
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/setup/PaymentSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/setup/PaymentSetup.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/setup/PaymentSetup.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/setup/PaymentSetup.ftl Mon Oct 16 11:31:40 2017
@@ -56,7 +56,7 @@ under the License.
</tr>
<#if paymentSetups?has_content>
<#list paymentSetups as paymentSetting>
- <#if rowStyle?? && rowStyle == "alternate-row">
+ <#if rowStyle?? && "alternate-row" == rowStyle>
<#assign rowStyle = "alternate-rowSelected">
<#else>
<#assign rowStyle = "alternate-row">
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl Mon Oct 16 11:31:40 2017
@@ -77,7 +77,7 @@ under the License.
<#assign partyId = "_NA_">
<#if placingParty?has_content>
<#assign partyId = placingParty.partyId>
- <#if placingParty.getEntityName() == "Person">
+ <#if "Person" == placingParty.getEntityName()>
<#if placingParty.lastName??>
${placingParty.lastName}<#if placingParty.firstName??>, ${placingParty.firstName}</#if>
<#else>
@@ -205,7 +205,7 @@ under the License.
<input type="hidden" name="orderId" value="${task.orderId}" />
<input type="hidden" name="workEffortId" value="${task.workEffortId}" />
<input type="hidden" name="taskStatus" value="${task.currentStatusId}" />
- <#if task.statusId?? && task.statusId == "CAL_SENT">
+ <#if task.statusId?? && "CAL_SENT" == task.statusId>
<input type="hidden" name="partyId" value="${userLogin.partyId}" />
<input type="hidden" name="roleTypeId" value="${task.roleTypeId}" />
<input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}" />
@@ -250,7 +250,7 @@ under the License.
<div>${actualStartDate}</div>
</td>
<td>
- <#if task.wepaPartyId == "_NA_">
+ <#if "_NA_" == task.wepaPartyId>
<div>N/A</div>
<#else>
<a href="${customerDetailLink}${task.wepaPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${task.wepaPartyId}</a>
@@ -263,7 +263,7 @@ under the License.
${Static["org.apache.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)}
</a>
</td>
- <#if task.statusId?? && task.statusId == "CAL_SENT">
+ <#if task.statusId?? && "CAL_SENT" == task.statusId>
<td align="right"><input type="checkbox" name="delegate" value="true" checked="checked" /></td>
<#else>
<td align="right"><input type="checkbox" name="delegate" value="true" /></td>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl Mon Oct 16 11:31:40 2017
@@ -218,8 +218,8 @@ under the License.
<td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td>
<td>
<select name="allowSolicitation">
- <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+ <#if ("Y" == ((mechMap.partyContactMech.allowSolicitation)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if ("N" == ((mechMap.partyContactMech.allowSolicitation)!""))><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/party/template/party/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl Mon Oct 16 11:31:40 2017
@@ -77,16 +77,16 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr>
<td class="label">${uiLabelMap.PartyListName}</td>
- <td><input type="text" size="25" name="listName" value="${shoppingList.listName}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> />
+ <td><input type="text" size="25" name="listName" value="${shoppingList.listName}" <#if "auto-save" == shoppingList.listName?default("")>disabled="disabled"</#if> />
</tr>
<tr>
<td class="label">${uiLabelMap.CommonDescription}</td>
- <td><input type="text" size="70" name="description" value="${shoppingList.description!}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> />
+ <td><input type="text" size="70" name="description" value="${shoppingList.description!}" <#if "auto-save" == shoppingList.listName?default("")>disabled="disabled"</#if> />
</tr>
<tr>
<td class="label">${uiLabelMap.PartyListType}</td>
<td>
- <select name="shoppingListTypeId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
+ <select name="shoppingListTypeId" <#if "auto-save" == shoppingList.listName?default("")>disabled</#if>>
<#if shoppingListType??>
<option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
<option value="${shoppingListType.shoppingListTypeId}">--</option>
@@ -100,7 +100,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.PartyPublic}?</td>
<td>
- <select name="isPublic" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
+ <select name="isPublic" <#if "auto-save" == shoppingList.listName?default("")>disabled</#if>>
<option>${shoppingList.isPublic}</option>
<option value="${shoppingList.isPublic}">--</option>
<option value="Y">${uiLabelMap.CommonYes}</option>
@@ -111,7 +111,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.PartyParentList}</td>
<td>
- <select name="parentShoppingListId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
+ <select name="parentShoppingListId" <#if "auto-save" == shoppingList.listName?default("")>disabled</#if>>
<#if parentShoppingList??>
<option value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option>
</#if>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl Mon Oct 16 11:31:40 2017
@@ -49,7 +49,7 @@ under the License.
<select name="roleTypeId">
<option value="">${uiLabelMap.PartySelectRole}</option>
<#list roles as role>
- <option value="${role.roleTypeId}" <#if role.roleTypeId == "_NA_">selected="selected"</#if>>${role.get("description", locale)?default(role.roleTypeId)}</option>
+ <option value="${role.roleTypeId}" <#if "_NA_" == role.roleTypeId>selected="selected"</#if>>${role.get("description", locale)?default(role.roleTypeId)}</option>
</#list>
</select>
<input type="submit" value="${uiLabelMap.CommonUpload}" />
Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl Mon Oct 16 11:31:40 2017
@@ -36,7 +36,7 @@ under the License.
<td>${userUserLogin.userLoginId}</td>
<td>
<#assign enabled = uiLabelMap.PartyEnabled>
- <#if (userUserLogin.enabled)?default("Y") == "N">
+ <#if "N" == (userUserLogin.enabled)?default("Y")>
<#if userUserLogin.disabledDateTime??>
<#assign disabledTime = userUserLogin.disabledDateTime.toString()>
<#else>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/visit/ShowVisits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/visit/ShowVisits.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/visit/ShowVisits.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/visit/ShowVisits.ftl Mon Oct 16 11:31:40 2017
@@ -25,7 +25,7 @@ under the License.
<div class="screenlet-title-bar">
<ul>
<li class="h3">${title} ${uiLabelMap.PartyVisitListing}</li>
- <#if !partyId?? && showAll?lower_case == "true">
+ <#if !partyId?? && "true" == showAll?lower_case>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyShowActive}</a></li>
<#elseif !partyId??>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyShowAll}</a></li>
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl Mon Oct 16 11:31:40 2017
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if workEffort.workEffortTypeId == "PROD_ORDER_HEADER">
+<#if "PROD_ORDER_HEADER" == workEffort.workEffortTypeId>
<a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}" class="event">
${workEffort.workEffortId}
</a>
@@ -33,7 +33,7 @@ under the License.
</#list>
</#list>
</#if>
-<#elseif workEffort.workEffortTypeId == "PROD_ORDER_TASK">
+<#elseif "PROD_ORDER_TASK" == workEffort.workEffortTypeId>
<a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortParentId}" class="event">
${workEffort.workEffortParentId} / ${workEffort.workEffortId}
</a>
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.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!}"/>
- <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/workeffort/template/workeffort/EventReminderEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/template/workeffort/EventReminderEmail.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/template/workeffort/EventReminderEmail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/template/workeffort/EventReminderEmail.ftl Mon Oct 16 11:31:40 2017
@@ -27,7 +27,7 @@ under the License.
<style type="text/css">
.label {
font-weight: bold;
- <#if langDir == "ltr">
+ <#if "ltr" == langDir>
padding-right: 10px;
text-align: right;
<#else>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl Mon Oct 16 11:31:40 2017
@@ -82,7 +82,7 @@ under the License.
<div>Defined in: <a href="${artifactInfo.getLocationURL()}">${artifactInfo.getLocationURL()}</a></div>
</#if>
- <#if artifactInfo.getType() == "entity">
+ <#if "entity" == artifactInfo.getType()>
<div><a href="<@o...@ofbizUrl>">All Entity Data</a></div>
<h2>Entity Fields</h2>
<table>
@@ -126,7 +126,7 @@ under the License.
</#list>
</div>
- <#elseif artifactInfo.getType() == "service"/>
+ <#elseif "service" == artifactInfo.getType()/>
<h2>Service Info</h2>
<div> Description: ${artifactInfo.modelService.description}</div>
<div> Run (${artifactInfo.modelService.engineName}): ${artifactInfo.modelService.location} :: ${artifactInfo.modelService.invoke}</div>
@@ -203,7 +203,7 @@ under the License.
</#list>
</div>
- <#elseif artifactInfo.getType() == "form"/>
+ <#elseif "form" == artifactInfo.getType()/>
<div>
<h2>Form Extended by This Form</h2>
<#if artifactInfo.getFormThisFormExtends()??>
@@ -252,7 +252,7 @@ under the License.
</#list>
</div>
- <#elseif artifactInfo.getType() == "screen"/>
+ <#elseif "screen" == artifactInfo.getType()/>
<div>
<h2>Entities Used in This Screen</h2>
<#list artifactInfo.getEntitiesUsedInScreen()! as entityArtifactInfo>
@@ -302,7 +302,7 @@ under the License.
</#list>
</div>
- <#elseif artifactInfo.getType() == "request"/>
+ <#elseif "request" == artifactInfo.getType()/>
<#if artifactInfo.getServiceCalledByRequestEvent()??>
<div>
<h2>Service Called by Request Event</h2>
@@ -351,7 +351,7 @@ under the License.
</#list>
</div>
- <#elseif artifactInfo.getType() == "view"/>
+ <#elseif "view" == artifactInfo.getType()/>
<div>
<h2>Requests That This View is a Responses To</h2>
<#list artifactInfo.getRequestsThatThisViewIsResponseTo()! as controllerRequestArtifactInfo>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityRefMain.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityRefMain.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityRefMain.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityRefMain.ftl Mon Oct 16 11:31:40 2017
@@ -22,7 +22,7 @@ under the License.
<#assign langDir = "rtl">
</#if>
<#assign forstatic = false/>
-<#if (parameters.forstatic)?default("false") == "true">
+<#if "true" == (parameters.forstatic)?default("false")>
<#assign forstatic = true/>
</#if>
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl Mon Oct 16 11:31:40 2017
@@ -113,7 +113,7 @@ under the License.
</#if>
<#assign entCount = entCount + 1>
<#assign check = checkAll/>
- <#if checkAll == "true" && modelEntity.getClass().getName() == "org.apache.ofbiz.entity.model.ModelViewEntity">
+ <#if "true" == checkAll && "org.apache.ofbiz.entity.model.ModelViewEntity" == modelEntity.getClass().getName()>
<#assign check = "false"/>
</#if>
<#assign curEntityName = modelEntity.getEntityName()/>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl Mon Oct 16 11:31:40 2017
@@ -77,13 +77,13 @@ under the License.
<label for="onlyNotUsedLabels">${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}</label>
</td>
<td>
- <input type="checkbox" id="onlyNotUsedLabels" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
+ <input type="checkbox" id="onlyNotUsedLabels" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && "Y" == parameters.onlyNotUsedLabels>checked="checked"</#if> />
</td>
<td class="label">
<label for="onlyMissingTranslations">${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}</label>
</td>
<td>
- <input type="checkbox" id="onlyMissingTranslations" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
+ <input type="checkbox" id="onlyMissingTranslations" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && "Y" == parameters.onlyMissingTranslations>checked="checked"</#if> />
</td>
</tr>
<tr>