You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/08/16 13:35:02 UTC
svn commit: r1618336 [9/21] - in /ofbiz/trunk/applications:
accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/
accounting/webapp/accounting/finaccounttrans/
accounting/webapp/accounting/invoice/ accounting/webapp/accounting/pa...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Sat Aug 16 11:34:57 2014
@@ -43,22 +43,22 @@ under the License.
</fo:table-header>
<fo:table-body>
<#list orderItemList as orderItem>
- <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists>
- <#assign productId = orderItem.productId?if_exists>
+ <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!>
+ <#assign productId = orderItem.productId!>
<#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
<#assign itemAdjustment = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false)>
- <#assign internalImageUrl = Static["org.ofbiz.product.imagemanagement.ImageManagementHelper"].getInternalImageUrl(request, productId?if_exists)?if_exists>
+ <#assign internalImageUrl = Static["org.ofbiz.product.imagemanagement.ImageManagementHelper"].getInternalImageUrl(request, productId!)!>
<fo:table-row>
<fo:table-cell>
<fo:block>
<#if orderItem.supplierProductId?has_content>
- ${orderItem.supplierProductId} - ${orderItem.itemDescription?if_exists}
- <#elseif productId?exists>
- ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
- <#elseif orderItemType?exists>
- ${orderItemType.get("description",locale)} - ${orderItem.itemDescription?if_exists}
+ ${orderItem.supplierProductId} - ${orderItem.itemDescription!}
+ <#elseif productId??>
+ ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription!}
+ <#elseif orderItemType??>
+ ${orderItemType.get("description",locale)} - ${orderItem.itemDescription!}
<#else>
- ${orderItem.itemDescription?if_exists}
+ ${orderItem.itemDescription!}
</#if>
</fo:block>
</fo:table-cell>
@@ -109,7 +109,7 @@ under the License.
<fo:block font-weight="bold">
${adjustmentType.get("description",locale)} :
<#if orderHeaderAdjustment.get("description")?has_content>
- (${orderHeaderAdjustment.get("description")?if_exists})
+ (${orderHeaderAdjustment.get("description")!})
</#if>
</fo:block>
</fo:table-cell>
@@ -194,7 +194,7 @@ under the License.
<#if (note.internalNote?has_content) && (note.internalNote != "Y")>
<fo:table-row>
<fo:table-cell number-columns-spanned="1">
- <fo:block>${note.noteInfo?if_exists}</fo:block>
+ <fo:block>${note.noteInfo!}</fo:block>
</fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block>
@@ -205,7 +205,7 @@ under the License.
</fo:block>
</fo:table-cell>
<fo:table-cell number-columns-spanned="1">
- <fo:block>${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists}</fo:block>
+ <fo:block>${uiLabelMap.CommonAt}: ${note.noteDateTime?string!}</fo:block>
</fo:table-cell>
</fo:table-row>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Sat Aug 16 11:34:57 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#escape x as x?xml>
-<#if shipGroups?exists && shipGroups.size() gt 1>
+<#if shipGroups?? && shipGroups.size() gt 1>
<fo:table table-layout="fixed" border-spacing="3pt" space-before="0.3in" font-size="9pt">
<fo:table-column column-width="1in"/>
<fo:table-column column-width="1in"/>
@@ -32,13 +32,13 @@ under the License.
</fo:table-header>
<fo:table-body>
<#list shipGroups as shipGroup>
- <#assign orderItemShipGroupAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
+ <#assign orderItemShipGroupAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false)!>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
- <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem", false)?if_exists>
+ <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem", false)!>
<fo:table-row>
<fo:table-cell><fo:block>${shipGroup.shipGroupSeqId}</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>${orderItem.productId?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${orderItem.productId!}</fo:block></fo:table-cell>
<fo:table-cell text-align="right"><fo:block>${shipGroupAssoc.quantity?string.number}</fo:block></fo:table-cell>
</fo:table-row>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Sat Aug 16 11:34:57 2014
@@ -19,23 +19,23 @@ under the License.
<#escape x as x?xml>
<#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER">
- <#if supplierGeneralContactMechValueMap?exists>
+ <#if supplierGeneralContactMechValueMap??>
<#assign contactMech = supplierGeneralContactMechValueMap.contactMech>
<fo:block font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:block>
<#assign postalAddress = supplierGeneralContactMechValueMap.postalAddress>
<#if postalAddress?has_content>
<fo:block text-indent="0.2in">
<#if postalAddress.toName?has_content><fo:block>${postalAddress.toName}</fo:block></#if>
- <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.address1?if_exists}</fo:block>
- <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
+ <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName!}</fo:block></#if>
+ <fo:block>${postalAddress.address1!}</fo:block>
+ <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
<fo:block>
- <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
- ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists}
+ <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId!}, false))! />
+ ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName!}</#if> ${postalAddress.postalCode!}
</fo:block>
<fo:block>
- <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId?if_exists}, false))?if_exists />
- <#if countryGeo?has_content>${countryGeo.geoName?if_exists}</#if>
+ <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId!}, false))! />
+ <#if countryGeo?has_content>${countryGeo.geoName!}</#if>
</fo:block>
</fo:block>
</#if>
@@ -57,17 +57,17 @@ under the License.
<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}:</fo:block>
<fo:block text-indent="0.2in">
<#if postalAddress?has_content>
- <#if postalAddress.toName?has_content><fo:block>${postalAddress.toName?if_exists}</fo:block></#if>
- <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.address1?if_exists}</fo:block>
- <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
+ <#if postalAddress.toName?has_content><fo:block>${postalAddress.toName!}</fo:block></#if>
+ <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName!}</fo:block></#if>
+ <fo:block>${postalAddress.address1!}</fo:block>
+ <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
<fo:block>
- <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
- ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists}
+ <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId!}, false))! />
+ ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName!}</#if> ${postalAddress.postalCode!}
</fo:block>
<fo:block>
- <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId?if_exists}, false))?if_exists />
- <#if countryGeo?has_content>${countryGeo.geoName?if_exists}</#if>
+ <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId!}, false))! />
+ <#if countryGeo?has_content>${countryGeo.geoName!}</#if>
</fo:block>
</#if>
</fo:block>
@@ -80,12 +80,12 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.AccountingPaymentInformation}:</fo:block>
<#list orderPaymentPreferences as orderPaymentPreference>
<fo:block text-indent="0.2in">
- <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)?if_exists>
+ <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)!>
<#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
<#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod", false).getRelatedOne("CreditCard", false)>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
<#else>
- ${paymentMethodType.get("description",locale)?if_exists}
+ ${paymentMethodType.get("description",locale)!}
</#if>
</fo:block>
</#list>
@@ -95,11 +95,11 @@ under the License.
<#list shipGroups as shipGroup>
<fo:block text-indent="0.2in">
<#if shipGroups.size() gt 1>${shipGroup.shipGroupSeqId} - </#if>
- <#if (shipGroup.shipmentMethodTypeId)?exists>
+ <#if (shipGroup.shipmentMethodTypeId)??>
${(shipGroup.getRelatedOne("ShipmentMethodType", false).get("description", locale))?default(shipGroup.shipmentMethodTypeId)}
</#if>
- <#if (shipGroup.shipAfterDate)?exists || (shipGroup.shipByDate)?exists>
- <#if (shipGroup.shipAfterDate)?exists> - ${uiLabelMap.OrderShipAfterDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipAfterDate)}</#if><#if (shipGroup.shipByDate)?exists> - ${uiLabelMap.OrderShipBeforeDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipByDate)}</#if>
+ <#if (shipGroup.shipAfterDate)?? || (shipGroup.shipByDate)??>
+ <#if (shipGroup.shipAfterDate)??> - ${uiLabelMap.OrderShipAfterDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipAfterDate)}</#if><#if (shipGroup.shipByDate)??> - ${uiLabelMap.OrderShipBeforeDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipByDate)}</#if>
</#if>
</fo:block>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Sat Aug 16 11:34:57 2014
@@ -43,7 +43,7 @@ under the License.
<fo:table-cell><fo:block>${uiLabelMap.OrderCurrentStatus}</fo:block></fo:table-cell>
<fo:table-cell><fo:block font-weight="bold">${currentStatus.get("description",locale)}</fo:block></fo:table-cell>
</fo:table-row>
- <#if orderItem.cancelBackOrderDate?exists>
+ <#if orderItem.cancelBackOrderDate??>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</fo:block></fo:table-cell>
<#assign dateFormat = Static["java.text.DateFormat"].LONG>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Sat Aug 16 11:34:57 2014
@@ -20,31 +20,31 @@ under the License.
<#macro updateOrderContactMech orderHeader contactMechTypeId contactMechList contactMechPurposeTypeId contactMechAddress>
<#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
<form name="updateOrderContactMech" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderId?if_exists}" />
- <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}" />
- <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}" />
+ <input type="hidden" name="orderId" value="${orderId!}" />
+ <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId!}" />
+ <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId!}" />
<select name="contactMechId">
<#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
<option value="${contactMechAddress.contactMechId}">${(contactMechAddress.address1)?default("")} - ${contactMechAddress.city?default("")}</option>
<option value="${contactMechAddress.contactMechId}"></option>
<#list contactMechList as contactMech>
- <#assign postalAddress = contactMech.getRelatedOne("PostalAddress", false)?if_exists />
- <#assign partyContactPurposes = postalAddress.getRelated("PartyContactMechPurpose", null, null, false)?if_exists />
+ <#assign postalAddress = contactMech.getRelatedOne("PostalAddress", false)! />
+ <#assign partyContactPurposes = postalAddress.getRelated("PartyContactMechPurpose", null, null, false)! />
<#list partyContactPurposes as partyContactPurpose>
<#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId>
- <option value="${contactMech.contactMechId?if_exists}">${(postalAddress.address1)?default("")} - ${postalAddress.city?default("")}</option>
+ <option value="${contactMech.contactMechId!}">${(postalAddress.address1)?default("")} - ${postalAddress.city?default("")}</option>
</#if>
</#list>
</#list>
<#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER">
- <option value="${contactMechAddress.contactMechId}">${contactMechAddress.countryCode?if_exists} <#if contactMechAddress.areaCode?exists>${contactMechAddress.areaCode}-</#if>${contactMechAddress.contactNumber}</option>
+ <option value="${contactMechAddress.contactMechId}">${contactMechAddress.countryCode!} <#if contactMechAddress.areaCode??>${contactMechAddress.areaCode}-</#if>${contactMechAddress.contactNumber}</option>
<option value="${contactMechAddress.contactMechId}"></option>
<#list contactMechList as contactMech>
- <#assign telecomNumber = contactMech.getRelatedOne("TelecomNumber", false)?if_exists />
- <#assign partyContactPurposes = telecomNumber.getRelated("PartyContactMechPurpose", null, null, false)?if_exists />
+ <#assign telecomNumber = contactMech.getRelatedOne("TelecomNumber", false)! />
+ <#assign partyContactPurposes = telecomNumber.getRelated("PartyContactMechPurpose", null, null, false)! />
<#list partyContactPurposes as partyContactPurpose>
<#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId>
- <option value="${contactMech.contactMechId?if_exists}">${telecomNumber.countryCode?if_exists} <#if telecomNumber.areaCode?exists>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}</option>
+ <option value="${contactMech.contactMechId!}">${telecomNumber.countryCode!} <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}</option>
</#if>
</#list>
</#list>
@@ -52,10 +52,10 @@ under the License.
<option value="${contactMechAddress.contactMechId}">${(contactMechAddress.infoString)?default("")}</option>
<option value="${contactMechAddress.contactMechId}"></option>
<#list contactMechList as contactMech>
- <#assign partyContactPurposes = contactMech.getRelated("PartyContactMechPurpose", null, null, false)?if_exists />
+ <#assign partyContactPurposes = contactMech.getRelated("PartyContactMechPurpose", null, null, false)! />
<#list partyContactPurposes as partyContactPurpose>
<#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId>
- <option value="${contactMech.contactMechId?if_exists}">${contactMech.infoString?if_exists}</option>
+ <option value="${contactMech.contactMechId!}">${contactMech.infoString!}</option>
</#if>
</#list>
</#list>
@@ -83,10 +83,10 @@ under the License.
<#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
</#if>
- <#if partyId?exists>
+ <#if partyId??>
(<a href="${customerDetailLink}${partyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${partyId}</a>)
<br/>
- <#if (orderHeader.salesChannelEnumId)?exists && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
+ <#if (orderHeader.salesChannelEnumId)?? && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
<div>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a>
<a href="javascript:document.searchOtherOrders.submit()" class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
@@ -120,20 +120,20 @@ under the License.
${setContextField("postalAddress", postalAddress)}
${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
</div>
- <@updateOrderContactMech orderHeader=orderHeader?if_exists contactMechTypeId=contactMech.contactMechTypeId contactMechList=postalContactMechList?if_exists contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId?if_exists contactMechAddress=postalAddress?if_exists />
+ <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=postalContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=postalAddress! />
</#if>
<#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER">
<#assign telecomNumber = orderContactMechValueMap.telecomNumber>
<div>
- ${telecomNumber.countryCode?if_exists}
- <#if telecomNumber.areaCode?exists>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}
- <#--<#if partyContactMech.extension?exists>ext ${partyContactMech.extension}</#if>-->
- <#if !telecomNumber.countryCode?exists || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1">
+ ${telecomNumber.countryCode!}
+ <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}
+ <#--<#if partyContactMech.extension??>ext ${partyContactMech.extension}</#if>-->
+ <#if !telecomNumber.countryCode?? || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1">
<a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
<a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
</#if>
</div>
- <@updateOrderContactMech orderHeader=orderHeader?if_exists contactMechTypeId=contactMech.contactMechTypeId contactMechList=telecomContactMechList?if_exists contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId?if_exists contactMechAddress=telecomNumber?if_exists />
+ <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=telecomContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=telecomNumber! />
<#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS">
<div>
${contactMech.infoString}
@@ -143,7 +143,7 @@ under the License.
<a href="mailto:${contactMech.infoString}" class="buttontext">(${uiLabelMap.OrderSendEmail})</a>
</#if>
</div>
- <@updateOrderContactMech orderHeader=orderHeader?if_exists contactMechTypeId=contactMech.contactMechTypeId contactMechList=emailContactMechList?if_exists contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId?if_exists contactMechAddress=contactMech?if_exists />
+ <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=emailContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=contactMech! />
<#elseif contactMech.contactMechTypeId == "WEB_ADDRESS">
<div>
${contactMech.infoString}
@@ -155,7 +155,7 @@ under the License.
</div>
<#else>
<div>
- ${contactMech.infoString?if_exists}
+ ${contactMech.infoString!}
</div>
</#if>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sat Aug 16 11:34:57 2014
@@ -24,12 +24,12 @@ under the License.
<#assign externalOrder = "(" + orderHeader.externalId + ")"/>
</#if>
<#assign orderType = orderHeader.getRelatedOne("OrderType", false)/>
- <li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
+ <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">
<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?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderHeader.orderId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${storeFacilityId!}"/>
+ <input type="hidden" name="orderId" value="${orderHeader.orderId!}"/>
<input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/>
</form>
</li>
@@ -40,22 +40,22 @@ under the License.
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="newStatusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
- <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
- <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
+ <input type="hidden" name="workEffortId" value="${workEffortId!}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="partyId" value="${assignPartyId!}"/>
+ <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/>
+ <input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
<#elseif currentStatus.statusId == "ORDER_APPROVED">
<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"/>
- <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
- <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
+ <input type="hidden" name="workEffortId" value="${workEffortId!}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="partyId" value="${assignPartyId!}"/>
+ <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/>
+ <input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
<#elseif currentStatus.statusId == "ORDER_HOLD">
@@ -63,11 +63,11 @@ under the License.
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
- <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
- <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
+ <input type="hidden" name="workEffortId" value="${workEffortId!}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="partyId" value="${assignPartyId!}"/>
+ <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/>
+ <input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
</#if>
@@ -76,11 +76,11 @@ under the License.
<form name="OrderCancel" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_CANCELLED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
- <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
- <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
+ <input type="hidden" name="workEffortId" value="${workEffortId!}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="partyId" value="${assignPartyId!}"/>
+ <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/>
+ <input type="hidden" name="fromDate" value="${fromDate!}"/>
</form>
</li>
</#if>
@@ -88,7 +88,7 @@ under the License.
<li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a>
<form name="OrderCompleteOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_COMPLETED"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
</form>
</li>
</#if>
@@ -192,7 +192,7 @@ under the License.
</#if>
</td>
</tr>
- <#if (orderItem.cancelBackOrderDate)?exists>
+ <#if (orderItem.cancelBackOrderDate)??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td>
@@ -200,7 +200,7 @@ under the License.
<td valign="top" width="80%"><#if orderItem.cancelBackOrderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td>
</tr>
</#if>
- <#if distributorId?exists>
+ <#if distributorId??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td>
@@ -211,7 +211,7 @@ under the License.
</td>
</tr>
</#if>
- <#if affiliateId?exists>
+ <#if affiliateId??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td>
@@ -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)?if_exists == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
- <option value="2" <#if (orderHeader.priority)?if_exists == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option>
- <option value="3" <#if (orderHeader.priority)?if_exists == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option>
+ <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>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/>
</form>
@@ -259,8 +259,8 @@ 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)?if_exists == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option>
- <option value="N" <#if (orderHeader.invoicePerShipment)?if_exists == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option>
+ <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>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"/>
</form>
@@ -282,7 +282,7 @@ under the License.
<td valign="top" width="80%">
<form id="orderViewed" action="">
<input type="checkbox" name="checkViewed" onclick="javascript:markOrderViewed();"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
<input type="hidden" name="isViewed" value="Y"/>
</form>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Aug 16 11:34:57 2014
@@ -49,25 +49,25 @@ under the License.
<#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)>
<#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
- <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists>
- <#assign productId = orderItem.productId?if_exists>
- <#if productId?exists && productId == "shoppingcart.CommentLine">
+ <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!>
+ <#assign productId = orderItem.productId!>
+ <#if productId?? && productId == "shoppingcart.CommentLine">
<td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td>
<#else>
<td colspan="7">
<div class="order-item-description">
<#if orderItem.supplierProductId?has_content>
- ${orderItem.supplierProductId} - ${orderItem.itemDescription?if_exists}
- <#elseif productId?exists>
- ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
- <#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
+ ${orderItem.supplierProductId} - ${orderItem.itemDescription!}
+ <#elseif productId??>
+ ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription!}
+ <#if (product.salesDiscontinuationDate)?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
<br />
<span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(product.salesDiscontinuationDate, "", locale, timeZone)!}</span>
</#if>
- <#elseif orderItemType?exists>
- ${orderItemType.description} - ${orderItem.itemDescription?if_exists}
+ <#elseif orderItemType??>
+ ${orderItemType.description} - ${orderItem.itemDescription!}
<#else>
- ${orderItem.itemDescription?if_exists}
+ ${orderItem.itemDescription!}
</#if>
<#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
<#if orderItemAttributes?has_content>
@@ -98,16 +98,16 @@ under the License.
</#if>
</tr>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
- <#if productId?exists && productId == "shoppingcart.CommentLine">
+ <#if productId?? && productId == "shoppingcart.CommentLine">
<td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td>
<#else>
<td valign="top">
<#if productId?has_content>
<#assign product = orderItem.getRelatedOne("Product", true)>
</#if>
- <#if productId?exists>
+ <#if productId??>
<#-- INVENTORY -->
- <#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?exists && quantityOnHandMap?exists && availableToPromiseMap.get(productId)?exists && quantityOnHandMap.get(productId)?exists>
+ <#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?? && quantityOnHandMap?? && availableToPromiseMap.get(productId)?? && quantityOnHandMap.get(productId)??>
<#assign quantityToProduce = 0>
<#assign atpQuantity = availableToPromiseMap.get(productId)?default(0)>
<#assign qohQuantity = quantityOnHandMap.get(productId)?default(0)>
@@ -133,12 +133,12 @@ under the License.
<td>${uiLabelMap.OrderRequiredForSO}</td>
<td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td>
</tr>
- <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists>
+ <#if availableToPromiseByFacilityMap?? && quantityOnHandByFacilityMap?? && quantityOnHandByFacilityMap.get(productId)?? && availableToPromiseByFacilityMap.get(productId)??>
<#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)>
<#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)>
<tr>
<td>
- ${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}
+ ${uiLabelMap.ProductInInventory} [${facility.facilityName!}] ${uiLabelMap.ProductQoh}
</td>
<td style="padding-left: 15px; text-align: left;">
${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility})
@@ -192,8 +192,8 @@ under the License.
<a href="javascript:document.OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}.submit()" class="buttontext">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ITEM_APPROVED"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId!}"/>
</form>
</div>
</#if>
@@ -204,7 +204,7 @@ under the License.
</#list>
</div>
</div>
- <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)?if_exists>
+ <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)!>
<#if returns?has_content>
<#list returns as returnItem>
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader", false)>
@@ -224,13 +224,13 @@ under the License.
<#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)>
<#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId}, null, false)/>
<#assign totalReceived = 0.0>
- <#if shipmentReceipts?exists && shipmentReceipts?has_content>
+ <#if shipmentReceipts?? && shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
- <#if shipmentReceipt.quantityAccepted?exists && shipmentReceipt.quantityAccepted?has_content>
+ <#if shipmentReceipt.quantityAccepted?? && shipmentReceipt.quantityAccepted?has_content>
<#assign quantityAccepted = shipmentReceipt.quantityAccepted>
<#assign totalReceived = quantityAccepted + totalReceived>
</#if>
- <#if shipmentReceipt.quantityRejected?exists && shipmentReceipt.quantityRejected?has_content>
+ <#if shipmentReceipt.quantityRejected?? && shipmentReceipt.quantityRejected?has_content>
<#assign quantityRejected = shipmentReceipt.quantityRejected>
<#assign totalReceived = quantityRejected + totalReceived>
</#if>
@@ -318,7 +318,7 @@ under the License.
</#if>
</tr>
<#-- show info from workeffort -->
- <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?if_exists>
+ <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!>
<#if workOrderItemFulfillments?has_content>
<#list workOrderItemFulfillments as workOrderItemFulfillment>
<#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)>
@@ -330,7 +330,7 @@ under the License.
<a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}${StringUtil.wrapString(externalKeyParam)}"
class="buttontext">${workEffort.workEffortId}</a>
${uiLabelMap.OrderCurrentStatus}
- ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}
+ ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}
<#else>
${uiLabelMap.CommonFrom}
: <#if workEffort.estimatedStartDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedStartDate, "", locale, timeZone)!}</#if> ${uiLabelMap.CommonTo}
@@ -355,9 +355,9 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
- <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${description?if_exists})
+ <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${description!})
<a href="/ordermgr/control/orderview?orderId=${linkedOrderId}"
- class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description!}
</td>
</tr>
</#list>
@@ -372,15 +372,15 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
<td colspan="6">
- <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> (${description?if_exists})
+ <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> (${description!})
<a href="/ordermgr/control/orderview?orderId=${linkedOrderId}"
- class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description!}
</td>
</tr>
</#list>
</#if>
<#-- show linked requirements -->
- <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)?if_exists>
+ <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)!>
<#if linkedRequirements?has_content>
<#list linkedRequirements as linkedRequirement>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -394,7 +394,7 @@ under the License.
</#list>
</#if>
<#-- show linked quote -->
- <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)?if_exists>
+ <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)!>
<#if linkedQuote?has_content>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td> </td>
@@ -407,13 +407,13 @@ under the License.
</#if>
<#-- now show adjustment details per line item -->
<#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)>
- <#if orderItemAdjustments?exists && orderItemAdjustments?has_content>
+ <#if orderItemAdjustments?? && orderItemAdjustments?has_content>
<#list orderItemAdjustments as orderItemAdjustment>
<#assign adjustmentType = orderItemAdjustment.getRelatedOne("OrderAdjustmentType", true)>
<tr<#if itemClass == "1"> 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)?if_exists)}
+ ${StringUtil.wrapString(orderItemAdjustment.get("description",locale)!)}
<#if orderItemAdjustment.comments?has_content>
(${orderItemAdjustment.comments?default("")})
</#if>
@@ -425,20 +425,20 @@ under the License.
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
<#if primaryGeo.geoName?has_content>
- <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation!}]
</#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/>
- <span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
+ <span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation!}])
</#if>
</#if>
- <#if orderItemAdjustment.sourcePercentage?exists>
+ <#if orderItemAdjustment.sourcePercentage??>
<span class="label">${uiLabelMap.OrderRate}</span> ${orderItemAdjustment.sourcePercentage?string("0.######")}
</#if>
<#if orderItemAdjustment.customerReferenceId?has_content>
<span class="label">${uiLabelMap.OrderCustomerTaxId}</span> ${orderItemAdjustment.customerReferenceId}
</#if>
- <#if orderItemAdjustment.exemptAmount?exists>
+ <#if orderItemAdjustment.exemptAmount??>
<span class="label">${uiLabelMap.OrderExemptAmount}</span> ${orderItemAdjustment.exemptAmount}
</#if>
</#if>
@@ -454,15 +454,15 @@ under the License.
</#if>
<#-- now show price info per line item -->
<#assign orderItemPriceInfos = orderReadHelper.getOrderItemPriceInfos(orderItem)>
- <#if orderItemPriceInfos?exists && orderItemPriceInfos?has_content>
+ <#if orderItemPriceInfos?? && orderItemPriceInfos?has_content>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td colspan="7"> </td>
</tr>
<#list orderItemPriceInfos as orderItemPriceInfo>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
- <span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId?if_exists}:${orderItemPriceInfo.productPriceActionSeqId?if_exists}]
- ${orderItemPriceInfo.description?if_exists}
+ <span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId!}:${orderItemPriceInfo.productPriceActionSeqId!}]
+ ${orderItemPriceInfo.description!}
</td>
<td> </td>
<td align="right">
@@ -474,7 +474,7 @@ under the License.
</#if>
<#-- now show survey information per line item -->
<#assign orderItemSurveyResponses = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSurveyResponse(orderItem)>
- <#if orderItemSurveyResponses?exists && orderItemSurveyResponses?has_content>
+ <#if orderItemSurveyResponses?? && orderItemSurveyResponses?has_content>
<#list orderItemSurveyResponses as survey>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
@@ -487,7 +487,7 @@ under the License.
</#list>
</#if>
<#-- display the ship estimated/before/after dates -->
- <#if orderItem.estimatedShipDate?exists>
+ <#if orderItem.estimatedShipDate??>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!}
@@ -495,7 +495,7 @@ under the License.
<td colspan="5"> </td>
</tr>
</#if>
- <#if orderItem.estimatedDeliveryDate?exists>
+ <#if orderItem.estimatedDeliveryDate??>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!}
@@ -503,7 +503,7 @@ under the License.
<td colspan="5"> </td>
</tr>
</#if>
- <#if orderItem.shipAfterDate?exists>
+ <#if orderItem.shipAfterDate??>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!}
@@ -511,7 +511,7 @@ under the License.
<td colspan="5"> </td>
</tr>
</#if>
- <#if orderItem.shipBeforeDate?exists>
+ <#if orderItem.shipBeforeDate??>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!}
@@ -520,11 +520,11 @@ under the License.
</tr>
</#if>
<#-- now show ship group info per line item -->
- <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
+ <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)!>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
<#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)>
- <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}]
@@ -538,7 +538,7 @@ under the License.
</#list>
</#if>
<#-- now show inventory reservation info per line item -->
- <#if orderItemShipGrpInvResList?exists && orderItemShipGrpInvResList?has_content>
+ <#if orderItemShipGrpInvResList?? && orderItemShipGrpInvResList?has_content>
<#list orderItemShipGrpInvResList as orderItemShipGrpInvRes>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
@@ -564,7 +564,7 @@ under the License.
</#list>
</#if>
<#-- now show planned shipment info per line item -->
- <#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)?if_exists>
+ <#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)!>
<#if orderShipments?has_content>
<#list orderShipments as orderShipment>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -582,7 +582,7 @@ under the License.
</#list>
</#if>
<#-- now show item issuances (shipment) per line item -->
- <#assign itemIssuances = itemIssuancesPerItem.get(orderItem.get("orderItemSeqId"))?if_exists>
+ <#assign itemIssuances = itemIssuancesPerItem.get(orderItem.get("orderItemSeqId"))!>
<#if itemIssuances?has_content>
<#list itemIssuances as itemIssuance>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -591,7 +591,7 @@ under the License.
<span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span>
<a target="facility"
href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}${StringUtil.wrapString(externalKeyParam)}"
- class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists}
+ class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId!}
<#else>
<span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span>
</#if>
@@ -613,7 +613,7 @@ under the License.
<span class="label">${uiLabelMap.CommonInventory}</span>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}"
class="buttontext">${itemIssuance.inventoryItemId}</a>
- <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists}
+ <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId!}
<#if (inventoryItem.serialNumber?has_content)>
<br />
<span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber}
@@ -628,7 +628,7 @@ under the License.
</#list>
</#if>
<#-- now show shipment receipts per line item -->
- <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)?if_exists>
+ <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)!>
<#if shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
@@ -637,7 +637,7 @@ under the License.
<span class="label">${uiLabelMap.OrderShipmentReceived}</span>
<a target="facility"
href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}${StringUtil.wrapString(externalKeyParam)}"
- class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
+ class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId!}
</#if>
<#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if>
<span class="label">${uiLabelMap.CommonInventory}</span>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Sat Aug 16 11:34:57 2014
@@ -40,12 +40,12 @@ under the License.
<tr>
<td>
<#if state.hasPrevious()>
- <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a>
+ <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a>
</#if>
</td>
<td align="right">
<#if state.hasNext()>
- <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+ <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
</#if>
</td>
</tr>
@@ -168,37 +168,37 @@ under the License.
<#list orderHeaderList as orderHeader>
<#assign status = orderHeader.getRelatedOne("StatusItem", true)>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
- <#assign billToParty = orh.getBillToParty()?if_exists>
- <#assign billFromParty = orh.getBillFromParty()?if_exists>
+ <#assign billToParty = orh.getBillToParty()!>
+ <#assign billFromParty = orh.getBillFromParty()!>
<#if billToParty?has_content>
<#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
<#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
- <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)?if_exists> -->
+ <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)!> -->
<#else>
<#assign billTo = ''/>
</#if>
<#if billFromParty?has_content>
- <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)?if_exists>
+ <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)!>
<#else>
<#assign billFrom = ''/>
</#if>
- <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists />
+ <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)! />
<tr>
<td><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
<td>
<a href="<@o...@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a>
</td>
- <td>${orderHeader.orderName?if_exists}</td>
+ <td>${orderHeader.orderName!}</td>
<td>${orderHeader.getRelatedOne("OrderType", true).get("description",locale)}</td>
- <td>${billFrom?if_exists}</td>
- <td>${billTo?if_exists}</td>
+ <td>${billFrom!}</td>
+ <td>${billTo!}</td>
<td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
<td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td>
<td>
<#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)>
<#list trackingCodes as trackingCode>
<#if trackingCode?has_content>
- <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br />
+ <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey!}">${trackingCode.trackingCodeId}</a><br />
</#if>
</#list>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Sat Aug 16 11:34:57 2014
@@ -47,7 +47,7 @@ under the License.
${note.noteInfo?replace("\n", "<br/>")}
</td>
<td align="right" valign="top" width="15%">
- <#if note.internalNote?if_exists == "N">
+ <#if note.internalNote! == "N">
${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?if_exists == "Y">
+ <#if note.internalNote! == "Y">
${uiLabelMap.OrderNotPrintableNote}
<form name="publicNotesForm_${note_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>