svn commit: r1618336 [8/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [8/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Sat Aug 16 11:34:57 2014 @@ -24,9 +24,9 @@ and similar information. This is design standard order confirmation page and to be re-usable by other screens. --> -<#if !(cart?exists)><#assign cart = shoppingCart?if_exists/></#if> +<#if !(cart??)><#assign cart = shoppingCart!/></#if> -<#if cart?exists> +<#if cart??> <div class="screenlet"> <div class="screenlet-title-bar"> <div class="h3">${uiLabelMap.OrderShippingInformation}</div> @@ -63,34 +63,34 @@ standard order confirmation page and to <#-- address destination column (spans a number of rows = number of cart items in it) --> <td rowspan="${numberOfItems}"> - <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)?if_exists /> + <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)! /> <#if contactMech?has_content> - <#assign address = contactMech.getRelatedOne("PostalAddress", false)?if_exists /> + <#assign address = contactMech.getRelatedOne("PostalAddress", false)! /> </#if> - <#if address?exists> + <#if address??> <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br /></#if> <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br /></#if> <#if address.address1?has_content>${address.address1}<br /></#if> <#if address.address2?has_content>${address.address2}<br /></#if> <#if address.city?has_content>${address.city}</#if> <#if address.stateProvinceGeoId?has_content> ${address.stateProvinceGeoId}</#if> - <#if address.postalCode?has_content>, ${address.postalCode?if_exists}</#if> + <#if address.postalCode?has_content>, ${address.postalCode!}</#if> </#if> </td> <#-- supplier id (for drop shipments) (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)! /> <#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if> </td> <#-- carrier column (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)?if_exists /> - <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)?if_exists /> + <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)! /> + <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)! /> <#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if> <#if method?has_content>${method.description?default(method.shipmentMethodTypeId)}</#if> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Sat Aug 16 11:34:57 2014 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <#assign currencyUomId = shoppingCart.getCurrency()> <#assign partyId = shoppingCart.getPartyId()> <#assign partyMap = Static["org.ofbiz.party.party.PartyWorker"].getPartyOtherValues(request, partyId, "party", "person", "partyGroup")> -<#assign agreementId = shoppingCart.getAgreementId()?if_exists> -<#assign quoteId = shoppingCart.getQuoteId()?if_exists> +<#assign agreementId = shoppingCart.getAgreementId()!> +<#assign quoteId = shoppingCart.getQuoteId()!> <#if shoppingCart?has_content> <#assign shoppingCartSize = shoppingCart.size()> @@ -44,12 +44,12 @@ under the License. </form> <p> <strong>${uiLabelMap.Party}</strong>: - <a href="${customerDetailLink}${partyId}${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a> - <#if partyMap.person?exists> - ${partyMap.person.firstName?if_exists} ${partyMap.person.lastName?if_exists} + <a href="${customerDetailLink}${partyId}${externalKeyParam!}" target="partymgr" class="buttontext">${partyId}</a> + <#if partyMap.person??> + ${partyMap.person.firstName!} ${partyMap.person.lastName!} </#if> - <#if partyMap.partyGroup?exists> - ${partyMap.partyGroup.groupName?if_exists} + <#if partyMap.partyGroup??> + ${partyMap.partyGroup.groupName!} </#if> </p> <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -35,16 +35,16 @@ under the License. <#if shoppingCart.getOrderType() == "SALES_ORDER"> <li><a href="<@ofbizUrl>createCustRequestFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a></li> </#if> - <li><a href="/partymgr/control/findparty?${externalKeyParam?if_exists}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li> + <li><a href="/partymgr/control/findparty?${externalKeyParam!}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li> <#if shoppingCart.getOrderType() == "SALES_ORDER"> <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a></li> </#if> <li><a href="<@ofbizUrl>checkinits</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a></li> <#if security.hasEntityPermission("CATALOG", "_CREATE", session)> - <li><a href="/catalog/control/EditProduct?${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li> + <li><a href="/catalog/control/EditProduct?${externalKeyParam!}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li> </#if> <li><a href="<@ofbizUrl>quickadd</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickAdd}</a></li> - <#if shoppingLists?exists> + <#if shoppingLists??> <li><a href="<@ofbizUrl>viewPartyShoppingLists?partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li> </#if> </ul> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Sat Aug 16 11:34:57 2014 @@ -30,7 +30,7 @@ under the License. <div class="screenlet-body"> <table> - <#if agreements?exists> + <#if agreements??> <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='Y'/></td></tr> <tr> @@ -46,7 +46,7 @@ under the License. <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreements as agreement> - <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description?if_exists}</option> + <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description!}</option> </#list> </select> </div> @@ -55,7 +55,7 @@ under the License. <#else> <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='N'/></td></tr> </#if> - <#if agreementRoles?exists> + <#if agreementRoles??> <tr> <td> </td> <td align='right' valign='top' nowrap="nowrap"> @@ -69,7 +69,7 @@ under the License. <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreementRoles as agreementRole> - <option value='${agreementRole.agreementId?if_exists}' >${agreementRole.agreementId?if_exists} - ${agreementRole.roleTypeId?if_exists}</option> + <option value='${agreementRole.agreementId!}' >${agreementRole.agreementId!} - ${agreementRole.roleTypeId!}</option> </#list> </select> </div> @@ -118,7 +118,7 @@ under the License. <td> </td> <td align='right' valign='middle' nowrap="nowrap"> <div class='tableheadtext'> - <#if agreements?exists>${uiLabelMap.OrderSelectCurrencyOr} + <#if agreements??>${uiLabelMap.OrderSelectCurrencyOr} <#else>${uiLabelMap.OrderSelectCurrency} </#if> </div> @@ -145,7 +145,7 @@ under the License. <td> <#if catalogCol?has_content> <select name='CURRENT_CATALOG_ID'> - <#list catalogCol?if_exists as catalogId> + <#list catalogCol! as catalogId> <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> <option value="${catalogId}" <#if currentCatalogId?default('') == catalogId>selected="selected"</#if> >${thisCatalogName}</option> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl Sat Aug 16 11:34:57 2014 @@ -36,12 +36,12 @@ under the License. <tr> <td align="center"> <#if person?has_content> - <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName?if_exists} ${person.lastName?if_exists}</a></div> + <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName!} ${person.lastName!}</a></div> <#elseif partyGroup?has_content> - <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName?if_exists}</a></div> + <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName!}</a></div> </#if> <form method="post" action="<@ofbizUrl>orderentry</@ofbizUrl>" name="setpartyform"> - <div><input type="text" name="partyId" size='10' value="${partyId?if_exists}" /></div> + <div><input type="text" name="partyId" size='10' value="${partyId!}" /></div> <div> <a href="javascript:document.setpartyform.submit();" class="buttontext">${uiLabelMap.CommonSet}</a> | <a href="/partymgr/control/findparty" class="buttontext">${uiLabelMap.CommonFind}</a><#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | <a href="${customerDetailLink}${partyId}" class="buttontext">${uiLabelMap.CommonView}</a></#if> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Sat Aug 16 11:34:57 2014 @@ -39,9 +39,9 @@ under the License. <#list orderTerms as orderTerm> <tr <#if orderTerm_index % 2 != 0>class="alternate-row"</#if> > <td nowrap="nowrap">${orderTerm.getRelatedOne('TermType', false).get('description', locale)}</td> - <td align="center">${orderTerm.termValue?if_exists}</td> - <td align="center">${orderTerm.termDays?if_exists}</td> - <td nowrap="nowrap">${orderTerm.textValue?if_exists}</td> + <td align="center">${orderTerm.termValue!}</td> + <td align="center">${orderTerm.termDays!}</td> + <td nowrap="nowrap">${orderTerm.textValue!}</td> <td align="right"> <a href="<@ofbizUrl>setOrderTerm?termIndex=${orderTerm_index}&createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="<@ofbizUrl>removeCartOrderTerm?termIndex=${orderTerm_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> @@ -56,7 +56,7 @@ under the License. </table> <#else> <form method="post" action="<@ofbizUrl>addOrderTerm</@ofbizUrl>" name="termform"> - <input type="hidden" name="termIndex" value="${termIndex?if_exists}" /> + <input type="hidden" name="termIndex" value="${termIndex!}" /> <table class="basic-table"> <tr> <td width="26%" align="right" valign="top"> @@ -66,7 +66,7 @@ under the License. <td width="74%"> <select name="termTypeId"> <option value=""></option> - <#list termTypes?if_exists as termType> + <#list termTypes! as termType> <option value="${termType.termTypeId}" <#if termTypeId?default('') == termType.termTypeId>selected="selected"</#if> >${termType.get('description', locale)}</option> @@ -80,7 +80,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="termValue" value="${termValue?if_exists}" /> + <input type="text" size="30" maxlength="60" name="termValue" value="${termValue!}" /> </td> </tr> <tr> @@ -89,7 +89,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="termDays" value="${termDays?if_exists}" /> + <input type="text" size="30" maxlength="60" name="termDays" value="${termDays!}" /> </td> </tr> <tr> @@ -98,7 +98,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="255" name="textValue" value="${textValue?if_exists}" /> + <input type="text" size="30" maxlength="255" name="textValue" value="${textValue!}" /> </td> </tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl Sat Aug 16 11:34:57 2014 @@ -25,7 +25,7 @@ under the License. <#-- header box --> <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">PO For ${partyId?if_exists}</div> + <div class="h3">PO For ${partyId!}</div> </div> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="1" cellspacing="0"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Sat Aug 16 11:34:57 2014 @@ -35,7 +35,7 @@ under the License. <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?? && additionalPartyType == "Person")> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Person">${uiLabelMap.CommonPerson}</label> @@ -43,7 +43,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?exists && additionalPartyType == "Group"> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?? && additionalPartyType == "Group"> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Group">${uiLabelMap.CommonGroup}</label> @@ -51,7 +51,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType?exists> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType??> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_None">${uiLabelMap.OrderPartyDontWish}</label> @@ -65,7 +65,7 @@ under the License. <td> </td> </tr> - <#if additionalPartyType?exists && additionalPartyType != "" && additionalPartyType != "None"> + <#if additionalPartyType?? && additionalPartyType != "" && additionalPartyType != "None"> <#if additionalPartyType == "Person"> <#assign lookupPartyView="LookupPerson"> <#else> @@ -83,7 +83,7 @@ under the License. <div>${uiLabelMap.CommonIdentifier} :</div> </td> <td> - <@htmlTemplate.lookupField value="${additionalPartyId?if_exists}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/> + <@htmlTemplate.lookupField value="${additionalPartyId!}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/> </td> <td> <a href="javascript:document.quickAddPartyForm.submit()" class="buttontext">${uiLabelMap.CommonApply}</a> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sat Aug 16 11:34:57 2014 @@ -21,7 +21,7 @@ under the License. <#-- Purchase Orders --> -<#if facilityMaps?exists> +<#if facilityMaps??> <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> <input type="hidden" name="finalizeMode" value="ship"/> <#if (cart.getShipGroupSize() > 1)> @@ -49,7 +49,7 @@ under the License. <#assign facilityContactMechList = facilityMap.facilityContactMechList> <tr> <td colspan="4"> - <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div> + <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div> </td> </tr> <tr><td colspan="4"><hr /></td></tr> @@ -58,7 +58,7 @@ under the License. <#if facilityContactMechList?has_content> <#list facilityContactMechList as shippingContactMech> - <#if shippingContactMech.postalAddress?exists> + <#if shippingContactMech.postalAddress??> <#assign shippingAddress = shippingContactMech.postalAddress> <tr> <td valign="top" nowrap="nowrap"> @@ -127,9 +127,9 @@ under the License. <#list 1..cart.getShipGroupSize() as currIndex> <#assign shipGroupIndex = currIndex - 1> -<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)?if_exists> -<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> -<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)?if_exists> +<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!> +<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> +<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!> <hr /> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> @@ -144,7 +144,7 @@ under the License. <select name="${shipGroupIndex?default("0")}_supplierPartyId"> <option value=""></option> <#list suppliers as supplier> - <option value="${supplier.partyId}"<#if supplierPartyId?exists><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option> + <option value="${supplier.partyId}"<#if supplierPartyId??><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option> </#list> </select> ${uiLabelMap.ProductReserveInventoryFromFacility}: @@ -152,7 +152,7 @@ under the License. <option value=""></option> <#list productStoreFacilities as productStoreFacility> <#assign facility = productStoreFacility.getRelatedOne("Facility", false)> - <option value="${productStoreFacility.facilityId}"<#if facilityId?exists><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName?if_exists} </option> + <option value="${productStoreFacility.facilityId}"<#if facilityId??><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName!} </option> </#list> </select> </div> @@ -163,7 +163,7 @@ under the License. <#assign i = 0> <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> - <#if currShipContactMechId?exists && currShipContactMechId?has_content> + <#if currShipContactMechId?? && currShipContactMechId?has_content> <#if currShipContactMechId == shippingContactMech.contactMechId> <#assign checkedValue = "checked='checked'"> <#else> @@ -262,7 +262,7 @@ under the License. <td> </td> <td valign='middle'> <div class='tabletext'> - <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> <input type="submit" class="smallSubmit" value="Continue" /> </div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl Sat Aug 16 11:34:57 2014 @@ -18,7 +18,7 @@ under the License. --> <#-- Render the survey --> -<#if requestAttributes.surveyWrapper?exists && requestAttributes.surveyAction?exists> +<#if requestAttributes.surveyWrapper?? && requestAttributes.surveyAction??> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>${requestAttributes.surveyAction}</@ofbizUrl>" style="margin: 0;"> ${requestAttributes.surveyWrapper.renderSurvey()} </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl Sat Aug 16 11:34:57 2014 @@ -19,15 +19,15 @@ under the License. <form id="addGiftCertificate" action="<@ofbizUrl>addGiftCertificateSurvey</@ofbizUrl>" method="post"> <fieldset> - <#if surveyId?exists && surveyId?has_content> + <#if surveyId?? && surveyId?has_content> <input type="hidden" name="quantity" value="1" /> - <input type="hidden" name="surveyId" value="${surveyId?if_exists}" /> + <input type="hidden" name="surveyId" value="${surveyId!}" /> <#if giftCardProductList?has_content> <label>${uiLabelMap.OrderSelectGiftAmount}</label> <#list giftCardProductList?sort_by("price") as giftCardProduct> <div> - <input type="radio" name="add_product_id" id="productId_${giftCardProduct.price?if_exists}" value="${giftCardProduct.productId?if_exists}" checked="checked" /> - <label for="productId_${giftCardProduct.price?if_exists}"> ${giftCardProduct.productId?if_exists} : ${giftCardProduct.productName?if_exists} : <@ofbizCurrency amount=giftCardProduct.price?if_exists isoCode=currencyUomId/></label> + <input type="radio" name="add_product_id" id="productId_${giftCardProduct.price!}" value="${giftCardProduct.productId!}" checked="checked" /> + <label for="productId_${giftCardProduct.price!}"> ${giftCardProduct.productId!} : ${giftCardProduct.productName!} : <@ofbizCurrency amount=giftCardProduct.price! isoCode=currencyUomId/></label> </div> </#list> <div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderScheduleDelivery}</li> - <#if orderId?exists> + <#if orderId??> <li><a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li> </#if> </ul> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Sat Aug 16 11:34:57 2014 @@ -23,7 +23,7 @@ under the License. <li class="h3">${uiLabelMap.OrderOrderReceivedOn} ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(filterDate)}</li> <#assign listSize = state.getSize()> <#if (listSize > 10)> - <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}">${uiLabelMap.CommonMore}</a></li> + <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}">${uiLabelMap.CommonMore}</a></li> </#if> <#if orderHeaderList?has_content> <li>1-${orderHeaderList.size()} ${uiLabelMap.CommonOf} ${state.getSize()}</li> @@ -46,23 +46,23 @@ 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 billToParty = orh.getBillToParty()!> <#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}]")/> </#if> - <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists /> + <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)! /> <tr<#if alt_row> class="alternate-row"</#if>> <#assign alt_row = !alt_row> <td><a href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" class="buttontext">${orderHeader.orderId}</a></td> - <td>${billTo?if_exists}</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/OrderSalesReps.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl Sat Aug 16 11:34:57 2014 @@ -32,9 +32,9 @@ under the License. <td width="50%">${uiLabelMap.PartyFirstName}</td> </tr> <#list salesReps as salesRep> - <#assign party = salesRep.getRelatedOne("Party", false)?if_exists/> - <#assign person = party.getRelatedOne("Person", false)?if_exists/> - <#if person?exists && person?has_content> + <#assign party = salesRep.getRelatedOne("Party", false)!/> + <#assign person = party.getRelatedOne("Person", false)!/> + <#if person?? && person?has_content> <tr> <td width="50%">${person.lastName}</td> <td width="50%">${person.firstName}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Sat Aug 16 11:34:57 2014 @@ -33,7 +33,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>appendItemToOrder</@ofbizUrl>" name="appendItemForm"> - <input type="hidden" size="25" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" size="25" name="orderId" value="${orderId!}"/> <#if !catalogCol?has_content> <input type="hidden" name="prodCatalogId" value=""/> </#if> @@ -69,7 +69,7 @@ under the License. <tr> <td class="label">${uiLabelMap.OrderPrice}</td> <td> - <input type="text" size="6" name="basePrice" value="${requestParameters.price?if_exists}"/> + <input type="text" size="6" name="basePrice" value="${requestParameters.price!}"/> <input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Sat Aug 16 11:34:57 2014 @@ -24,7 +24,7 @@ under the License. <fo:block font-size="8pt"> <fo:block>${companyName}</fo:block> - <#if postalAddress?exists> + <#if postalAddress??> <#if postalAddress?has_content> ${setContextField("postalAddress", postalAddress)} ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressPdfFormatter")} @@ -34,9 +34,9 @@ under the License. <fo:block>${uiLabelMap.CommonFor}: ${companyName}</fo:block> </#if> - <#if sendingPartyTaxId?exists || phone?exists || email?exists || website?exists || eftAccount?exists> + <#if sendingPartyTaxId?? || phone?? || email?? || website?? || eftAccount??> <fo:list-block provisional-distance-between-starts=".5in"> - <#if sendingPartyTaxId?exists> + <#if sendingPartyTaxId??> <fo:list-item> <fo:list-item-label> <fo:block>${uiLabelMap.PartyTaxId}:</fo:block> @@ -46,43 +46,43 @@ under the License. </fo:list-item-body> </fo:list-item> </#if> - <#if phone?exists> + <#if phone??> <fo:list-item> <fo:list-item-label> <fo:block>${uiLabelMap.CommonTelephoneAbbr}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block><#if phone.countryCode?exists>${phone.countryCode}-</#if><#if phone.areaCode?exists>${phone.areaCode}-</#if>${phone.contactNumber?if_exists}</fo:block> + <fo:block><#if phone.countryCode??>${phone.countryCode}-</#if><#if phone.areaCode??>${phone.areaCode}-</#if>${phone.contactNumber!}</fo:block> </fo:list-item-body> </fo:list-item> </#if> - <#if email?exists> + <#if email??> <fo:list-item> <fo:list-item-label> <fo:block>${uiLabelMap.CommonEmail}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${email.infoString?if_exists}</fo:block> + <fo:block>${email.infoString!}</fo:block> </fo:list-item-body> </fo:list-item> </#if> - <#if website?exists> + <#if website??> <fo:list-item> <fo:list-item-label> <fo:block>${uiLabelMap.CommonWebsite}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${website.infoString?if_exists}</fo:block> + <fo:block>${website.infoString!}</fo:block> </fo:list-item-body> </fo:list-item> </#if> - <#if eftAccount?exists> + <#if eftAccount??> <fo:list-item> <fo:list-item-label> <fo:block>${uiLabelMap.CommonFinBankName}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${eftAccount.bankName?if_exists}</fo:block> + <fo:block>${eftAccount.bankName!}</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> @@ -90,7 +90,7 @@ under the License. <fo:block>${uiLabelMap.CommonRouting}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${eftAccount.routingNumber?if_exists}</fo:block> + <fo:block>${eftAccount.routingNumber!}</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> @@ -98,7 +98,7 @@ under the License. <fo:block>${uiLabelMap.CommonBankAccntNrAbbr}:</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${eftAccount.accountNumber?if_exists}</fo:block> + <fo:block>${eftAccount.accountNumber!}</fo:block> </fo:list-item-body> </fo:list-item> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sat Aug 16 11:34:57 2014 @@ -64,13 +64,13 @@ under the License. <td width="3%" style="border-bottom:none;"> </td> </tr> <#list orderItemList as orderItem> - <#if orderItem.productId?exists> <#-- a null product may come from a quote --> + <#if orderItem.productId??> <#-- a null product may come from a quote --> <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> <tr><td colspan="8"><hr /></td></tr> <tr> - <#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="8" valign="top"> <span class="label">>> ${orderItem.itemDescription}</span> </td> @@ -78,31 +78,31 @@ under the License. <td valign="top"> <div> <#if orderHeader.statusId = "ORDER_CANCELLED" || orderHeader.statusId = "ORDER_COMPLETED"> - <#if productId?exists> - ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} - <#elseif orderItemType?exists> - ${orderItemType.description} - ${orderItem.itemDescription?if_exists} + <#if productId??> + ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription!} + <#elseif orderItemType??> + ${orderItemType.description} - ${orderItem.itemDescription!} <#else> - ${orderItem.itemDescription?if_exists} + ${orderItem.itemDescription!} </#if> <#else> - <#if productId?exists> + <#if productId??> <#assign orderItemName = orderItem.productId?default("N/A")/> - <#elseif orderItemType?exists> + <#elseif orderItemType??> <#assign orderItemName = orderItemType.description/> </#if> <p>${uiLabelMap.ProductProduct} ${orderItemName}</p> - <#if productId?exists> + <#if productId??> <#assign product = orderItem.getRelatedOne("Product", true)> - <#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> + <#if product.salesDiscontinuationDate?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> <span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> </#if> </#if> ${uiLabelMap.CommonDescription}<br /> - <input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> + <input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription!}"/> </#if> </div> - <#if productId?exists> + <#if productId??> <div> <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a> @@ -123,7 +123,7 @@ under the License. <#if orderItemStatus.statusDatetime?has_content>${orderItemStatus.statusDatetime.toString()}</#if> ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br /> </#list> - <#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)> @@ -139,13 +139,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> @@ -184,7 +184,7 @@ under the License. </tr> <#-- now update/cancel reason and comment field --> - <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo?if_exists)> + <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo!)> <tr><td colspan="8"><span class="label">${uiLabelMap.OrderReturnReason}</span> <select name="irm_${orderItem.orderItemSeqId}"> <option value=""> </option> @@ -196,35 +196,35 @@ under the License. <input type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/> <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> - <@htmlTemplate.renderDateTimeField name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate?if_exists}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="isdm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate!}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="isdm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> - <@htmlTemplate.renderDateTimeField name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="iddm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate!}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="iddm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> </td> </tr> </#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> <td class="align-text" colspan="2"> <span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)} - ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) + ${orderItemAdjustment.get("description",locale)!} (${orderItemAdjustment.comments?default("")}) <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> - <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] + <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation!}] <#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><span class="label">Rate</span> ${orderItemAdjustment.sourcePercentage}</#if> + <#if orderItemAdjustment.sourcePercentage??><span class="label">Rate</span> ${orderItemAdjustment.sourcePercentage}</#if> <#if orderItemAdjustment.customerReferenceId?has_content><span class="label">Customer Tax ID</span> ${orderItemAdjustment.customerReferenceId}</#if> - <#if orderItemAdjustment.exemptAmount?exists><span class="label">Exempt Amount</span> ${orderItemAdjustment.exemptAmount}</#if> + <#if orderItemAdjustment.exemptAmount??><span class="label">Exempt Amount</span> ${orderItemAdjustment.exemptAmount}</#if> </#if> </td> <td> </td> @@ -238,14 +238,14 @@ under the License. </#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> <tr><td colspan="8"> </td></tr> <#list orderItemShipGroupAssocs as shipGroupAssoc> <#assign shipGroupQty = shipGroupAssoc.quantity - shipGroupAssoc.cancelQuantity?default(0)> <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists> - <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> + <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo!))> <#assign itemSelectable = (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> <tr> <td class="align-text" colspan="2"> @@ -291,7 +291,7 @@ under the License. <#assign orderProductPromoCode = ''> <#list productPromoCodes as productPromoCode> <#if !(orderProductPromoCode?has_content)> - <#assign orderProductPromoCode = delegator.findOne("OrderProductPromoCode", {"productPromoCodeId":productPromoCode.productPromoCodeId, "orderId":orderHeaderAdjustment.orderId}, false)?if_exists> + <#assign orderProductPromoCode = delegator.findOne("OrderProductPromoCode", {"productPromoCodeId":productPromoCode.productPromoCodeId, "orderId":orderHeaderAdjustment.orderId}, false)!> </#if> </#list> <#if orderProductPromoCode?has_content> @@ -300,18 +300,18 @@ under the License. </#if> <#if adjustmentAmount != 0> <form name="updateOrderAdjustmentForm${orderAdjustmentId}" method="post" action="<@ofbizUrl>updateOrderAdjustment</@ofbizUrl>"> - <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> <table class="basic-table" cellspacing="0"> <tr> <td class="align-text" width="55%"> - <span class="label">${adjustmentType.get("description",locale)}</span> ${orderHeaderAdjustment.comments?if_exists} + <span class="label">${adjustmentType.get("description",locale)}</span> ${orderHeaderAdjustment.comments!} </td> <td nowrap="nowrap" width="30%"> <#if (allowPriceChange)> - <input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60"/> + <input type="text" name="description" value="${orderHeaderAdjustment.get("description")!}" size="30" maxlength="60"/> <#else> - ${orderHeaderAdjustment.get("description")?if_exists} + ${orderHeaderAdjustment.get("description")!} </#if> </td> <td nowrap="nowrap" width="15%"> @@ -327,10 +327,10 @@ under the License. </table> </form> <form name="deleteOrderAdjustment${orderAdjustmentId}" method="post" action="<@ofbizUrl>deleteOrderAdjustment</@ofbizUrl>"> - <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> <#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> </#if> </form> </#if> @@ -340,7 +340,7 @@ under the License. <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_REJECTED"> <form name="addAdjustmentForm" method="post" action="<@ofbizUrl>createOrderAdjustment</@ofbizUrl>"> <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> <table class="basic-table" cellspacing="0"> <tr><td colspan="3"><hr /></td></tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sat Aug 16 11:34:57 2014 @@ -84,37 +84,37 @@ function toggleOrderIdList() { </#if> <input type="hidden" name="viewSize" value="${viewSize}"/> <input type="hidden" name="viewIndex" value="${viewIndex}"/> - <input type='hidden' name='correspondingPoId' value='${requestParameters.correspondingPoId?if_exists}'/> - <input type='hidden' name='internalCode' value='${requestParameters.internalCode?if_exists}'/> - <input type='hidden' name='productId' value='${requestParameters.productId?if_exists}'/> - <input type='hidden' name='goodIdentificationTypeId' value='${requestParameters.goodIdentificationTypeId?if_exists}'/> - <input type='hidden' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue?if_exists}'/> - <input type='hidden' name='inventoryItemId' value='${requestParameters.inventoryItemId?if_exists}'/> - <input type='hidden' name='serialNumber' value='${requestParameters.serialNumber?if_exists}'/> - <input type='hidden' name='softIdentifier' value='${requestParameters.softIdentifier?if_exists}'/> - <input type='hidden' name='partyId' value='${requestParameters.partyId?if_exists}'/> - <input type='hidden' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/> - <input type='hidden' name='billingAccountId' value='${requestParameters.billingAccountId?if_exists}'/> - <input type='hidden' name='createdBy' value='${requestParameters.createdBy?if_exists}'/> - <input type='hidden' name='minDate' value='${requestParameters.minDate?if_exists}'/> - <input type='hidden' name='maxDate' value='${requestParameters.maxDate?if_exists}'/> - <input type='hidden' name='roleTypeId' value="${requestParameters.roleTypeId?if_exists}"/> - <input type='hidden' name='orderTypeId' value='${requestParameters.orderTypeId?if_exists}'/> - <input type='hidden' name='salesChannelEnumId' value='${requestParameters.salesChannelEnumId?if_exists}'/> - <input type='hidden' name='productStoreId' value='${requestParameters.productStoreId?if_exists}'/> - <input type='hidden' name='orderWebSiteId' value='${requestParameters.orderWebSiteId?if_exists}'/> - <input type='hidden' name='orderStatusId' value='${requestParameters.orderStatusId?if_exists}'/> - <input type='hidden' name='hasBackOrders' value='${requestParameters.hasBackOrders?if_exists}'/> - <input type='hidden' name='filterInventoryProblems' value='${requestParameters.filterInventoryProblems?if_exists}'/> - <input type='hidden' name='filterPartiallyReceivedPOs' value='${requestParameters.filterPartiallyReceivedPOs?if_exists}'/> - <input type='hidden' name='filterPOsOpenPastTheirETA' value='${requestParameters.filterPOsOpenPastTheirETA?if_exists}'/> - <input type='hidden' name='filterPOsWithRejectedItems' value='${requestParameters.filterPOsWithRejectedItems?if_exists}'/> - <input type='hidden' name='countryGeoId' value='${requestParameters.countryGeoId?if_exists}'/> - <input type='hidden' name='includeCountry' value='${requestParameters.includeCountry?if_exists}'/> - <input type='hidden' name='isViewed' value='${requestParameters.isViewed?if_exists}'/> - <input type='hidden' name='shipmentMethod' value='${requestParameters.shipmentMethod?if_exists}'/> - <input type='hidden' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult?if_exists}'/> - <input type='hidden' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult?if_exists}'/> + <input type='hidden' name='correspondingPoId' value='${requestParameters.correspondingPoId!}'/> + <input type='hidden' name='internalCode' value='${requestParameters.internalCode!}'/> + <input type='hidden' name='productId' value='${requestParameters.productId!}'/> + <input type='hidden' name='goodIdentificationTypeId' value='${requestParameters.goodIdentificationTypeId!}'/> + <input type='hidden' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue!}'/> + <input type='hidden' name='inventoryItemId' value='${requestParameters.inventoryItemId!}'/> + <input type='hidden' name='serialNumber' value='${requestParameters.serialNumber!}'/> + <input type='hidden' name='softIdentifier' value='${requestParameters.softIdentifier!}'/> + <input type='hidden' name='partyId' value='${requestParameters.partyId!}'/> + <input type='hidden' name='userLoginId' value='${requestParameters.userLoginId!}'/> + <input type='hidden' name='billingAccountId' value='${requestParameters.billingAccountId!}'/> + <input type='hidden' name='createdBy' value='${requestParameters.createdBy!}'/> + <input type='hidden' name='minDate' value='${requestParameters.minDate!}'/> + <input type='hidden' name='maxDate' value='${requestParameters.maxDate!}'/> + <input type='hidden' name='roleTypeId' value="${requestParameters.roleTypeId!}"/> + <input type='hidden' name='orderTypeId' value='${requestParameters.orderTypeId!}'/> + <input type='hidden' name='salesChannelEnumId' value='${requestParameters.salesChannelEnumId!}'/> + <input type='hidden' name='productStoreId' value='${requestParameters.productStoreId!}'/> + <input type='hidden' name='orderWebSiteId' value='${requestParameters.orderWebSiteId!}'/> + <input type='hidden' name='orderStatusId' value='${requestParameters.orderStatusId!}'/> + <input type='hidden' name='hasBackOrders' value='${requestParameters.hasBackOrders!}'/> + <input type='hidden' name='filterInventoryProblems' value='${requestParameters.filterInventoryProblems!}'/> + <input type='hidden' name='filterPartiallyReceivedPOs' value='${requestParameters.filterPartiallyReceivedPOs!}'/> + <input type='hidden' name='filterPOsOpenPastTheirETA' value='${requestParameters.filterPOsOpenPastTheirETA!}'/> + <input type='hidden' name='filterPOsWithRejectedItems' value='${requestParameters.filterPOsWithRejectedItems!}'/> + <input type='hidden' name='countryGeoId' value='${requestParameters.countryGeoId!}'/> + <input type='hidden' name='includeCountry' value='${requestParameters.includeCountry!}'/> + <input type='hidden' name='isViewed' value='${requestParameters.isViewed!}'/> + <input type='hidden' name='shipmentMethod' value='${requestParameters.shipmentMethod!}'/> + <input type='hidden' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult!}'/> + <input type='hidden' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult!}'/> </form> </#if> <form method="post" name="lookuporder" id="lookuporder" action="<@ofbizUrl>searchorders</@ofbizUrl>" onsubmit="javascript:lookupOrders();"> @@ -130,8 +130,8 @@ function toggleOrderIdList() { <#if requestParameters.hideFields?default("N") == "Y"> <li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li> <#else> - <#if orderList?exists><li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields?default("Y")}.submit()">${uiLabelMap.CommonHideFields}</a></li></#if> - <li><a href="/partymgr/control/findparty?externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${uiLabelMap.PartyLookupParty}</a></li> + <#if orderList??><li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields?default("Y")}.submit()">${uiLabelMap.CommonHideFields}</a></li></#if> + <li><a href="/partymgr/control/findparty?externalLoginKey=${requestAttributes.externalLoginKey!}">${uiLabelMap.PartyLookupParty}</a></li> <li><a href="javascript:lookupOrders(true);">${uiLabelMap.OrderLookupOrder}</a></li> </#if> </ul> @@ -156,17 +156,17 @@ function toggleOrderIdList() { <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderCustomerPo}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='correspondingPoId' value='${requestParameters.correspondingPoId?if_exists}'/></td> + <td align='left'><input type='text' name='correspondingPoId' value='${requestParameters.correspondingPoId!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderInternalCode}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='internalCode' value='${requestParameters.internalCode?if_exists}'/></td> + <td align='left'><input type='text' name='internalCode' value='${requestParameters.internalCode!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.ProductProductId}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='productId' value='${requestParameters.productId?if_exists}'/></td> + <td align='left'><input type='text' name='productId' value='${requestParameters.productId!}'/></td> </tr> <#if goodIdentificationTypes?has_content> <tr> @@ -188,23 +188,23 @@ function toggleOrderIdList() { <tr> <td width='25%' align='right' class='label'>${uiLabelMap.ProductGoodIdentification}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue?if_exists}'/></td> + <td align='left'><input type='text' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue!}'/></td> </tr> </#if> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.ProductInventoryItemId}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='inventoryItemId' value='${requestParameters.inventoryItemId?if_exists}'/></td> + <td align='left'><input type='text' name='inventoryItemId' value='${requestParameters.inventoryItemId!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.ProductSerialNumber}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='serialNumber' value='${requestParameters.serialNumber?if_exists}'/></td> + <td align='left'><input type='text' name='serialNumber' value='${requestParameters.serialNumber!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.ProductSoftIdentifier}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='softIdentifier' value='${requestParameters.softIdentifier?if_exists}'/></td> + <td align='left'><input type='text' name='softIdentifier' value='${requestParameters.softIdentifier!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.PartyRoleType}</td> @@ -225,13 +225,13 @@ function toggleOrderIdList() { <td width='25%' align='right' class='label'>${uiLabelMap.PartyPartyId}</td> <td width='5%'> </td> <td align='left'> - <@htmlTemplate.lookupField value='${requestParameters.partyId?if_exists}' formName="lookuporder" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value='${requestParameters.partyId!}' formName="lookuporder" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> </td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.CommonUserLoginId}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/></td> + <td align='left'><input type='text' name='userLoginId' value='${requestParameters.userLoginId!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderType}</td> @@ -252,12 +252,12 @@ function toggleOrderIdList() { <tr> <td width='25%' align='right' class='label'>${uiLabelMap.AccountingBillingAccount}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='billingAccountId' value='${requestParameters.billingAccountId?if_exists}'/></td> + <td align='left'><input type='text' name='billingAccountId' value='${requestParameters.billingAccountId!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.CommonCreatedBy}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='createdBy' value='${requestParameters.createdBy?if_exists}'/></td> + <td align='left'><input type='text' name='createdBy' value='${requestParameters.createdBy!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderSalesChannel}</td> @@ -281,12 +281,12 @@ function toggleOrderIdList() { <td align='left'> <select name='productStoreId'> <#if currentProductStore?has_content> - <option value="${currentProductStore.productStoreId}">${currentProductStore.storeName?if_exists}</option> + <option value="${currentProductStore.productStoreId}">${currentProductStore.storeName!}</option> <option value="${currentProductStore.productStoreId}">---</option> </#if> <option value="">${uiLabelMap.CommonAnyStore}</option> <#list productStores as store> - <option value="${store.productStoreId}">${store.storeName?if_exists}</option> + <option value="${store.productStoreId}">${store.storeName!}</option> </#list> </select> </td> @@ -302,7 +302,7 @@ function toggleOrderIdList() { </#if> <option value="">${uiLabelMap.CommonAnyWebSite}</option> <#list webSites as webSite> - <option value="${webSite.webSiteId}">${webSite.siteName?if_exists}</option> + <option value="${webSite.webSiteId}">${webSite.siteName!}</option> </#list> </select> </td> @@ -344,13 +344,13 @@ function toggleOrderIdList() { <select name="shipmentMethod"> <#if currentCarrierShipmentMethod?has_content> <#assign currentShipmentMethodType = currentCarrierShipmentMethod.getRelatedOne("ShipmentMethodType", false)> - <option value="${currentCarrierShipmentMethod.partyId}@${currentCarrierShipmentMethod.shipmentMethodTypeId}">${currentCarrierShipmentMethod.partyId?if_exists} ${currentShipmentMethodType.description?if_exists}</option> + <option value="${currentCarrierShipmentMethod.partyId}@${currentCarrierShipmentMethod.shipmentMethodTypeId}">${currentCarrierShipmentMethod.partyId!} ${currentShipmentMethodType.description!}</option> <option value="${currentCarrierShipmentMethod.partyId}@${currentCarrierShipmentMethod.shipmentMethodTypeId}">---</option> </#if> <option value="">${uiLabelMap.OrderSelectShippingMethod}</option> <#list carrierShipmentMethods as carrierShipmentMethod> <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", false)> - <option value="${carrierShipmentMethod.partyId}@${carrierShipmentMethod.shipmentMethodTypeId}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.description?if_exists}</option> + <option value="${carrierShipmentMethod.partyId}@${carrierShipmentMethod.shipmentMethodTypeId}">${carrierShipmentMethod.partyId!} ${shipmentMethodType.description!}</option> </#list> </select> </td> @@ -373,12 +373,12 @@ function toggleOrderIdList() { <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderAddressVerification}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult?if_exists}'/></td> + <td align='left'><input type='text' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderScore}</td> <td width='5%'> </td> - <td align='left'><input type='text' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult?if_exists}'/></td> + <td align='left'><input type='text' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult!}'/></td> </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.CommonDateFilter}</td> @@ -387,13 +387,13 @@ function toggleOrderIdList() { <table class="basic-table" cellspacing='0'> <tr> <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" value="${requestParameters.minDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" value="${requestParameters.minDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class='label'>${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" value="${requestParameters.maxDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" value="${requestParameters.maxDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class='label'>${uiLabelMap.CommonThru}</span> </td> </tr> @@ -464,7 +464,7 @@ function toggleOrderIdList() { <#if requestParameters.countryGeoId?has_content> <#assign countryGeoId = requestParameters.countryGeoId> <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", countryGeoId), true)> - <option value="${countryGeoId}">${geo.geoName?if_exists}</option> + <option value="${countryGeoId}">${geo.geoName!}</option> <option value="${countryGeoId}">---</option> <#else> <option value="">---</option> @@ -549,7 +549,7 @@ document.lookuporder.orderId.focus(); <input type="hidden" name="viewSize"/> <input type="hidden" name="viewIndex"/> <input type="hidden" name="hideFields"/> - <#if paramIdList?exists && paramIdList?has_content> + <#if paramIdList?? && paramIdList?has_content> <#list paramIdList as paramIds> <#assign paramId = paramIds.split("=")/> <input type="hidden" name="${paramId[0]}" value="${paramId[1]}"/> @@ -614,9 +614,9 @@ document.lookuporder.orderId.focus(); <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)> <#assign orderType = orderHeader.getRelatedOne("OrderType", true)> <#if orderType.orderTypeId == "PURCHASE_ORDER"> - <#assign displayParty = orh.getSupplierAgent()?if_exists> + <#assign displayParty = orh.getSupplierAgent()!> <#else> - <#assign displayParty = orh.getPlacingParty()?if_exists> + <#assign displayParty = orh.getPlacingParty()!> </#if> <#assign partyId = displayParty.partyId?default("_NA_")> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> @@ -639,13 +639,13 @@ document.lookuporder.orderId.focus(); <#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} @@ -703,7 +703,7 @@ document.lookuporder.orderId.focus(); <td colspan='4'><h3>${uiLabelMap.OrderNoOrderFound}</h3></td> </tr> </#if> - <#if lookupErrorMessage?exists> + <#if lookupErrorMessage??> <tr> <td colspan='4'><h3>${lookupErrorMessage}</h3></td> </tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |