svn commit: r1618554 [20/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [20/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Mon Aug 18 07:42:27 2014 @@ -19,15 +19,15 @@ under the License. <div class="button-bar button-style-1"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacility}</a> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacilityLocation}</a> + <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId!}</@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacilityLocation}</a> </div> <form action="<@ofbizUrl>FindFacilityLocation</@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="<@ofbizUrl>EditFacility?facilityId=${(location.facilityId)?if_exists}</@ofbizUrl>">${(location.facilityId)?if_exists}</a></td> - <td><a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@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="<@ofbizUrl>EditFacility?facilityId=${(location.facilityId)!}</@ofbizUrl>">${(location.facilityId)!}</a></td> + <td><a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)!}</@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="<@ofbizUrl>EditInventoryItem?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.ProductNewInventoryItem}</a> - <#if itemId?exists> - <a href="<@ofbizUrl>UpdateInventoryItem?inventoryItemId=${itemId}&facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.ProductSetItem} ${itemId}</a> + <a href="<@ofbizUrl>EditInventoryItem?facilityId=${(location.facilityId)!}&locationSeqId=${(location.locationSeqId)!}</@ofbizUrl>">${uiLabelMap.ProductNewInventoryItem}</a> + <#if itemId??> + <a href="<@ofbizUrl>UpdateInventoryItem?inventoryItemId=${itemId}&facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)!}</@ofbizUrl>">${uiLabelMap.ProductSetItem} ${itemId}</a> </#if> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${(location.facilityId)!}&locationSeqId=${(location.locationSeqId)!}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </td> </tr> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PickMoveStock.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PickMoveStock.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PickMoveStock.ftl Mon Aug 18 07:42:27 2014 @@ -34,14 +34,14 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.ProductStockMovesNeeded}</li> - <li><a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li> + <li><a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId!}</@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li> </ul> <br class="clear"/> </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>processPhysicalStockMove</@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="<@ofbizUrl>processQuickStockMove</@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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/Picklist.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/Picklist.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/Picklist.fo.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl Mon Aug 18 07:42:27 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="<@ofbizUrl>deletePicklistBin</@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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl Mon Aug 18 07:42:27 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="<@ofbizUrl>PicklistOptions</@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="<@ofbizUrl>createPicklistFromOrders</@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="<@ofbizUrl>printPickSheets</@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="<@ofbizUrl>createPicklistFromOrders</@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="<@ofbizUrl>printPickSheets</@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 --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Mon Aug 18 07:42:27 2014 @@ -34,10 +34,10 @@ under the License. <#assign orderId = order.orderId> <#assign orderDate = order.orderDate> <#list orderInfoList as orderInfo> - <#if orderInfo.get("${orderId}")?exists> + <#if orderInfo.get("${orderId}")??> <#assign orderDetail = orderInfo.get("${orderId}")> <#assign orderDate = orderDetail.orderDate> - <#if orderDetail.billingAddress?exists> + <#if orderDetail.billingAddress??> <#assign billAddress = orderDetail.billingAddress> </#if> <#assign shipAddress = orderDetail.shippingAddress> @@ -73,12 +73,12 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block font-weight="bold">${uiLabelMap.OrderShipToParty}:</fo:block> - <fo:block>${shipAddress.toName?if_exists}</fo:block> - <fo:block> ${shipAddress.address1?if_exists}</fo:block> - <fo:block> ${shipAddress.city?if_exists}</fo:block> - <fo:block> ${shipAddress.countryGeoId?if_exists}</fo:block> - <fo:block> ${shipAddress.postalCode?if_exists}</fo:block> - <fo:block> ${shipAddress.stateProvinceGeoId?if_exists}</fo:block> + <fo:block>${shipAddress.toName!}</fo:block> + <fo:block> ${shipAddress.address1!}</fo:block> + <fo:block> ${shipAddress.city!}</fo:block> + <fo:block> ${shipAddress.countryGeoId!}</fo:block> + <fo:block> ${shipAddress.postalCode!}</fo:block> + <fo:block> ${shipAddress.stateProvinceGeoId!}</fo:block> </fo:table-cell> <fo:table-cell> <fo:table> @@ -88,12 +88,12 @@ under the License. <fo:table-cell> <#if billAddress?has_content> <fo:block font-weight="bold">${uiLabelMap.OrderOrderBillToParty}:</fo:block> - <fo:block> ${billAddress.toName?if_exists}</fo:block> - <fo:block> ${billAddress.address1?if_exists}</fo:block> - <fo:block> ${billAddress.city?if_exists}</fo:block> - <fo:block> ${billAddress.countryGeoId?if_exists}</fo:block> - <fo:block> ${billAddress.postalCode?if_exists}</fo:block> - <fo:block> ${billAddress.stateProvinceGeoId?if_exists}</fo:block> + <fo:block> ${billAddress.toName!}</fo:block> + <fo:block> ${billAddress.address1!}</fo:block> + <fo:block> ${billAddress.city!}</fo:block> + <fo:block> ${billAddress.countryGeoId!}</fo:block> + <fo:block> ${billAddress.postalCode!}</fo:block> + <fo:block> ${billAddress.stateProvinceGeoId!}</fo:block> </#if> </fo:table-cell> </fo:table-row> @@ -125,7 +125,7 @@ under the License. <fo:block>${uiLabelMap.ProductShipmentMethod}:</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block font-weight="bold">${carrierPartyId?if_exists}-${shipmentMethodType?if_exists}</fo:block> + <fo:block font-weight="bold">${carrierPartyId!}-${shipmentMethodType!}</fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> @@ -157,17 +157,17 @@ under the License. <#assign totalQty = 0> <#assign rowColor = "#D4D0C8"/> <#list itemInfoList as itemInfo> - <#if itemInfo.get("${orderId}")?exists > + <#if itemInfo.get("${orderId}")?? > <#assign infoItems = itemInfo.get("${orderId}")> <#list infoItems as infoItem> <#assign orderItemShipGrpInvRes = infoItem.orderItemShipGrpInvRes> <#assign quantityToPick = Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantity}") > - <#if orderItemShipGrpInvRes.quantityNotAvailable?exists > + <#if orderItemShipGrpInvRes.quantityNotAvailable?? > <#assign quantityToPick = quantityToPick - Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantityNotAvailable}")> </#if> <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem", false)> <#assign product = orderItem.getRelatedOne("Product", false)> - <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))?if_exists> + <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))!> <#assign inventoryItem = infoItem.inventoryItem> <#if (quantityToPick > 0)> <fo:table-row background-color="${rowColor}"> @@ -178,14 +178,14 @@ under the License. <fo:table-cell><fo:block font-size="10pt">_NA_</fo:block></fo:table-cell> </#if> <fo:table-cell><fo:block font-size="10pt">${product.productId} </fo:block></fo:table-cell> - <fo:table-cell><fo:block font-size="10pt">${product.internalName?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${product.internalName!} </fo:block></fo:table-cell> <#if supplierProduct?has_content > - <fo:table-cell><fo:block font-size="10pt">${supplierProduct.supplierProductId?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${supplierProduct.supplierProductId!} </fo:block></fo:table-cell> <#else> <fo:table-cell><fo:block font-size="10pt"> </fo:block></fo:table-cell> </#if> <#assign totalQty = totalQty + quantityToPick> - <fo:table-cell><fo:block font-size="10pt">${quantityToPick?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${quantityToPick!} </fo:block></fo:table-cell> <fo:table-cell><fo:block font-size="10pt"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></fo:block></fo:table-cell> </fo:table-row> </#if> @@ -212,7 +212,7 @@ under the License. <#assign product = inventoryItem.getRelatedOne("Product", false)/> <fo:table-row background-color="${rowColor}"> <#-- bin location --> - <fo:table-cell ><fo:block font-size="10pt"><#if inventoryItem?exists>${inventoryItem.locationSeqId?default("_NA_")}</#if></fo:block></fo:table-cell> + <fo:table-cell ><fo:block font-size="10pt"><#if inventoryItem??>${inventoryItem.locationSeqId?default("_NA_")}</#if></fo:block></fo:table-cell> <#-- product ID --> <#if product?has_content> @@ -230,13 +230,13 @@ under the License. <#-- supplier --> <#if vendor?has_content > - <fo:table-cell><fo:block font-size="10pt">${vendor.supplierProductId?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${vendor.supplierProductId!}</fo:block></fo:table-cell> <#else> <fo:table-cell><fo:block font-size="10pt"> </fo:block></fo:table-cell> </#if> <#-- quantity --> - <fo:table-cell><fo:block font-size="10pt">${workEffortInventoryAssign.quantity?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${workEffortInventoryAssign.quantity!}</fo:block></fo:table-cell> <#-- unit price --> <fo:table-cell ><fo:block></fo:block></fo:table-cell> @@ -276,7 +276,7 @@ under the License. </#if> </#list> <#list orderChargeList as orderCharge> - <#if orderCharge.get("${orderId}")?exists > + <#if orderCharge.get("${orderId}")?? > <#assign charges = orderCharge.get("${orderId}")> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.OrderSubTotal}:</fo:block></fo:table-cell> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl Mon Aug 18 07:42:27 2014 @@ -33,8 +33,8 @@ under the License. <#if orders?has_content> <#list orders?sort_by("pickSheetPrintedDate") as order> <tr> - <td><a href="/ordermgr/control/orderview?orderId=${order.orderId?if_exists}" class="buttontext" target="_blank">${order.orderId?if_exists}</a></td> - <td>${order.pickSheetPrintedDate?if_exists}</td> + <td><a href="/ordermgr/control/orderview?orderId=${order.orderId!}" class="buttontext" target="_blank">${order.orderId!}</a></td> + <td>${order.pickSheetPrintedDate!}</td> <td><#if "Y" == order.isVerified>${uiLabelMap.CommonY}</#if></td> </tr> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/ViewContactMechs.ftl Mon Aug 18 07:42:27 2014 @@ -45,14 +45,14 @@ under the License. <#assign postalAddress = contactMechMap.postalAddress> <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> - <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br /></#if> - ${postalAddress.city?if_exists}, - ${postalAddress.stateProvinceGeoId?if_exists} - ${postalAddress.postalCode?if_exists} + ${postalAddress.address1!}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2!}<br /></#if> + ${postalAddress.city!}, + ${postalAddress.stateProvinceGeoId!} + ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> - <#assign addr1 = postalAddress.address1?if_exists> + <#assign addr1 = postalAddress.address1!> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> @@ -63,27 +63,27 @@ under the License. <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> - ${telecomNumber.countryCode?if_exists} - <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} + ${telecomNumber.countryCode!} + <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber!} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> <br /><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> <a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesTelNumberLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> - ${contactMech.infoString?if_exists} - <a href='mailto:${contactMech.infoString?if_exists}' class='buttontext'>${uiLabelMap.CommonSendEmail}</a> + ${contactMech.infoString!} + <a href='mailto:${contactMech.infoString!}' class='buttontext'>${uiLabelMap.CommonSendEmail}</a> <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if> <a target='_blank' href='${openAddress}' class='buttontext'>((${uiLabelMap.CommonOpenPageNewWindow})</a> <#else> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} </#if> <br />(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) <#if facilityContactMech.thruDate?has_content><br /><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> @@ -95,8 +95,8 @@ under the License. </#if> <#if security.hasEntityPermission("FACILITY", "_DELETE", session)> <form action="<@ofbizUrl>deleteContactMech/ViewContactMechs</@ofbizUrl>" name="deleteContactForm_${contactMechMap_index}" method="post"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - <input type="hidden" name="contactMechId" value="${contactMech.contactMechId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> + <input type="hidden" name="contactMechId" value="${contactMech.contactMechId!}"/> </form> <a href="javascript:document.deleteContactForm_${contactMechMap_index}.submit()">${uiLabelMap.CommonExpire}</a> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Mon Aug 18 07:42:27 2014 @@ -27,12 +27,12 @@ under the License. <tr> <td> <div> - <span class="label">${labelType.description?if_exists} [${labelType.inventoryItemLabelTypeId}]</span> + <span class="label">${labelType.description!} [${labelType.inventoryItemLabelTypeId}]</span> <select name="inventoryItemLabelId_${index}"> <option></option> <#list labels as label> - <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected="selected"</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option> + <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected="selected"</#if>>${label.description!} [${label.inventoryItemLabelId}]</option> </#list> </select> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |