svn commit: r1618336 [11/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [11/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl Sat Aug 16 11:34:57 2014 @@ -62,13 +62,13 @@ under the License. <#list productReportList as productReport> <fo:table-row> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.internalName?if_exists} (${productReport.productId?if_exists})</fo:block> + <fo:block>${productReport.internalName!} (${productReport.productId!})</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.quantity?if_exists}</fo:block> + <fo:block>${productReport.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.unitPrice?if_exists}</fo:block> + <fo:block>${productReport.unitPrice!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Sat Aug 16 11:34:57 2014 @@ -38,7 +38,7 @@ under the License. <fo:page-sequence master-reference="main"> <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> <fo:block font-size="14pt">${uiLabelMap.OrderReportSalesByStore}</fo:block> - <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName?if_exists}</fo:block></#if> + <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName!}</fo:block></#if> <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.PartyParty}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if> <fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}: <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if> @@ -66,21 +66,21 @@ under the License. <fo:table-body> <#assign rowColor = "white"> <#list productReportList as productReport> - <#if productReport.quantityOrdered?exists && (productReport.quantityOrdered > 0)> + <#if productReport.quantityOrdered?? && (productReport.quantityOrdered > 0)> <fo:table-row> <#if showProductStore> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.productStoreId?if_exists}</fo:block> + <fo:block>${productReport.productStoreId!}</fo:block> </fo:table-cell> </#if> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.internalName?default("")} (${productReport.productId?if_exists})</fo:block> + <fo:block>${productReport.internalName?default("")} (${productReport.productId!})</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.quantityOrdered?if_exists}</fo:block> + <fo:block>${productReport.quantityOrdered!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.unitPrice?if_exists}</fo:block> + <fo:block>${productReport.unitPrice!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Sat Aug 16 11:34:57 2014 @@ -20,17 +20,17 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${baseSecureUrl?if_exists}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${baseSecureUrl!}/images/maincss.css" type="text/css"/> </head> <body> <h2>${title}</h2> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br /> - ${StringUtil.wrapString(noteData.noteInfo?if_exists)} + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has a note added to it:<br /> + ${StringUtil.wrapString(noteData.noteInfo!)} <br /><br /> Please login to the url below and add another note as a reply if required.<br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> + <a href="${StringUtil.wrapString(baseSecureUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Sat Aug 16 11:34:57 2014 @@ -20,15 +20,15 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl?if_exists)}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> </head> <body> <h1>${title}</h1> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been completed. <br /><br /> The status and used hours can always be checked at the url: <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> + <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl!}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if custRequestItem?exists> +<#if custRequestItem??> <form action="<@ofbizUrl>copyCustRequestItem</@ofbizUrl>" method="post"> <input type="hidden" name="custRequestId" value="${custRequestItem.custRequestId}"/> <input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Sat Aug 16 11:34:57 2014 @@ -20,17 +20,17 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl?if_exists)}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> </head> <body> <h1>${title}</h1> - <p>Hello ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been created successfully. + <p>Hello ${person.firstName!} ${person.middleName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been created successfully. <br /><br /> We will solve/implement the request as soon as possible <br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> + <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> <br /><br /> Regards. <br /><br /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if custRequestItem?exists> +<#if custRequestItem??> <#if quoteId?has_content> <div><a href="<@ofbizUrl>EditQuoteItemForRequest?quoteId=${quoteId}&custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleEditQuoteItemForCustRequest}</a> [${quoteId}]</div> <#else> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Sat Aug 16 11:34:57 2014 @@ -33,13 +33,13 @@ under the License. </tr> <#assign alt_row = false> <#list requestItems as requestItem> - <#if requestItem.productId?exists> + <#if requestItem.productId??> <#assign product = requestItem.getRelatedOne("Product", false)> </#if> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td valign="top"> <div> - <#if showRequestManagementLinks?exists> + <#if showRequestManagementLinks??> <a href="<@ofbizUrl>EditRequestItem?custRequestId=${requestItem.custRequestId}&custRequestItemSeqId=${requestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a> <#else> ${requestItem.custRequestItemSeqId} @@ -48,16 +48,16 @@ under the License. </td> <td valign="top"> <div> - ${(product.internalName)?if_exists} - <#if showRequestManagementLinks?exists> - <a href="/catalog/control/EditProduct?productId=${requestItem.productId?if_exists}" class="buttontext">${requestItem.productId?if_exists}</a> + ${(product.internalName)!} + <#if showRequestManagementLinks??> + <a href="/catalog/control/EditProduct?productId=${requestItem.productId!}" class="buttontext">${requestItem.productId!}</a> <#else> - <a href="<@ofbizUrl>product?product_id=${requestItem.productId?if_exists}</@ofbizUrl>" class="buttontext">${requestItem.productId?if_exists}</a> + <a href="<@ofbizUrl>product?product_id=${requestItem.productId!}</@ofbizUrl>" class="buttontext">${requestItem.productId!}</a> </#if> </div> </td> - <td align="right" valign="top">${requestItem.quantity?if_exists}</td> - <td align="right" valign="top">${requestItem.selectedAmount?if_exists}</td> + <td align="right" valign="top">${requestItem.quantity!}</td> + <td align="right" valign="top">${requestItem.selectedAmount!}</td> <td align="right" valign="top"><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></td> </tr> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Sat Aug 16 11:34:57 2014 @@ -21,13 +21,13 @@ under the License. <#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyAddressMailingShipping> - <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)?if_exists> + <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)!> <#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyToEmailAddress> - <#assign emailAddress = fulfillContactMech.infoString?if_exists> + <#assign emailAddress = fulfillContactMech.infoString!> <#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyPhoneNumber> - <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)?if_exists> + <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)!> </#if> <div class="screenlet"> @@ -48,14 +48,14 @@ under the License. <#if postalAddress?has_content> <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> + ${postalAddress.address1!}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city?if_exists}, + ${postalAddress.city!}, <#if postalAddress.stateProvinceGeoId?has_content> <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)> ${stateProvince.abbreviation?default(stateProvince.geoId)} </#if> - ${postalAddress.postalCode?if_exists} + ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> ${country.geoName?default(country.geoId)} @@ -63,7 +63,7 @@ under the License. </#if> <#if telecomNumber?has_content> - ${telecomNumber.countryCode?if_exists} + ${telecomNumber.countryCode!} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")} <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.custRequestDate.toString())?if_exists} + ${(custRequest.custRequestDate.toString())!} </td> </tr> <tr><td colspan="7"><hr /></td></tr> @@ -38,7 +38,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.createdDate.toString())?if_exists} + ${(custRequest.createdDate.toString())!} </td> </tr> <tr><td colspan="7"><hr /></td></tr> @@ -48,7 +48,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.lastModifiedDate.toString())?if_exists} + ${(custRequest.lastModifiedDate.toString())!} </td> </tr> </table> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Sat Aug 16 11:34:57 2014 @@ -27,11 +27,11 @@ under the License. <form name="selectAllForm" method="post" action="<@ofbizUrl>makeQuickReturn</@ofbizUrl>"> <input type="hidden" name="_checkGlobalScope" value="Y"/> <input type="hidden" name="_useRowSubmit" value="Y"/> - <input type="hidden" name="fromPartyId" value="${partyId?if_exists}"/> - <input type="hidden" name="toPartyId" value="${toPartyId?if_exists}"/> + <input type="hidden" name="fromPartyId" value="${partyId!}"/> + <input type="hidden" name="toPartyId" value="${toPartyId!}"/> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="needsInventoryReceive" value="${parameters.needsInventoryReceive?default("Y")}"/> - <input type="hidden" name="destinationFacilityId" value="${destinationFacilityId?if_exists}"/> + <input type="hidden" name="destinationFacilityId" value="${destinationFacilityId!}"/> <input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/> <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)> <input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/> @@ -42,7 +42,7 @@ under the License. <h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3> <table cellspacing="0" class="basic-table"> <tr><td> - <#if creditCardList?exists || eftAccountList?exists> + <#if creditCardList?? || eftAccountList??> <select name='paymentMethodId'> <option value=""></option> <#if creditCardList?has_content> @@ -53,7 +53,7 @@ under the License. </#if> <#if eftAccountList?has_content> <#list eftAccountList as eftAccount> - <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount?if_exists}, ${eftAccount.accountNumber?if_exists}</option> + <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount!}, ${eftAccount.accountNumber!}</option> </#list> </#if> </select> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Sat Aug 16 11:34:57 2014 @@ -25,18 +25,18 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <#if returnHeader?exists> + <#if returnHeader??> <form name="returnhead" method="post" action="<@ofbizUrl>updateReturn</@ofbizUrl>"> <input type="hidden" name="returnId" value="${returnHeader.returnId}" /> <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> - <input type="hidden" name="currentStatusId" value="${returnHeader.statusId?if_exists}" /> + <input type="hidden" name="currentStatusId" value="${returnHeader.statusId!}" /> <#else> <form name="returnhead" method="post" action="<@ofbizUrl>createReturn</@ofbizUrl>"> <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> </#if> <table cellspacing="0" class="basic-table"> - <#if returnHeader?exists> + <#if returnHeader??> <tr> <td width='14%'> </td> <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnId}</td> @@ -49,8 +49,8 @@ under the License. <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.CommonCurrency}</td> <td width='6%'> </td> <td width='74%'> - <#if returnHeader?exists> - ${returnHeader.currencyUomId?if_exists} + <#if returnHeader??> + ${returnHeader.currencyUomId!} <#else> <select name="currencyUomId"> <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)> @@ -74,10 +74,10 @@ under the License. <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderEntryDate}</td> <td width='6%'> </td> <td width='74%'> - <#if returnInfo.entryDate?exists> + <#if returnInfo.entryDate??> <#assign entryDate = returnInfo.get("entryDate").toString()> </#if> - <@htmlTemplate.renderDateTimeField name="entryDate" event="" action="" value="${entryDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="entryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="entryDate" event="" action="" value="${entryDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="entryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> </tr> <tr> @@ -85,7 +85,7 @@ under the License. <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromParty}</td> <td width='6%'> </td> <td width='74%'> - <@htmlTemplate.lookupField value='${returnInfo.fromPartyId?if_exists}' formName="returnhead" name="fromPartyId" id="fromPartyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value='${returnInfo.fromPartyId!}' formName="returnhead" name="fromPartyId" id="fromPartyId" fieldFormName="LookupPartyName"/> </td> </tr> <tr> @@ -94,7 +94,7 @@ under the License. <td width='6%'> </td> <td width='74%'> <select name='destinationFacilityId'> - <#if currentFacility?exists> + <#if currentFacility??> <option value="${currentFacility.facilityId}">${currentFacility.facilityName?default(currentFacility.facilityId)}</option> <option value="${currentFacility.facilityId}">---</option> </#if> @@ -111,13 +111,13 @@ under the License. <td width='74%'> <#if billingAccountList?has_content> <select name='billingAccountId'> - <#if currentAccount?exists> - <option value="${currentAccount.billingAccountId}">${currentAccount.billingAccountId}: ${currentAccount.description?if_exists}</option> + <#if currentAccount??> + <option value="${currentAccount.billingAccountId}">${currentAccount.billingAccountId}: ${currentAccount.description!}</option> <option value="${currentAccount.billingAccountId}">---</option> </#if> <option value="">${uiLabelMap.AccountingNewBillingAccount}</option> <#list billingAccountList as ba> - <option value="${ba.billingAccountId}">${ba.billingAccountId}: ${ba.description?if_exists}</option> + <option value="${ba.billingAccountId}">${ba.billingAccountId}: ${ba.description!}</option> </#list> </select> <#else> @@ -130,13 +130,13 @@ under the License. <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.FormFieldTitle_paymentMethodId}</td> <td width='6%'> </td> <td width='74%'> - <#if creditCardList?exists || eftAccountList?exists> + <#if creditCardList?? || eftAccountList??> <select name='paymentMethodId'> - <#if currentCreditCard?exists> + <#if currentCreditCard??> <option value="${currentCreditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(currentCreditCard)}</option> </#if> - <#if currentEftAccount?exists> - <option value="${currentEftAccount.paymentMethodId}">EFT: ${currentEftAccount.nameOnAccount?if_exists}, ${currentEftAccount.accountNumber?if_exists}</option> + <#if currentEftAccount??> + <option value="${currentEftAccount.paymentMethodId}">EFT: ${currentEftAccount.nameOnAccount!}, ${currentEftAccount.accountNumber!}</option> </#if> <option value=""></option> <#if creditCardList?has_content> @@ -147,12 +147,12 @@ under the License. </#if> <#if eftAccountList?has_content> <#list eftAccountList as eftAccount> - <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount?if_exists}, ${eftAccount.accountNumber?if_exists}</option> + <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount!}, ${eftAccount.accountNumber!}</option> </#list> </#if> </select> <#else> - <input type='text' size='20' name='paymentMethodId' value="${returnHeader?if_exists.paymentMethodId?if_exists}"/> + <input type='text' size='20' name='paymentMethodId' value="${(returnHeader.paymentMethodId)!}"/> </#if> <#if (returnHeader.fromPartyId)?has_content> <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> @@ -165,7 +165,7 @@ under the License. <td width='6%'> </td> <td width='74%'> <select name='needsInventoryReceive'> - <#if needsInventoryReceive?exists> + <#if needsInventoryReceive??> <#if "Y" == needsInventoryReceive> <option selected="selected" value="${needsInventoryReceive}">${uiLabelMap.CommonYes}</option> <#elseif "N" == needsInventoryReceive> @@ -185,7 +185,7 @@ under the License. <td width='6%'> </td> <td width='74%'> <select name="statusId"> - <#if currentStatus?exists> + <#if currentStatus??> <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option> <option value="${currentStatus.statusId}">---</option> </#if> @@ -256,7 +256,7 @@ under the License. <#if postalAddress?has_content> <div> <#if (editable)> - <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}" + <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId!}" <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if> /> </#if> <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Sat Aug 16 11:34:57 2014 @@ -26,7 +26,7 @@ under the License. </tr> <#-- information about orders and amount refunded/credited on past returns --> - <#if orh?exists> + <#if orh??> <tr><td colspan="10"> <table cellspacing="0" class="basic-table"> <tr> @@ -90,7 +90,7 @@ under the License. </tr> <#else> <#-- this is an order item --> - <#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))?if_exists/> + <#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))!/> <#-- need some order item information --> <#assign orderHeader = orderItem.getRelatedOne("OrderHeader", false)> <#assign itemCount = orderItem.quantity> @@ -102,14 +102,14 @@ under the License. <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> - <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/> + <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/> <div> - <#if orderItem.productId?exists> + <#if orderItem.productId??> ${orderItem.productId} <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/> </#if> - ${orderItem.itemDescription?if_exists} + ${orderItem.itemDescription!} </div> </td> <td align='center'> @@ -122,7 +122,7 @@ under the License. <div><@ofbizCurrency amount=orderItem.unitPrice isoCode=orderHeader.currencyUom/></div> </td> <td> - <#if orderItem.productId?exists> + <#if orderItem.productId??> <#assign product = orderItem.getRelatedOne("Product", false)/> <#if product.productTypeId == "ASSET_USAGE_OUT_IN"> <input type="text" size="8" name="returnPrice_o_${rowCount}" value="0.00"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Sat Aug 16 11:34:57 2014 @@ -19,7 +19,7 @@ under the License. <#macro displayReturnAdjustment returnAdjustment adjEditable> <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)> - <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)?if_exists> + <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)!> <#if (adjEditable)> <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> <input type="hidden" name="returnAdjustmentId_o_${rowCount}" value="${returnAdjustment.returnAdjustmentId}" /> @@ -45,11 +45,11 @@ under the License. <#else> <select name="returnTypeId_o_${rowCount}"> <#if (adjReturnType?has_content)> - <option value="${adjReturnType.returnTypeId}">${adjReturnType.get("description",locale)?if_exists}</option> + <option value="${adjReturnType.returnTypeId}">${adjReturnType.get("description",locale)!}</option> <option value="${adjReturnType.returnTypeId}">--</option> </#if> <#list returnTypes as returnTypeItem> - <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)?if_exists}</option> + <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)!}</option> </#list> </select> </#if> @@ -72,7 +72,7 @@ under the License. <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && 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?if_exists}&shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</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"> <#if returnShipmentIds?has_content> @@ -94,7 +94,7 @@ under the License. </div> <div class="screenlet-body"> <!-- if we're called with loadOrderItems or createReturn, then orderId would exist --> -<#if !requestParameters.orderId?exists> +<#if !requestParameters.orderId??> <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> <input type="hidden" name="_useRowSubmit" value="Y" /> <table cellspacing="0" class="basic-table"> @@ -102,7 +102,7 @@ under the License. <tr><td colspan="10"><h3>${uiLabelMap.OrderOrderReturn} #${returnId}</h3></td></tr> <#-- information about orders and amount refunded/credited on past returns --> - <#if orh?exists> + <#if orh??> <tr><td colspan="10"> <table cellspacing="0" class="basic-table"> <tr> @@ -142,13 +142,13 @@ under the License. <#if returnItems?has_content> <#assign alt_row = false> <#list returnItems as item> - <#assign orderItem = item.getRelatedOne("OrderItem", false)?if_exists> - <#assign orderHeader = item.getRelatedOne("OrderHeader", false)?if_exists> - <#assign returnReason = item.getRelatedOne("ReturnReason", false)?if_exists> - <#assign returnType = item.getRelatedOne("ReturnType", false)?if_exists> - <#assign status = item.getRelatedOne("InventoryStatusItem", false)?if_exists> - <#assign shipmentReceipts = item.getRelated("ShipmentReceipt", null, null, false)?if_exists> - <#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)> + <#assign orderItem = item.getRelatedOne("OrderItem", false)!> + <#assign orderHeader = item.getRelatedOne("OrderHeader", false)!> + <#assign returnReason = item.getRelatedOne("ReturnReason", false)!> + <#assign returnType = item.getRelatedOne("ReturnType", false)!> + <#assign status = item.getRelatedOne("InventoryStatusItem", false)!> + <#assign shipmentReceipts = item.getRelated("ShipmentReceipt", null, null, false)!> + <#if (item.get("returnQuantity")?? && item.get("returnPrice")??)> <#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") > <#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") > <#else> @@ -163,7 +163,7 @@ under the License. <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> </td> <td><div> - <#if item.get("productId")?exists> + <#if item.get("productId")??> <a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> <#else> N/A @@ -172,7 +172,7 @@ under the License. <#if readOnly> ${item.description?default("N/A")} <#else> - <input name="description_o_${rowCount}" value="${item.description?if_exists}" type="text" size="15" /> + <input name="description_o_${rowCount}" value="${item.description!}" type="text" size="15" /> </#if> </div></td> <td><div> @@ -181,9 +181,9 @@ under the License. <#else> <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right" /> </#if> - <#if item.receivedQuantity?exists> + <#if item.receivedQuantity??> <br />${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} - <#list shipmentReceipts?if_exists as shipmentReceipt> + <#list shipmentReceipts! as shipmentReceipt> <br />${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </#list> </#if> @@ -196,7 +196,7 @@ under the License. </#if> </div></td> <td> - <#if returnItemSubTotal?exists><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if> + <#if returnItemSubTotal??><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if> </td> <td><div> <#if readOnly> @@ -204,11 +204,11 @@ under the License. <#else> <select name="returnReasonId_o_${rowCount}"> <#if (returnReason?has_content)> - <option value="${returnReason.returnReasonId}">${returnReason.get("description",locale)?if_exists}</option> + <option value="${returnReason.returnReasonId}">${returnReason.get("description",locale)!}</option> <option value="${returnReason.returnReasonId}">--</option> </#if> <#list returnReasons as returnReasonItem> - <option value="${returnReasonItem.returnReasonId}">${returnReasonItem.get("description",locale)?if_exists}</option> + <option value="${returnReasonItem.returnReasonId}">${returnReasonItem.get("description",locale)!}</option> </#list> </select> </#if> @@ -223,11 +223,11 @@ under the License. <#else> <select name="expectedItemStatus_o_${rowCount}"> <#if (status?has_content)> - <option value="${status.statusId}">${status.get("description",locale)?if_exists}</option> + <option value="${status.statusId}">${status.get("description",locale)!}</option> <option value="${status.statusId}">--</option> </#if> <#list itemStatus as returnItemStatus> - <option value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)?if_exists}</option> + <option value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)!}</option> </#list> </select> </#if> @@ -238,18 +238,18 @@ under the License. <#else> <select name="returnTypeId_o_${rowCount}"> <#if (returnType?has_content)> - <option value="${returnType.returnTypeId}">${returnType.get("description",locale)?if_exists}</option> + <option value="${returnType.returnTypeId}">${returnType.get("description",locale)!}</option> <option value="${returnType.returnTypeId}">--</option> </#if> <#list returnTypes as returnTypeItem> - <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)?if_exists}</option> + <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)!}</option> </#list> </select> </#if></div></td> <#if (readOnly)> <td> <#if returnHeader.statusId == "RETURN_COMPLETED" || returnHeader.statusId == "SUP_RETURN_COMPLETED"> - <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)?if_exists> + <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)!> <#if itemResp?has_content> <#if itemResp.paymentId?has_content> <div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemResp.paymentId}</a></div> @@ -385,7 +385,7 @@ under the License. </table> </form> </#if> -<!-- if no requestParameters.orderId exists, then show list of items --> +<!-- if no requestParameters.orderId??, then show list of items --> <#else> <#assign selectAllFormName = "returnItems"/> <form name="returnItems" method="post" action="<@ofbizUrl>createReturnItems</@ofbizUrl>"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl Sat Aug 16 11:34:57 2014 @@ -17,14 +17,14 @@ specific language governing permissions under the License. --> <#assign selected = tabButtonItem?default("void")> -<#if returnHeader?exists> +<#if returnHeader??> <div class="button-bar tab-bar"> <ul> <li> <ul> - <li<#if selected="OrderReturnHeader"> class="selected"</#if>><a href="<@ofbizUrl>returnMain?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHeader}</a></li> - <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> - <li<#if selected="OrderReturnHistory"> class="selected"</#if>><a href="<@ofbizUrl>ReturnHistory?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHistory}</a></li> + <li<#if selected="OrderReturnHeader"> class="selected"</#if>><a href="<@ofbizUrl>returnMain?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnHeader}</a></li> + <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> + <li<#if selected="OrderReturnHistory"> class="selected"</#if>><a href="<@ofbizUrl>ReturnHistory?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnHistory}</a></li> </ul> </li> </ul> @@ -35,13 +35,13 @@ under the License. <ul> <li> <ul> - <li><a href="<@ofbizUrl>return.pdf?returnId=${returnId?if_exists}</@ofbizUrl>" target="_BLANK" >PDF</a></li> - <#if returnId?exists> + <li><a href="<@ofbizUrl>return.pdf?returnId=${returnId!}</@ofbizUrl>" target="_BLANK" >PDF</a></li> + <#if returnId??> <#assign returnItems = delegator.findByAnd("ReturnItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("returnId", returnId, "returnTypeId", "RTN_REFUND"), null, false)/> <#if returnItems?has_content> <#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/> - <#assign partyId = "${(returnHeader.fromPartyId)?if_exists}"/> - <a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId?if_exists}&originOrderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId?if_exists}</a> + <#assign partyId = "${(returnHeader.fromPartyId)!}"/> + <a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&originOrderId=${orderId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId!}</a> </#if> <#if "RETURN_ACCEPTED" == returnHeader.statusId> <#assign returnItems = delegator.findByAnd("ReturnItem", {"returnId" : returnId}, null, false)/> @@ -49,11 +49,11 @@ under the License. <#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/> <#assign shipGroupAssoc = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("OrderItemShipGroupAssoc", {"orderId" : orderId}, null, false))/> <#assign shipGroup = delegator.findOne("OrderItemShipGroup", {"orderId" : orderId, "shipGroupSeqId" : shipGroupAssoc.shipGroupSeqId}, false)> - <#if shipGroup?exists && shipGroup.shipmentMethodTypeId != "NO_SHIPPING"> + <#if shipGroup?? && shipGroup.shipmentMethodTypeId != "NO_SHIPPING"> <#assign shipGroupShipment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment", {"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" : shipGroup.shipGroupSeqId}, null, false))/> - <#if shipGroupShipment?exists> + <#if shipGroupShipment??> <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipGroupShipment.shipmentId}, null, false))> - <#if shipmentRouteSegment?exists> + <#if shipmentRouteSegment??> <#if "UPS" == shipmentRouteSegment.carrierPartyId> <li><a href="javascript:document.upsEmailReturnLabel.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a></li> <li><form name="upsEmailReturnLabel" method="post" action="<@ofbizUrl>upsEmailReturnLabelReturn</@ofbizUrl>"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Sat Aug 16 11:34:57 2014 @@ -31,20 +31,20 @@ under the License. </tr> <#list returnList as returnHeader> <#assign statusItem = returnHeader.getRelatedOne("StatusItem", false)> - <#if returnHeader.destinationFacilityId?exists> + <#if returnHeader.destinationFacilityId??> <#assign facility = returnHeader.getRelatedOne("Facility", false)> </#if> <tr> <td><a href="<@ofbizUrl>returnMain?returnId=${returnHeader.returnId}</@ofbizUrl>" class="buttontext">${returnHeader.returnId}</a></td> <td><div>${returnHeader.entryDate.toString()}</div></td> <td> - <#if returnHeader.fromPartyId?exists> + <#if returnHeader.fromPartyId??> <a href="${customerDetailLink}${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" class='buttontext'>${returnHeader.fromPartyId}</a> <#else> <span class="label">${uiLabelMap.CommonNA}</span> </#if> </td> - <td><#if facility?exists>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}</#if></td> + <td><#if facility??>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}</#if></td> <td>${statusItem.get("description",locale)}</td> </tr> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Sat Aug 16 11:34:57 2014 @@ -19,7 +19,7 @@ under the License. <#escape x as x?xml> <#macro displayReturnAdjustment returnAdjustment> <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)> - <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)?if_exists> + <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)!> <fo:table-row> <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell><fo:block></fo:block></fo:table-cell> @@ -67,11 +67,11 @@ under the License. </fo:table-cell> <fo:table-cell padding="1mm" font-size="8pt"> <fo:block> - <#if returnItem.orderItemSeqId?exists>${returnItem.getRelatedOne("OrderItem", false).getString("productId")}</#if> + <#if returnItem.orderItemSeqId??>${returnItem.getRelatedOne("OrderItem", false).getString("productId")}</#if> </fo:block> </fo:table-cell> - <fo:table-cell padding="1mm"><fo:block wrap-option="wrap">${returnItem.description?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId?exists>${(returnItem.getRelatedOne("ReturnReason", false)).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell> + <fo:table-cell padding="1mm"><fo:block wrap-option="wrap">${returnItem.description!}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId??>${(returnItem.getRelatedOne("ReturnReason", false)).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block>${returnItem.returnQuantity}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnItem.returnPrice isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=(returnItem.returnPrice * returnItem.returnQuantity) isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl Sat Aug 16 11:34:57 2014 @@ -34,8 +34,8 @@ under the License. <fo:table-body> <fo:table-row><fo:table-cell border-style="solid" border-width="0.2pt" padding="1mm"><fo:block font-weight="bold">${uiLabelMap.OrderReturnFromAddress}</fo:block></fo:table-cell></fo:table-row> <fo:table-row><fo:table-cell padding="1mm"> - <fo:block white-space-collapse="false"><#if fromPartyNameResult.fullName?has_content>${fromPartyNameResult.fullName}<#else/><#if postalAddressFrom?exists><#if (postalAddressFrom.toName)?has_content>${postalAddressFrom.toName}</#if><#if (postalAddressFrom.attnName)?has_content> -${postalAddressFrom.attnName}</#if></#if></#if><#if postalAddressFrom?exists> + <fo:block white-space-collapse="false"><#if fromPartyNameResult.fullName?has_content>${fromPartyNameResult.fullName}<#else/><#if postalAddressFrom??><#if (postalAddressFrom.toName)?has_content>${postalAddressFrom.toName}</#if><#if (postalAddressFrom.attnName)?has_content> +${postalAddressFrom.attnName}</#if></#if></#if><#if postalAddressFrom??> ${postalAddressFrom.address1}<#if (postalAddressFrom.address2)?has_content> ${postalAddressFrom.address2}</#if> ${postalAddressFrom.city}<#if (postalAddressFrom.stateProvinceGeoId)?has_content>, ${postalAddressFrom.stateProvinceGeoId}</#if><#if (postalAddressFrom.postalCode)?has_content>, ${postalAddressFrom.postalCode}</#if></#if> @@ -54,8 +54,8 @@ ${postalAddressFrom.city}<#if (postalAdd <fo:table-body> <fo:table-row><fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt"><fo:block font-weight="bold">${uiLabelMap.OrderReturnToAddress}</fo:block></fo:table-cell></fo:table-row> <fo:table-row><fo:table-cell padding="1mm"> - <fo:block white-space-collapse="false"><#if toPartyNameResult.fullName?has_content>${toPartyNameResult.fullName}<fo:block /><#else/><#if postalAddressTo?exists><#if (postalAddressTo.toName)?has_content>${postalAddressTo.toName}</#if><#if (postalAddressTo.attnName)?has_content> -${postalAddressTo.attnName}</#if></#if></#if><#if postalAddressTo?exists> + <fo:block white-space-collapse="false"><#if toPartyNameResult.fullName?has_content>${toPartyNameResult.fullName}<fo:block /><#else/><#if postalAddressTo??><#if (postalAddressTo.toName)?has_content>${postalAddressTo.toName}</#if><#if (postalAddressTo.attnName)?has_content> +${postalAddressTo.attnName}</#if></#if></#if><#if postalAddressTo??> ${postalAddressTo.address1}<#if (postalAddressTo.address2)?has_content> ${postalAddressTo.address2}</#if> ${postalAddressTo.city}<#if (postalAddressTo.stateProvinceGeoId)?has_content>, ${postalAddressTo.stateProvinceGeoId}</#if><#if (postalAddressTo.postalCode)?has_content>, ${postalAddressTo.postalCode}</#if></#if></fo:block> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Sat Aug 16 11:34:57 2014 @@ -56,26 +56,26 @@ under the License. </tr> <#if paymentSetups?has_content> <#list paymentSetups as paymentSetting> - <#if rowStyle?exists && rowStyle == "alternate-row"> + <#if rowStyle?? && rowStyle == "alternate-row"> <#assign rowStyle = "alternate-rowSelected"> <#else> <#assign rowStyle = "alternate-row"> </#if> <tr class="${rowStyle}"> - <td><div>${paymentSetting.siteName?if_exists}</div></td> - <td><div>${paymentSetting.description?if_exists}</div></td> - <td><div>${paymentSetting.paymentAuthService?if_exists}</div></td> - <td><div>${paymentSetting.paymentReAuthService?if_exists}</div></td> - <td><div>${paymentSetting.paymentCaptureService?if_exists}</div></td> - <td><div>${paymentSetting.paymentRefundService?if_exists}</div></td> - <td><div>${paymentSetting.paymentConfiguration?if_exists}</div></td> + <td><div>${paymentSetting.siteName!}</div></td> + <td><div>${paymentSetting.description!}</div></td> + <td><div>${paymentSetting.paymentAuthService!}</div></td> + <td><div>${paymentSetting.paymentReAuthService!}</div></td> + <td><div>${paymentSetting.paymentCaptureService!}</div></td> + <td><div>${paymentSetting.paymentRefundService!}</div></td> + <td><div>${paymentSetting.paymentConfiguration!}</div></td> <td nowrap="nowrap"> <div> <#if security.hasEntityPermission("PAYPROC", "_UPDATE", session)> - <a href="<@ofbizUrl>paysetup?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Edit</a> + <a href="<@ofbizUrl>paysetup?webSiteId=${paymentSetting.webSiteId!}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId!}</@ofbizUrl>" class="buttontext">Edit</a> </#if> <#if security.hasEntityPermission("PAYPROC", "_DELETE", session)> - <a href="<@ofbizUrl>removeWebSitePaymentSetting?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Remove</a> + <a href="<@ofbizUrl>removeWebSitePaymentSetting?webSiteId=${paymentSetting.webSiteId!}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId!}</@ofbizUrl>" class="buttontext">Remove</a> </#if> </div> </td> @@ -168,27 +168,27 @@ under the License. <tr> <td width="26%" align="right"><div>Processor Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService?if_exists}" size="30" maxlength="60" /></td> + <td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService!}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Re-Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService?if_exists}" size="30" maxlength="60" /></td> + <td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService!}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Capture Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService?if_exists}" size="30" maxlength="60" /></td> + <td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService!}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Refund Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService?if_exists}" size="30" maxlength="60" /></td> + <td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService!}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Properties URL</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration?if_exists}" size="30" maxlength="60" /></td> + <td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration!}" size="30" maxlength="60" /></td> </tr> <tr> <td colspan='2'> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Sat Aug 16 11:34:57 2014 @@ -69,7 +69,7 @@ under the License. <#list poList as orderHeaderAndRole> <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeaderAndRole)> <#assign statusItem = orderHeaderAndRole.getRelatedOne("StatusItem", true)> - <#assign placingParty = orh.getPlacingParty()?if_exists> + <#assign placingParty = orh.getPlacingParty()!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>orderview?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>${orderHeaderAndRole.orderId}</a></td> <td> @@ -78,13 +78,13 @@ under the License. <#if placingParty?has_content> <#assign partyId = placingParty.partyId> <#if placingParty.getEntityName() == "Person"> - <#if placingParty.lastName?exists> - ${placingParty.lastName}<#if placingParty.firstName?exists>, ${placingParty.firstName}</#if> + <#if placingParty.lastName??> + ${placingParty.lastName}<#if placingParty.firstName??>, ${placingParty.firstName}</#if> <#else> ${uiLabelMap.CommonNA} </#if> <#else> - <#if placingParty.groupName?exists> + <#if placingParty.groupName??> ${placingParty.groupName} <#else> ${uiLabelMap.CommonNA} @@ -98,7 +98,7 @@ under the License. <td><span style="white-space: nowrap;">${orderHeaderAndRole.getString("orderDate")}</span></td> <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> <td align="right">${orh.getTotalOrderItemsQuantity()?string.number}</td> - <td align="right"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom?if_exists/></td> + <td align="right"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom!/></td> <td width="1"> </td> <td align='right'> <a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>Schedule Delivery</a> @@ -141,7 +141,7 @@ under the License. </td> <td> <div> - <#if task.customerPartyId?exists> + <#if task.customerPartyId??> <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> <#else> N/A @@ -156,7 +156,7 @@ under the License. <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> <td width="1"> </td> <td> - <#if task.actualStartDate?exists> + <#if task.actualStartDate??> <#assign actualStartDate = task.get("actualStartDate").toString()> <#else> <#assign actualStartDate = "N/A"> @@ -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?exists && task.statusId == "CAL_SENT"> + <#if task.statusId?? && task.statusId == "CAL_SENT"> <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()}" /> @@ -228,7 +228,7 @@ under the License. </a> </td> <td> - <#if task.customerPartyId?exists> + <#if task.customerPartyId??> <a href="${customerDetailLink}${task.customerPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> <#else> @@ -242,7 +242,7 @@ under the License. <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> <td width="1"> </td> <td> - <#if task.actualStartDate?exists> + <#if task.actualStartDate??> <#assign actualStartDate = task.get("actualStartDate").toString()> <#else> <#assign actualStartDate = "N/A"> @@ -263,7 +263,7 @@ under the License. ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} </a> </td> - <#if task.statusId?exists && task.statusId == "CAL_SENT"> + <#if task.statusId?? && task.statusId == "CAL_SENT"> <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/trunk/applications/party/templates/email/AccountActivatedNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/AccountActivatedNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/templates/email/AccountActivatedNotification.ftl (original) +++ ofbiz/trunk/applications/party/templates/email/AccountActivatedNotification.ftl Sat Aug 16 11:34:57 2014 @@ -19,12 +19,12 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title?if_exists}</title> - <link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css" type="text/css"/> + <title>${title!}</title> + <link rel="stylesheet" href="${baseUrl!}/images/maincss.css" type="text/css"/> </head> <body> - <h1>${title?if_exists}</h1> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> + <h1>${title!}</h1> + <p>Hello ${person.firstName!} ${person.lastName!},</p> <p>Your account has been activated.</p> </body> </html> Modified: ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl (original) +++ ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl Sat Aug 16 11:34:57 2014 @@ -19,12 +19,12 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title?if_exists}</title> + <title>${title!}</title> <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/> </head> <body> - <h1>${title?if_exists}</h1> - <p>Hello ${(parameters.partyAndPerson.salutation)?if_exists} ${(parameters.partyAndPerson.personalTitle)?if_exists} ${(parameters.partyAndPerson.firstName)?if_exists} ${(parameters.partyAndPerson.middleName)?if_exists} ${(parameters.partyAndPerson.lastName)?if_exists} ${(parameters.partyAndPerson.suffix)?if_exists},</p> + <h1>${title!}</h1> + <p>Hello ${(parameters.partyAndPerson.salutation)!} ${(parameters.partyAndPerson.personalTitle)!} ${(parameters.partyAndPerson.firstName)!} ${(parameters.partyAndPerson.middleName)!} ${(parameters.partyAndPerson.lastName)!} ${(parameters.partyAndPerson.suffix)!},</p> <p>Your personal information has been updated successfully.</p> </body> </html> Modified: ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl (original) +++ ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl Sat Aug 16 11:34:57 2014 @@ -19,12 +19,12 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title?if_exists}</title> - <link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css" type="text/css"/> + <title>${title!}</title> + <link rel="stylesheet" href="${baseUrl!}/images/maincss.css" type="text/css"/> </head> <body> - <h1>${title?if_exists}</h1> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> + <h1>${title!}</h1> + <p>Hello ${person.firstName!} ${person.lastName!},</p> <p>Your account has been created successfully.</p> </body> </html> Modified: ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl (original) +++ ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl Sat Aug 16 11:34:57 2014 @@ -19,11 +19,11 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title?if_exists}</title> + <title>${title!}</title> <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/> </head> <body> - <h1>${title?if_exists}</h1> + <h1>${title!}</h1> <p>Thank you for registering. Please click the link below to complete your registration.</p> <br/><br/> <a href="${baseUrl}/cmssite/cms/verifyEmailAddress?verifyHash=${parameters.verifyHash}">www.cmssite.com/cms/registration.html</a> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Sat Aug 16 11:34:57 2014 @@ -84,7 +84,7 @@ under the License. <td>${map.mapKey}</td> <td>=></td> <td>${map.mapValue}</td> - <td>${map.sequenceNum?if_exists}</td> + <td>${map.sequenceNum!}</td> <td class="button-col"><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>">${uiLabelMap.CommonDelete}</a></td> </tr> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl Sat Aug 16 11:34:57 2014 @@ -16,9 +16,9 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - <fo:block>${postalAddress.address1?if_exists}</fo:block> - <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if> - <fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block> + <fo:block>${postalAddress.address1!}</fo:block> + <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if> + <fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block> <#if postalAddress.countryGeoId?has_content> <fo:block> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl Sat Aug 16 11:34:57 2014 @@ -19,21 +19,21 @@ under the License. <div> <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> + ${postalAddress.address1!}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city?if_exists}, + ${postalAddress.city!}, <#if postalAddress.stateProvinceGeoId?has_content> <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)> ${stateProvince.abbreviation?default(stateProvince.geoId)} </#if> - ${postalAddress.postalCode?if_exists} + ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> ${country.get("geoName", locale)?default(country.geoId)} </#if> </div> <#if !postalAddress.countryGeoId?has_content> - <#assign addr1 = postalAddress.address1?if_exists> + <#assign addr1 = postalAddress.address1!> <#if addr1?has_content && (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl Sat Aug 16 11:34:57 2014 @@ -16,9 +16,9 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - <fo:block>${postalAddress.address1?if_exists}</fo:block> - <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if> - <fo:block>${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists}</fo:block> + <fo:block>${postalAddress.address1!}</fo:block> + <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if> + <fo:block>${postalAddress.postalCode!} ${postalAddress.city!}</fo:block> <#if postalAddress.countryGeoId?has_content> <fo:block> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl Sat Aug 16 11:34:57 2014 @@ -19,9 +19,9 @@ under the License. <div> <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> + ${postalAddress.address1!}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists} + ${postalAddress.postalCode!} ${postalAddress.city!} <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> ${country.get("geoName", locale)?default(country.geoId)} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |