You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/08/16 13:35:02 UTC
svn commit: r1618336 [17/21] - in /ofbiz/trunk/applications:
accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/
accounting/webapp/accounting/finaccounttrans/
accounting/webapp/accounting/invoice/ accounting/webapp/accounting/p...
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Sat Aug 16 11:34:57 2014
@@ -18,7 +18,7 @@ under the License.
-->
<form name="addscarr" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="newShipMethod" value="Y"/>
- <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
+ <input type="hidden" name="productStoreId" value="${productStoreId!}"/>
<table cellspacing="0" class="basic-table">
<tr>
<td align="right" class="label">${uiLabelMap.ProductCarrierShipmentMethod}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Sat Aug 16 11:34:57 2014
@@ -38,12 +38,12 @@ under the License.
<#assign survey = storeSurvey.getRelatedOne("Survey", false)>
<tr valign="middle"<#if alt_row>class="alternate-row"</#if>>
<td>${surveyType.get("description",locale)}</td>
- <td>${storeSurvey.groupName?if_exists}</td>
+ <td>${storeSurvey.groupName!}</td>
<td><a href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}" class="buttontext">${survey.description?default("[" + survey.surveyId + "]")}</a></td>
<td>${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</td>
<td>${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</td>
- <td>${storeSurvey.fromDate?if_exists?string}</td>
- <td>${storeSurvey.sequenceNum?if_exists}</td>
+ <td>${storeSurvey.fromDate!?string}</td>
+ <td>${storeSurvey.sequenceNum!}</td>
<td>
<form name="deleteProductStoreSurveyAppl_${storeSurvey_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productStoreId" value="${productStoreId}" />
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl Sat Aug 16 11:34:57 2014
@@ -33,7 +33,7 @@ under the License.
<#assign rowClass = "2">
<#list storeWebSites as webSite>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName?if_exists} [${webSite.webSiteId}]</a></td>
+ <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName!} [${webSite.webSiteId}]</a></td>
<td>${webSite.httpHost?default(' ')}</td>
<td>${webSite.httpPort?default(' ')}</td>
<td align="center">
@@ -66,7 +66,7 @@ under the License.
<input type="hidden" name="productStoreId" value="${productStoreId}" />
<select name="webSiteId">
<#list webSites as webSite>
- <option value="${webSite.webSiteId}">${webSite.siteName?if_exists} [${webSite.webSiteId}]</option>
+ <option value="${webSite.webSiteId}">${webSite.siteName!} [${webSite.webSiteId}]</option>
</#list>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}" />
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl Sat Aug 16 11:34:57 2014
@@ -34,7 +34,7 @@ jQuery(window).load(createTree());
var rawdata = [
<#list parentGroupList as parentGroup>
{
- "data": {"title" : unescapeHtmlText("<#if parentGroup.productStoreGroupName?exists>${parentGroup.productStoreGroupName?js_string} [${parentGroup.productStoreGroupId}]</#if>"),
+ "data": {"title" : unescapeHtmlText("<#if parentGroup.productStoreGroupName??>${parentGroup.productStoreGroupName?js_string} [${parentGroup.productStoreGroupId}]</#if>"),
"attr": {"href" : "<@o...@ofbizUrl>","onClick" : "callDocument('${parentGroup.productStoreGroupId}');"}},
"attr": {"parentGroupId" : "${parentGroup.productStoreGroupId}"},
"state" : "closed"
Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Sat Aug 16 11:34:57 2014
@@ -79,7 +79,7 @@ under the License.
<input type="hidden" name="alternateKeyword" value="${keyword.alternateKeyword}" />
<input type="submit" value="X" />
</form>
- ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)})
+ ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId!)})
</div>
<#-- toggle the row color -->
<#if rowClass == "2">
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Sat Aug 16 11:34:57 2014
@@ -17,11 +17,11 @@ specific language governing permissions
under the License.
-->
-<#if !mechMap.facilityContactMech?exists && mechMap.contactMech?exists>
+<#if !mechMap.facilityContactMech?? && mechMap.contactMech??>
<p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<#else>
- <#if !mechMap.contactMech?exists>
+ <#if !mechMap.contactMech??>
<#-- When creating a new contact mech, first select the type, then actually create -->
<#if !preContactMechTypeId?has_content>
<h1>${title}</h1>
@@ -30,7 +30,7 @@ under the License.
</div>
<form method="post" action='<@o...@ofbizUrl>' name="createcontactmechform">
<input type='hidden' name='facilityId' value='${facilityId}' />
- <input type='hidden' name='DONE_PAGE' value='${donePage?if_exists}' />
+ <input type='hidden' name='DONE_PAGE' value='${donePage!}' />
<table width="50%" class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.PartySelectContactType}</td>
@@ -53,18 +53,18 @@ under the License.
<div class="button-bar">
<a href='<@o...@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a>
</div>
- <#if contactMechPurposeType?exists>
- <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)?if_exists}")</div>
+ <#if contactMechPurposeType??>
+ <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)!}")</div>
</#if>
<table width="90%" class="basic-table" cellspacing="0">
<form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform" id="editcontactmechform">
<input type='hidden' name='DONE_PAGE' value='${donePage}' />
<input type='hidden' name='contactMechTypeId' value='${mechMap.contactMechTypeId}' />
<input type='hidden' name='facilityId' value='${facilityId}' />
- <#if preContactMechTypeId?exists><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if>
- <#if contactMechPurposeTypeId?exists><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId?if_exists}' /></#if>
+ <#if preContactMechTypeId??><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if>
+ <#if contactMechPurposeTypeId??><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId!}' /></#if>
- <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if>
+ <#if paymentMethodId??><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if>
<tr>
<td class="label">${uiLabelMap.PartyContactPurposes}</td>
@@ -108,11 +108,11 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
<form id="deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
- <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}" />
- <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)?if_exists}" />
- <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
+ <input type="hidden" name="contactMechId" value="${contactMechId!}" />
+ <input type="hidden" name="contactMechPurposeTypeId" value="${(facilityContactMechPurpose.contactMechPurposeTypeId)!}" />
+ <input type="hidden" name="fromDate" value="${(facilityContactMechPurpose.fromDate)!}" />
+ <input type="hidden" name="DONE_PAGE" value="${donePage!}" />
<input type="hidden" name="useValues" value="true" />
</form>
</#list>
@@ -121,7 +121,7 @@ under the License.
<td>
<form method="post" action='<@o...@ofbizUrl>' name='newpurposeform'>
<input type="hidden" name='facilityId' value='${facilityId}' />
- <input type="hidden" name='contactMechId' value='${contactMechId?if_exists}' />
+ <input type="hidden" name='contactMechId' value='${contactMechId!}' />
<select name='contactMechPurposeTypeId'>
<option></option>
<#list mechMap.purposeTypes as contactMechPurposeType>
@@ -142,35 +142,35 @@ under the License.
<input type="hidden" name='facilityId' value='${facilityId}' />
</#if>
- <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
+ <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${uiLabelMap.PartyToName}</td>
<td>
- <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}" />
+ <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAttentionName}</td>
<td>
- <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}" />
+ <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAddressLine1}</td>
<td>
- <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}" />
+ <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')!)}" />
*</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyAddressLine2}</td>
<td>
- <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}" />
+ <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')!)}" />
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.PartyCity}</td>
<td>
- <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}" />
+ <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')!)}" />
*</td>
</tr>
<tr>
@@ -183,7 +183,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.PartyZipCode}</td>
<td>
- <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}" />
+ <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')!)}" />
*</td>
</tr>
<tr>
@@ -191,7 +191,7 @@ under the License.
<td>
<select name="countryGeoId" id="editcontactmechform_countryGeoId">
${screens.render("component://common/widget/CommonScreens.xml#countries")}
- <#if (mechMap.postalAddress?exists) && (mechMap.postalAddress.countryGeoId?exists)>
+ <#if (mechMap.postalAddress??) && (mechMap.postalAddress.countryGeoId??)>
<#assign defaultCountryGeoId = mechMap.postalAddress.countryGeoId>
<#else>
<#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")>
@@ -203,32 +203,32 @@ under the License.
</select>
</td>
</tr>
- <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists>
+ <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${uiLabelMap.PartyPhoneNumber}</td>
<td>
- <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}" />
- - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}" />
- - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}" />
- ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}" />
+ <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')!)}" />
+ - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')!)}" />
+ - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')!)}" />
+ ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')!)}" />
</td>
</tr>
<tr>
<td> </td>
<td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
</tr>
- <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
+ <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId!>
<tr>
<td class="label">${uiLabelMap.PartyEmailAddress}</td>
<td>
- <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}" />
+ <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')!)}" />
*</td>
</tr>
<#else>
<tr>
<td class="label">${mechMap.contactMechType.get("description",locale)}</td>
<td>
- <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}" />
+ <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)!}" />
*</td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Sat Aug 16 11:34:57 2014
@@ -17,20 +17,20 @@ specific language governing permissions
under the License.
-->
-<#if facility?exists && facilityId?has_content>
+<#if facility?? && facilityId?has_content>
<form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
<table class="basic-table" cellspacing='0'>
<tr>
<td class="label">${uiLabelMap.ProductFacilityId}</td>
<td>
- ${facilityId?if_exists} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span>
+ ${facilityId!} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span>
</td>
</tr>
<#else>
<form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
- <#if facilityId?exists>
- <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3>
+ <#if facilityId??>
+ <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId!}".</h3>
</#if>
<table class="basic-table" cellspacing='0'>
</#if>
@@ -38,10 +38,10 @@ under the License.
<td class="label">${uiLabelMap.ProductFacilityTypeId}</td>
<td>
<select name="facilityTypeId">
- <option selected="selected" value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option>
- <option value='${facilityType.facilityTypeId?if_exists}'>----</option>
+ <option selected="selected" value='${facilityType.facilityTypeId!}'>${facilityType.get("description",locale)!}</option>
+ <option value='${facilityType.facilityTypeId!}'>----</option>
<#list facilityTypes as nextFacilityType>
- <option value='${nextFacilityType.facilityTypeId?if_exists}'>${nextFacilityType.get("description",locale)?if_exists}</option>
+ <option value='${nextFacilityType.facilityTypeId!}'>${nextFacilityType.get("description",locale)!}</option>
</#list>
</select>
</td>
@@ -49,13 +49,13 @@ under the License.
<tr>
<td class="label">${uiLabelMap.FormFieldTitle_parentFacilityId}</td>
<td>
- <@htmlTemplate.lookupField value="${facility.parentFacilityId?if_exists}" formName="EditFacilityForm" name="parentFacilityId" id="parentFacilityId" fieldFormName="LookupFacility"/>
+ <@htmlTemplate.lookupField value="${facility.parentFacilityId!}" formName="EditFacilityForm" name="parentFacilityId" id="parentFacilityId" fieldFormName="LookupFacility"/>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductFacilityOwner}</td>
<td>
- <@htmlTemplate.lookupField value="${facility.ownerPartyId?if_exists}" formName="EditFacilityForm" name="ownerPartyId" id="ownerPartyId" fieldFormName="LookupPartyName"/>
+ <@htmlTemplate.lookupField value="${facility.ownerPartyId!}" formName="EditFacilityForm" name="ownerPartyId" id="ownerPartyId" fieldFormName="LookupPartyName"/>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
@@ -91,13 +91,13 @@ under the License.
<tr>
<td class="label">${uiLabelMap.ProductName}</td>
<td>
- <input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60" />
+ <input type="text" name="facilityName" value="${facility.facilityName!}" size="30" maxlength="60" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductFacilitySize}</td>
- <td><input type="text" name="facilitySize" value="${facility.facilitySize?if_exists}" size="10" maxlength="20" /></td>
+ <td><input type="text" name="facilitySize" value="${facility.facilitySize!}" size="10" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductFacilityDefaultAreaUnit}</td>
@@ -116,11 +116,11 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.ProductProductDescription}</td>
- <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250" /></td>
+ <td ><input type="text" name="description" value="${facility.description!}" size="60" maxlength="250" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td>
- <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20" /></td>
+ <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip!}" size="10" maxlength="20" /></td>
</tr>
<tr>
<td> </td>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Sat Aug 16 11:34:57 2014
@@ -17,30 +17,30 @@ specific language governing permissions
under the License.
-->
<h1>${title}</h1>
-<#if facilityId?exists && locationSeqId?exists>
+<#if facilityId?? && locationSeqId??>
<div class="button-bar">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
- <#assign latestGeoPoint= Static["org.ofbiz.common.geo.GeoWorker"].findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId)?if_exists/>
+ <#assign latestGeoPoint= Static["org.ofbiz.common.geo.GeoWorker"].findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId)!/>
<#if latestGeoPoint?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
</div>
</#if>
-<#if facilityId?exists && !(facilityLocation?exists)>
+<#if facilityId?? && !(facilityLocation??)>
<form action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="facilityId" value="${facilityId}" />
<table class="basic-table" cellspacing="0">
-<#elseif facilityLocation?exists>
+<#elseif facilityLocation??>
<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
<input type="hidden" name="locationSeqId" value="${locationSeqId}" />
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.ProductFacilityId}</td>
- <td>${facilityId?if_exists}</td>
+ <td>${facilityId!}</td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductLocationSeqId}</td>
@@ -50,13 +50,13 @@ under the License.
<h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1>
</#if>
-<#if facilityId?exists>
+<#if facilityId??>
<tr>
<td class="label">${uiLabelMap.ProductType}</td>
<td>
<select name="locationTypeEnumId">
<#if (facilityLocation.locationTypeEnumId)?has_content>
- <#assign locationTypeEnum = facilityLocation.getRelatedOne("TypeEnumeration", true)?if_exists>
+ <#assign locationTypeEnum = facilityLocation.getRelatedOne("TypeEnumeration", true)!>
<option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option>
<option value="${facilityLocation.locationTypeEnumId}">----</option>
</#if>
@@ -68,27 +68,27 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.CommonArea}</td>
- <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20" /></td>
+ <td><input type="text" name="areaId" value="${(facilityLocation.areaId)!}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductAisle}</td>
- <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20" /></td>
+ <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)!}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductSection}</td>
- <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20" /></td>
+ <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)!}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductLevel}</td>
- <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20" /></td>
+ <td><input type="text" name="levelId" value="${(facilityLocation.levelId)!}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductPosition}</td>
- <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20" /></td>
+ <td><input type="text" name="positionId" value="${(facilityLocation.positionId)!}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td> </td>
- <#if locationSeqId?exists>
+ <#if locationSeqId??>
<td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
<#else>
<td><input type="submit" value="${uiLabelMap.CommonSave}" /></td>
@@ -96,7 +96,7 @@ under the License.
</tr>
</table>
</form>
- <#if locationSeqId?exists>
+ <#if locationSeqId??>
<br />
<div class="screenlet">
<div class="screenlet-title-bar">
@@ -109,17 +109,17 @@ under the License.
<td>${uiLabelMap.ProductProduct}</td>
<td>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</td>
</tr>
- <#list productFacilityLocations?if_exists as productFacilityLocation>
- <#assign product = productFacilityLocation.getRelatedOne("Product", false)?if_exists>
+ <#list productFacilityLocations! as productFacilityLocation>
+ <#assign product = productFacilityLocation.getRelatedOne("Product", false)!>
<tr>
- <td><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</td>
+ <td><#if product??>${(product.internalName)!}</#if>[${productFacilityLocation.productId}]</td>
<td>
<form method="post" action="<@o...@ofbizUrl>" id="lineForm${productFacilityLocation_index}">
- <input type="hidden" name="productId" value="${(productFacilityLocation.productId)?if_exists}"/>
- <input type="hidden" name="facilityId" value="${(productFacilityLocation.facilityId)?if_exists}"/>
- <input type="hidden" name="locationSeqId" value="${(productFacilityLocation.locationSeqId)?if_exists}"/>
- <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)?if_exists}"/>
- <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)?if_exists}"/>
+ <input type="hidden" name="productId" value="${(productFacilityLocation.productId)!}"/>
+ <input type="hidden" name="facilityId" value="${(productFacilityLocation.facilityId)!}"/>
+ <input type="hidden" name="locationSeqId" value="${(productFacilityLocation.locationSeqId)!}"/>
+ <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)!}"/>
+ <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)!}"/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
<a href="javascript:document.getElementById('lineForm${productFacilityLocation_index}').action='<@o...@ofbizUrl>';document.getElementById('lineForm${productFacilityLocation_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a>
</form>
@@ -135,8 +135,8 @@ under the License.
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="createProductFacilityLocationForm">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
- <input type="hidden" name="locationSeqId" value="${locationSeqId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
+ <input type="hidden" name="locationSeqId" value="${locationSeqId!}" />
<input type="hidden" name="useValues" value="true" />
<span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="10" name="productId" />
<span class="label">${uiLabelMap.ProductMinimumStock}</span><input type="text" size="10" name="minimumStock" />
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sat Aug 16 11:34:57 2014
@@ -19,15 +19,15 @@ under the License.
<div class="button-bar button-style-1">
<a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacility}</a>
- <a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacilityLocation}</a>
+ <a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacilityLocation}</a>
</div>
<form action="<@o...@ofbizUrl>" method="get" name="findFacilityLocation" class="basic-form">
- <#if (facilityId?exists)>
+ <#if (facilityId??)>
<input type="hidden" name="facilityId" value="${facilityId}" />
</#if>
<table class="basic-table" cellspacing="0">
- <#if !(facilityId?exists)>
+ <#if !(facilityId??)>
<tr>
<td class="label">${uiLabelMap.ProductFacility}</td>
<td><input type="text" value="" size="19" maxlength="20" /></td>
@@ -36,7 +36,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.ProductLocationSeqId}</td>
<td>
- <#if parameters.facilityId?exists>
+ <#if parameters.facilityId??>
<#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
<#else>
<#assign LookupFacilityLocationView="LookupFacilityLocation">
@@ -71,10 +71,10 @@ under the License.
</table>
</form>
- <#if foundLocations?exists>
+ <#if foundLocations??>
<#-- TODO: Put this in a screenlet - make it look more like the party find screen -->
<br />
- <h3>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h3>
+ <h3>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility??>${(facility.facilityName)!}</#if> [ID:${facilityId!}]</h3>
<br />
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row-2">
@@ -90,22 +90,22 @@ under the License.
</tr>
<#assign rowClass = "2">
<#list foundLocations as location>
- <#assign locationTypeEnum = location.getRelatedOne("TypeEnumeration", true)?if_exists>
+ <#assign locationTypeEnum = location.getRelatedOne("TypeEnumeration", true)!>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>">${(location.facilityId)?if_exists}</a></td>
- <td><a href="<@o...@ofbizUrl>">${(location.locationSeqId)?if_exists}</a></td>
- <td>${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}</td>
- <td>${(location.areaId)?if_exists}</td>
- <td>${(location.aisleId)?if_exists}</td>
- <td>${(location.sectionId)?if_exists}</td>
- <td>${(location.levelId)?if_exists}</td>
- <td>${(location.positionId)?if_exists}</td>
+ <td><a href="<@o...@ofbizUrl>">${(location.facilityId)!}</a></td>
+ <td><a href="<@o...@ofbizUrl>">${(location.locationSeqId)!}</a></td>
+ <td>${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId!)}</td>
+ <td>${(location.areaId)!}</td>
+ <td>${(location.aisleId)!}</td>
+ <td>${(location.sectionId)!}</td>
+ <td>${(location.levelId)!}</td>
+ <td>${(location.positionId)!}</td>
<td class="button-col">
- <a href="<@o...@ofbizUrl>">${uiLabelMap.ProductNewInventoryItem}</a>
- <#if itemId?exists>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.ProductSetItem} ${itemId}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.ProductNewInventoryItem}</a>
+ <#if itemId??>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.ProductSetItem} ${itemId}</a>
</#if>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Sat Aug 16 11:34:57 2014
@@ -34,14 +34,14 @@ under the License.
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.ProductStockMovesNeeded}</li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li>
</ul>
<br class="clear"/>
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name='selectAllForm' style='margin: 0;'>
<#-- general request fields -->
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
<input type="hidden" name="_useRowSubmit" value="Y" />
<#assign rowCount = 0>
<table cellspacing="0" class="basic-table hover-bar">
@@ -64,30 +64,30 @@ under the License.
</tr>
<#if moveByOisgirInfoList?has_content || moveByPflInfoList?has_content>
<#assign alt_row = false>
- <#list moveByOisgirInfoList?if_exists as moveByOisgirInfo>
+ <#list moveByOisgirInfoList! as moveByOisgirInfo>
<#assign product = moveByOisgirInfo.product>
<#assign facilityLocationFrom = moveByOisgirInfo.facilityLocationFrom>
- <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))?if_exists>
+ <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))!>
<#assign facilityLocationTo = moveByOisgirInfo.facilityLocationTo>
<#assign targetProductFacilityLocation = moveByOisgirInfo.targetProductFacilityLocation>
- <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))?if_exists>
+ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!>
<#assign totalQuantity = moveByOisgirInfo.totalQuantity>
<tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>${product.productId}</td>
- <td>${product.internalName?if_exists}</td>
- <td>${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
- <td>${moveByOisgirInfo.quantityOnHandTotalFrom?if_exists}</td>
- <td>${moveByOisgirInfo.availableToPromiseTotalFrom?if_exists}</td>
- <td>${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
- <td>${moveByOisgirInfo.quantityOnHandTotalTo?if_exists}</td>
- <td>${moveByOisgirInfo.availableToPromiseTotalTo?if_exists}</td>
- <td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
- <td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
+ <td>${product.internalName!}</td>
+ <td>${facilityLocationFrom.areaId!}:${facilityLocationFrom.aisleId!}:${facilityLocationFrom.sectionId!}:${facilityLocationFrom.levelId!}:${facilityLocationFrom.positionId!}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
+ <td>${moveByOisgirInfo.quantityOnHandTotalFrom!}</td>
+ <td>${moveByOisgirInfo.availableToPromiseTotalFrom!}</td>
+ <td>${facilityLocationTo.areaId!}:${facilityLocationTo.aisleId!}:${facilityLocationTo.sectionId!}:${facilityLocationTo.levelId!}:${facilityLocationTo.positionId!}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
+ <td>${moveByOisgirInfo.quantityOnHandTotalTo!}</td>
+ <td>${moveByOisgirInfo.availableToPromiseTotalTo!}</td>
+ <td>${targetProductFacilityLocation.minimumStock!}</td>
+ <td>${targetProductFacilityLocation.moveQuantity!}</td>
<td align="right">
- <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}" />
- <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}" />
- <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}" />
- <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}" />
+ <input type="hidden" name="productId_o_${rowCount}" value="${product.productId!}" />
+ <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId!}" />
+ <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId!}" />
+ <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId!}" />
<input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}" />
</td>
<td align="right">
@@ -98,30 +98,30 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
- <#list moveByPflInfoList?if_exists as moveByPflInfo>
+ <#list moveByPflInfoList! as moveByPflInfo>
<#assign product = moveByPflInfo.product>
<#assign facilityLocationFrom = moveByPflInfo.facilityLocationFrom>
- <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))?if_exists>
+ <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))!>
<#assign facilityLocationTo = moveByPflInfo.facilityLocationTo>
<#assign targetProductFacilityLocation = moveByPflInfo.targetProductFacilityLocation>
- <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))?if_exists>
+ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!>
<#assign totalQuantity = moveByPflInfo.totalQuantity>
<tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>${product.productId}</td>
- <td>${product.internalName?if_exists}</td>
- <td>${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
- <td>${moveByPflInfo.quantityOnHandTotalFrom?if_exists}</td>
- <td>${moveByPflInfo.availableToPromiseTotalFrom?if_exists}</td>
- <td>${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
- <td>${moveByPflInfo.quantityOnHandTotalTo?if_exists}</td>
- <td>${moveByPflInfo.availableToPromiseTotalTo?if_exists}</td>
- <td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
- <td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
+ <td>${product.internalName!}</td>
+ <td>${facilityLocationFrom.areaId!}:${facilityLocationFrom.aisleId!}:${facilityLocationFrom.sectionId!}:${facilityLocationFrom.levelId!}:${facilityLocationFrom.positionId!}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
+ <td>${moveByPflInfo.quantityOnHandTotalFrom!}</td>
+ <td>${moveByPflInfo.availableToPromiseTotalFrom!}</td>
+ <td>${facilityLocationTo.areaId!}:${facilityLocationTo.aisleId!}:${facilityLocationTo.sectionId!}:${facilityLocationTo.levelId!}:${facilityLocationTo.positionId!}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
+ <td>${moveByPflInfo.quantityOnHandTotalTo!}</td>
+ <td>${moveByPflInfo.availableToPromiseTotalTo!}</td>
+ <td>${targetProductFacilityLocation.minimumStock!}</td>
+ <td>${targetProductFacilityLocation.moveQuantity!}</td>
<td align="right">
- <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}" />
- <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}" />
- <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}" />
- <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}" />
+ <input type="hidden" name="productId_o_${rowCount}" value="${product.productId!}" />
+ <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId!}" />
+ <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId!}" />
+ <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId!}" />
<input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}" />
</td>
<td align="right">
@@ -139,7 +139,7 @@ under the License.
<tr><td colspan="13"><h3>${uiLabelMap.ProductNoStockMovesNeeded}.</h3></td></tr>
</#if>
<#assign messageCount = 0>
- <#list pflWarningMessageList?if_exists as pflWarningMessage>
+ <#list pflWarningMessageList! as pflWarningMessage>
<#assign messageCount = messageCount + 1>
<tr><td colspan="13"><h3>${messageCount}:${pflWarningMessage}.</h3></td></tr>
</#list>
@@ -155,7 +155,7 @@ under the License.
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name='quickStockMove'>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId!}" />
<table cellspacing="0" class="basic-table hover-bar">
<tr class="header-row">
<td>${uiLabelMap.ProductProduct}</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Sat Aug 16 11:34:57 2014
@@ -26,7 +26,7 @@ under the License.
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if (facilityLocation?has_content) && (facilityLocation?is_hash)>
- <fo:block>${facilityLocation.areaId?if_exists}-${facilityLocation.aisleId?if_exists}-${facilityLocation.sectionId?if_exists}-${facilityLocation.levelId?if_exists}-${facilityLocation.positionId?if_exists}</fo:block>
+ <fo:block>${facilityLocation.areaId!}-${facilityLocation.aisleId!}-${facilityLocation.sectionId!}-${facilityLocation.levelId!}-${facilityLocation.positionId!}</fo:block>
<#else>
<fo:block>[${uiLabelMap.ProductNoLocation}]</fo:block>
</#if>
@@ -38,7 +38,7 @@ under the License.
<fo:block> </fo:block>
</#if>
<#if (facilityLocationInfo?has_content) && (facilityLocationInfo?is_hash) && (facilityLocationInfo.message)?has_content>
- <fo:block>${facilityLocationInfo.message?if_exists}</fo:block>
+ <fo:block>${facilityLocationInfo.message!}</fo:block>
</#if>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
@@ -51,7 +51,7 @@ under the License.
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#list picklistBinInfoList as picklistBinInfo>
- <fo:block>${picklistBinInfo.picklistBin.primaryOrderId?if_exists}</fo:block>
+ <fo:block>${picklistBinInfo.picklistBin.primaryOrderId!}</fo:block>
</#list>
</fo:table-cell>
</fo:table-row>
@@ -69,7 +69,7 @@ under the License.
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<#if facilityLocation?has_content>
- <fo:block>${facilityLocation.areaId?if_exists}-${facilityLocation.aisleId?if_exists}-${facilityLocation.sectionId?if_exists}-${facilityLocation.levelId?if_exists}-${facilityLocation.positionId?if_exists}</fo:block>
+ <fo:block>${facilityLocation.areaId!}-${facilityLocation.aisleId!}-${facilityLocation.sectionId!}-${facilityLocation.levelId!}-${facilityLocation.positionId!}</fo:block>
<#else>
<fo:block>[${uiLabelMap.ProductNoLocation}]</fo:block>
</#if>
@@ -89,7 +89,7 @@ under the License.
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>
- ${picklistItemInfo.inventoryItemAndLocation.inventoryItemId}<#if picklistItemInfo.inventoryItemAndLocation.binNumber?exists>:${picklistItemInfo.inventoryItemAndLocation.binNumber}</#if>
+ ${picklistItemInfo.inventoryItemAndLocation.inventoryItemId}<#if picklistItemInfo.inventoryItemAndLocation.binNumber??>:${picklistItemInfo.inventoryItemAndLocation.binNumber}</#if>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -200,7 +200,7 @@ under the License.
<#list picklistInfo.picklistBinInfoList as picklistBinInfo>
<#assign rowColor = "white">
<#assign picklistBin = picklistBinInfo.picklistBin>
- <#assign picklistItemInfoList = picklistBinInfo.picklistItemInfoList?if_exists>
+ <#assign picklistItemInfoList = picklistBinInfo.picklistItemInfoList!>
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<fo:block text-align="right">
@@ -242,7 +242,7 @@ under the License.
<#assign orderItem = picklistItemInfo.orderItem>
<#assign product = picklistItemInfo.product>
<#assign picklistItemProduct = picklistItemInfo.inventoryItemAndLocation.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)>
- <#assign orderItemShipGrpInvRes = picklistItemInfo.orderItemShipGrpInvRes?if_exists>
+ <#assign orderItemShipGrpInvRes = picklistItemInfo.orderItemShipGrpInvRes!>
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block><#--${picklistItem.orderId}:${picklistItem.shipGroupSeqId}:-->${picklistItem.orderItemSeqId}</fo:block>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Sat Aug 16 11:34:57 2014
@@ -56,12 +56,12 @@ under the License.
</#if>
<#-- PicklistRole -->
- <#list picklistInfo.picklistRoleInfoList?if_exists as picklistRoleInfo>
+ <#list picklistInfo.picklistRoleInfoList! as picklistRoleInfo>
<div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.PartyParty}</span> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
+ <span class="label">${uiLabelMap.PartyParty}</span> ${picklistRoleInfo.partyNameView.firstName!} ${picklistRoleInfo.partyNameView.middleName!} ${picklistRoleInfo.partyNameView.lastName!} ${picklistRoleInfo.partyNameView.groupName!}
<span class="label">${uiLabelMap.PartyRole}</span> ${picklistRoleInfo.roleType.description}
<span class="label">${uiLabelMap.CommonFrom}</span> ${picklistRoleInfo.picklistRole.fromDate}
- <#if picklistRoleInfo.picklistRole.thruDate?exists><span class="label">${uiLabelMap.CommonThru}</span> ${picklistRoleInfo.picklistRole.thruDate}</#if>
+ <#if picklistRoleInfo.picklistRole.thruDate??><span class="label">${uiLabelMap.CommonThru}</span> ${picklistRoleInfo.picklistRole.thruDate}</#if>
</div>
</#list>
<div style="margin-left: 15px;">
@@ -72,7 +72,7 @@ under the License.
<input type="hidden" name="roleTypeId" value="PICKER"/>
<select name="partyId">
<#list partyRoleAndPartyDetailList as partyRoleAndPartyDetail>
- <option value="${partyRoleAndPartyDetail.partyId}">${partyRoleAndPartyDetail.firstName?if_exists} ${partyRoleAndPartyDetail.middleName?if_exists} ${partyRoleAndPartyDetail.lastName?if_exists} ${partyRoleAndPartyDetail.groupName?if_exists} [${partyRoleAndPartyDetail.partyId}]</option>
+ <option value="${partyRoleAndPartyDetail.partyId}">${partyRoleAndPartyDetail.firstName!} ${partyRoleAndPartyDetail.middleName!} ${partyRoleAndPartyDetail.lastName!} ${partyRoleAndPartyDetail.groupName!} [${partyRoleAndPartyDetail.partyId}]</option>
</#list>
</select>
<input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
@@ -80,7 +80,7 @@ under the License.
</div>
<#-- PicklistStatusHistory -->
- <#list picklistInfo.picklistStatusHistoryInfoList?if_exists as picklistStatusHistoryInfo>
+ <#list picklistInfo.picklistStatusHistoryInfoList! as picklistStatusHistoryInfo>
<div style="margin-left: 15px;">
<span class="label">${uiLabelMap.CommonStatus}</span> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.description}
@@ -90,17 +90,17 @@ under the License.
</#list>
<hr />
<#-- PicklistBin -->
- <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo>
+ <#list picklistInfo.picklistBinInfoList! as picklistBinInfo>
<#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/>
<#if (!isBinComplete)>
<div style="margin-left: 15px;">
<span class="label">${uiLabelMap.ProductBinNum}</span> ${picklistBinInfo.picklistBin.binLocationNumber} (${picklistBinInfo.picklistBin.picklistBinId})
- <#if picklistBinInfo.primaryOrderHeader?exists><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
- <#if picklistBinInfo.primaryOrderItemShipGroup?exists><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
+ <#if picklistBinInfo.primaryOrderHeader??><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
+ <#if picklistBinInfo.primaryOrderItemShipGroup??><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
<#if !picklistBinInfo.picklistItemInfoList?has_content><a href="javascript:document.DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a></#if>
<form name="DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
</form>
</div>
<div style="margin-left: 30px;">
@@ -134,7 +134,7 @@ under the License.
<td> </td>
</tr>
<#assign alt_row = false>
- <#list picklistBinInfo.picklistItemInfoList?if_exists as picklistItemInfo>
+ <#list picklistBinInfo.picklistItemInfoList! as picklistItemInfo>
<#assign picklistItem = picklistItemInfo.picklistItem>
<#assign inventoryItemAndLocation = picklistItemInfo.inventoryItemAndLocation>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
@@ -143,7 +143,7 @@ under the License.
<td>${picklistItem.orderItemSeqId}</td>
<td>${picklistItemInfo.orderItem.productId}<#if picklistItemInfo.orderItem.productId != inventoryItemAndLocation.productId> [${inventoryItemAndLocation.productId}]</#if></td>
<td>${inventoryItemAndLocation.inventoryItemId}</td>
- <td>${inventoryItemAndLocation.areaId?if_exists}-${inventoryItemAndLocation.aisleId?if_exists}-${inventoryItemAndLocation.sectionId?if_exists}-${inventoryItemAndLocation.levelId?if_exists}-${inventoryItemAndLocation.positionId?if_exists}</td>
+ <td>${inventoryItemAndLocation.areaId!}-${inventoryItemAndLocation.aisleId!}-${inventoryItemAndLocation.sectionId!}-${inventoryItemAndLocation.levelId!}-${inventoryItemAndLocation.positionId!}</td>
<td>${picklistItem.quantity}</td>
<#if !picklistItemInfo.itemIssuanceList?has_content>
<td>
@@ -153,7 +153,7 @@ under the License.
<input type="hidden" name="orderItemSeqId" value="${picklistItemInfo.picklistItem.orderItemSeqId}"/>
<input type="hidden" name="shipGroupSeqId" value="${picklistItemInfo.picklistItem.shipGroupSeqId}"/>
<input type="hidden" name="inventoryItemId" value="${picklistItemInfo.picklistItem.inventoryItemId}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
<a href='javascript:document.deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}.submit()' class='buttontext'> ${uiLabelMap.CommonDelete} </a>
</form>
</td>
@@ -161,7 +161,7 @@ under the License.
<td>
<#-- picklistItem.orderItemShipGrpInvRes (do we want to display any of this info?) -->
<#-- picklistItemInfo.itemIssuanceList -->
- <#list picklistItemInfo.itemIssuanceList?if_exists as itemIssuance>
+ <#list picklistItemInfo.itemIssuanceList! as itemIssuance>
<b>${uiLabelMap.ProductIssue} ${uiLabelMap.CommonTo} ${uiLabelMap.ProductShipmentItemSeqId}:</b> ${itemIssuance.shipmentId}:${itemIssuance.shipmentItemSeqId}
<b>${uiLabelMap.ProductQuantity}:</b> ${itemIssuance.quantity}
<b>${uiLabelMap.CommonDate}: </b> ${itemIssuance.issuedDateTime}
@@ -173,7 +173,7 @@ under the License.
</#list>
</table>
</div>
- <#if picklistBinInfo.productStore.managedByLot?exists && picklistBinInfo.productStore.managedByLot = "Y">
+ <#if picklistBinInfo.productStore.managedByLot?? && picklistBinInfo.productStore.managedByLot = "Y">
<div style="margin-left: 30px;">
<table class="basic-table" cellspacing="0">
<tr class="header-row"
@@ -187,7 +187,7 @@ under the License.
<td> </td>
</tr>
<#assign alt_row = false>
- <#list picklistBinInfo.picklistItemInfoList?if_exists as picklistItemInfo>
+ <#list picklistBinInfo.picklistItemInfoList! as picklistItemInfo>
<#assign picklistItem = picklistItemInfo.picklistItem>
<#assign inventoryItemAndLocation = picklistItemInfo.inventoryItemAndLocation>
<#if !picklistItemInfo.product.lotIdFilledIn?has_content || picklistItemInfo.product.lotIdFilledIn != "Forbidden">
@@ -206,7 +206,7 @@ under the License.
<input type="hidden" name="orderItemSeqId" value="${picklistItemInfo.picklistItem.orderItemSeqId}"/>
<input type="hidden" name="shipGroupSeqId" value="${picklistItemInfo.picklistItem.shipGroupSeqId}"/>
<input type="hidden" name="inventoryItemId" value="${picklistItemInfo.picklistItem.inventoryItemId}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
<input type="hidden" name="productId" value="${picklistItemInfo.orderItem.productId}" />
<#if inventoryItemAndLocation.lotId?has_content>
<input type="hidden" name="oldLotId" value="${inventoryItemAndLocation.lotId}" />
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Sat Aug 16 11:34:57 2014
@@ -29,11 +29,11 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr>
<td class='label'>${uiLabelMap.FacilityGroupByShippingMethod}</td>
- <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByShippingMethod?if_exists}" == "Y">checked="checked"</#if>/></td>
+ <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByShippingMethod!}" == "Y">checked="checked"</#if>/></td>
<td class='label'>${uiLabelMap.FacilityGroupByWarehouseArea}</td>
- <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" == "Y">checked="checked"</#if>/></td>
+ <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea!}" == "Y">checked="checked"</#if>/></td>
<td class='label'>${uiLabelMap.FacilityGroupByNoOfOrderItems}</td>
- <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems?if_exists}" == "Y">checked="checked"</#if>/></td>
+ <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems!}" == "Y">checked="checked"</#if>/></td>
</tr>
<tr><td> </td></tr>
</table>
@@ -54,7 +54,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<#if pickMoveInfoList?has_content || rushOrderInfo?has_content>
<tr class="header-row">
- <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<td>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
<#else>
<td>${uiLabelMap.ProductShipmentMethod}</td>
@@ -69,8 +69,8 @@ under the License.
</tr>
</#if>
<#if rushOrderInfo?has_content>
- <#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList?if_exists>
- <#assign orderNeedsStockMoveInfoList = rushOrderInfo.orderNeedsStockMoveInfoList?if_exists>
+ <#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList!>
+ <#assign orderNeedsStockMoveInfoList = rushOrderInfo.orderNeedsStockMoveInfoList!>
<#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)>
<#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
<tr>
@@ -97,12 +97,12 @@ under the License.
<#assign orderNeedsStockMoveInfoListSizeTotal = 0>
<#assign alt_row = false>
<#list pickMoveInfoList as pickMoveInfo>
- <#assign groupName = pickMoveInfo.groupName?if_exists>
- <#assign groupName1 = pickMoveInfo.groupName1?if_exists>
- <#assign groupName2 = pickMoveInfo.groupName2?if_exists>
- <#assign groupName3 = pickMoveInfo.groupName3?if_exists>
- <#assign orderReadyToPickInfoList = pickMoveInfo.orderReadyToPickInfoList?if_exists>
- <#assign orderNeedsStockMoveInfoList = pickMoveInfo.orderNeedsStockMoveInfoList?if_exists>
+ <#assign groupName = pickMoveInfo.groupName!>
+ <#assign groupName1 = pickMoveInfo.groupName1!>
+ <#assign groupName2 = pickMoveInfo.groupName2!>
+ <#assign groupName3 = pickMoveInfo.groupName3!>
+ <#assign orderReadyToPickInfoList = pickMoveInfo.orderReadyToPickInfoList!>
+ <#assign orderNeedsStockMoveInfoList = pickMoveInfo.orderNeedsStockMoveInfoList!>
<#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)>
<#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
<#assign orderReadyToPickInfoListSizeTotal = orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize>
@@ -110,13 +110,13 @@ under the License.
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
<form name="viewGroupDetail_${pickMoveInfo_index}" action="<@o...@ofbizUrl>" method="post">
- <input type ="hidden" name="viewDetail" value= "${groupName?if_exists}"/>
- <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
- <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea?if_exists}"/>
- <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type ="hidden" name="viewDetail" value= "${groupName!}"/>
+ <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod!}"/>
+ <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea!}"/>
+ <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems!}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
</form>
- <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<#if groupName1?has_content>
<a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName1}</a>
</#if>
@@ -131,18 +131,18 @@ under the License.
<a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName3}</a></td>
</#if>
<#else>
- <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName?if_exists}</a>
+ <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName!}</a>
</#if>
</td>
<td>
- <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<#if orderReadyToPickInfoListSize == 0 >${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if>
<#else>
${orderReadyToPickInfoListSize}
</#if>
</td>
<td>
- <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<#if orderNeedsStockMoveInfoListSize == 0>${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if>
<#else>
${orderNeedsStockMoveInfoListSize}
@@ -151,16 +151,16 @@ under the License.
<td>
<#if orderReadyToPickInfoList?has_content>
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
- <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
- <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea?if_exists}"/>
- <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
+ <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod!}"/>
+ <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea!}"/>
+ <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems!}"/>
<input type="hidden" name="orderIdList" value=""/>
- <#assign orderIdsForPickList = orderReadyToPickInfoList?if_exists>
+ <#assign orderIdsForPickList = orderReadyToPickInfoList!>
<#list orderIdsForPickList as orderIdForPickList>
<input type="hidden" name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
</#list>
- <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<span class="label">${uiLabelMap.ProductPickFirst}</span>
<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
</#if>
@@ -173,14 +173,14 @@ under the License.
<td>
<#if orderReadyToPickInfoList?has_content>
<form method="post" action="<@o...@ofbizUrl>" target="_blank">
- <input type="hidden" name="printGroupName" value="${groupName?if_exists}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
- <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
- <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea?if_exists}"/>
- <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
- <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <input type="hidden" name="printGroupName" value="${groupName!}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
+ <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod!}"/>
+ <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea!}"/>
+ <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems!}"/>
+ <#if !((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/>
- <input type="hidden" name="orderId" value="${groupName?if_exists}"/>
+ <input type="hidden" name="orderId" value="${groupName!}"/>
<#else>
<span class="label">${uiLabelMap.FormFieldTitle_printPickSheetFirst}</span>
<input type="text" size="4" name="maxNumberOfOrdersToPrint" value="20"/>
@@ -195,7 +195,7 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
- <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
+ <#if ((requestParameters.groupByShippingMethod?? && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?? && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?? && requestParameters.groupByNoOfOrderItems == "Y"))>
<tr<#if alt_row> class="alternate-row"</#if>>
<th>${uiLabelMap.CommonAllMethods}</div></th>
<td> </td>
@@ -205,7 +205,7 @@ under the License.
<td>
<#if (orderReadyToPickInfoListSizeTotal > 0)>
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
<span class="label">${uiLabelMap.ProductPickFirst}</span>
<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
<input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
@@ -217,7 +217,7 @@ under the License.
<td>
<#if (orderReadyToPickInfoListSizeTotal > 0)>
<form method="post" action="<@o...@ofbizUrl>" target="_blank">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
<span class="label">${uiLabelMap.FormFieldTitle_printPickSheetFirst}</span>
<input type="text" size="4" name="maxNumberOfOrdersToPrint" value="20"/>
<input type="submit" value="${uiLabelMap.FormFieldTitle_printPickSheet}"/>
@@ -234,12 +234,12 @@ under the License.
</table>
</div>
</div>
-<#assign viewDetail = requestParameters.viewDetail?if_exists>
+<#assign viewDetail = requestParameters.viewDetail!>
<#if viewDetail?has_content>
<#list pickMoveInfoList as pickMoveInfo>
- <#assign groupName = pickMoveInfo.groupName?if_exists>
- <#if groupName?if_exists == viewDetail>
- <#assign toPickList = pickMoveInfo.orderReadyToPickInfoList?if_exists>
+ <#assign groupName = pickMoveInfo.groupName!>
+ <#if groupName! == viewDetail>
+ <#assign toPickList = pickMoveInfo.orderReadyToPickInfoList!>
</#if>
</#list>
</#if>
@@ -268,24 +268,24 @@ under the License.
<#list toPickList as toPick>
<#assign oiasgal = toPick.orderItemShipGrpInvResList>
<#assign header = toPick.orderHeader>
- <#assign channel = header.getRelatedOne("SalesChannelEnumeration", false)?if_exists>
+ <#assign channel = header.getRelatedOne("SalesChannelEnumeration", false)!>
<#list oiasgal as oiasga>
- <#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)?if_exists>
- <#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)?if_exists>
+ <#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)!>
+ <#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)!>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
<td>${header.orderDate?string}</td>
- <td>${(channel.description)?if_exists}</td>
+ <td>${(channel.description)!}</td>
<td>${oiasga.orderItemSeqId}</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+ <a href="/catalog/control/EditProduct?productId=${orderProduct.productId!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)!}</a>
<#if orderProduct.productId != product.productId>
- [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
+ [<a href="/catalog/control/EditProduct?productId=${product.productId!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)!}</a>]
</#if>
</td>
<td>${oiasga.shipGroupSeqId}</td>
<td>${oiasga.quantity}</td>
- <td>${oiasga.quantityNotAvailable?if_exists}</td>
+ <td>${oiasga.quantityNotAvailable!}</td>
</tr>
</#list>
<#-- toggle the row color -->