svn commit: r1618336 [19/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [19/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -30,10 +30,10 @@ under the License. <div> <span class="label">${uiLabelMap.ProductOrderId}</span> <span> - <@htmlTemplate.lookupField value="${orderId?if_exists}" formName="additemsfromorder" name="orderId" id="orderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> + <@htmlTemplate.lookupField value="${orderId!}" formName="additemsfromorder" name="orderId" id="orderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> </span> <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> - <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/> </div> </form> @@ -42,38 +42,38 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductAddItemsShipment}: [${shipmentId?if_exists}]; ${uiLabelMap.ProductFromAnOrder}: [${orderId?if_exists}], ${uiLabelMap.ProductOrderShipGroupId}: [${shipGroupSeqId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductAddItemsShipment}: [${shipmentId!}]; ${uiLabelMap.ProductFromAnOrder}: [${orderId!}], ${uiLabelMap.ProductOrderShipGroupId}: [${shipGroupSeqId!}]</li> </ul> <br class="clear"/> </div> <div class="screenlet-body"> - <#if orderId?has_content && !orderHeader?exists> + <#if orderId?has_content && !orderHeader??> <h3 style="color: red;"><#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/>.</h3> </#if> - <#if orderHeader?exists> - <#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId?if_exists != "SALES_SHIPMENT"> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</h3> - <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId?if_exists != "DROP_SHIPMENT"> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</h3> + <#if orderHeader??> + <#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId! != "SALES_SHIPMENT"> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}, ${uiLabelMap.ProductNotSalesShipment}.</h3> + <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId! != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId! != "DROP_SHIPMENT"> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}, ${uiLabelMap.ProductNotPurchaseShipment}.</h3> <#else> - <h3>${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}.</h3> - <h3>${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId?if_exists}.</h3> + <h3>${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId!)}.</h3> + <h3>${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId!}.</h3> </#if> - <#if shipment.shipmentTypeId?if_exists == "SALES_SHIPMENT"> - <h3>${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility?exists>${originFacility.facilityName?if_exists} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> - <#elseif shipment.shipmentTypeId?if_exists == "PURCHASE_SHIPMENT"> - <h3>${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility?exists>${destinationFacility.facilityName?if_exists} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> + <#if shipment.shipmentTypeId! == "SALES_SHIPMENT"> + <h3>${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility??>${originFacility.facilityName!} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> + <#elseif shipment.shipmentTypeId! == "PURCHASE_SHIPMENT"> + <h3>${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility??>${destinationFacility.facilityName!} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> </#if> <#if "ORDER_APPROVED" == orderHeader.statusId || "ORDER_BACKORDERED" == orderHeader.statusId> - <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}.</h3> + <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId!)}.</h3> <#elseif "ORDER_COMPLETED" == orderHeader.statusId> - <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.</h3> + <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId!)}, ${uiLabelMap.ProductNoItemsLeft}.</h3> <#else> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId!)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> </#if> </#if> <br /> - <#if orderItemDatas?exists> + <#if orderItemDatas??> <#assign rowCount = 0> <#if isSalesOrder> <form action="<@ofbizUrl>issueOrderItemShipGrpInvResToShipment</@ofbizUrl>" method="post" name="selectAllForm"> @@ -102,21 +102,21 @@ under the License. </td> </tr> <#assign alt_row = false> - <#list orderItemDatas?if_exists as orderItemData> + <#list orderItemDatas! as orderItemData> <#assign orderItemAndShipGroupAssoc = orderItemData.orderItemAndShipGroupAssoc> - <#assign product = orderItemData.product?if_exists> + <#assign product = orderItemData.product!> <#assign itemIssuances = orderItemData.itemIssuances> <#assign totalQuantityIssued = orderItemData.totalQuantityIssued> - <#assign orderItemShipGrpInvResDatas = orderItemData.orderItemShipGrpInvResDatas?if_exists> - <#assign totalQuantityReserved = orderItemData.totalQuantityReserved?if_exists> - <#assign totalQuantityIssuedAndReserved = orderItemData.totalQuantityIssuedAndReserved?if_exists> + <#assign orderItemShipGrpInvResDatas = orderItemData.orderItemShipGrpInvResDatas!> + <#assign totalQuantityReserved = orderItemData.totalQuantityReserved!> + <#assign totalQuantityIssuedAndReserved = orderItemData.totalQuantityIssuedAndReserved!> <tr id="orderItemData_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><div>${orderItemAndShipGroupAssoc.orderId} / ${orderItemAndShipGroupAssoc.shipGroupSeqId} / ${orderItemAndShipGroupAssoc.orderItemSeqId}</div></td> - <td><div>${(product.internalName)?if_exists} [${orderItemAndShipGroupAssoc.productId?default("N/A")}]</div></td> + <td><div>${(product.internalName)!} [${orderItemAndShipGroupAssoc.productId?default("N/A")}]</div></td> <td> <#if itemIssuances?has_content> <#list itemIssuances as itemIssuance> - <div><b>[${itemIssuance.quantity?if_exists}]</b>${itemIssuance.shipmentId?if_exists}:${itemIssuance.shipmentItemSeqId?if_exists} ${uiLabelMap.CommonOn} [${(itemIssuance.issuedDateTime.toString())?if_exists}] ${uiLabelMap.CommonBy} [${(itemIssuance.issuedByUserLoginId)?if_exists}]</div> + <div><b>[${itemIssuance.quantity!}]</b>${itemIssuance.shipmentId!}:${itemIssuance.shipmentItemSeqId!} ${uiLabelMap.CommonOn} [${(itemIssuance.issuedDateTime.toString())!}] ${uiLabelMap.CommonBy} [${(itemIssuance.issuedByUserLoginId)!}]</div> </#list> <#else> <div> </div> @@ -192,7 +192,7 @@ under the License. <div> ${orderItemShipGrpInvRes.inventoryItemId} <#if inventoryItem.facilityId?has_content> - <span<#if originFacility?exists && originFacility.facilityId != inventoryItem.facilityId> style="color: red;"</#if>>[${(inventoryItemFacility.facilityName)?default(inventoryItem.facilityId)}]</span> + <span<#if originFacility?? && originFacility.facilityId != inventoryItem.facilityId> style="color: red;"</#if>>[${(inventoryItemFacility.facilityName)?default(inventoryItem.facilityId)}]</span> <#else> <span style="color: red;">[${uiLabelMap.ProductNoFacility}]</span> </#if> @@ -201,7 +201,7 @@ under the License. <td> </td> <td>${orderItemShipGrpInvRes.quantity}</td> <td>${orderItemShipGrpInvRes.quantityNotAvailable?default(" ")}</td> - <#if originFacility?exists && originFacility.facilityId == inventoryItem.facilityId?if_exists> + <#if originFacility?? && originFacility.facilityId == inventoryItem.facilityId!> <td> <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipmentId}"/> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItemShipGrpInvRes.orderId}"/> @@ -236,7 +236,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId!}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -42,12 +42,12 @@ under the License. <#assign itemIssuances = shipmentItemData.itemIssuances> <#assign orderShipments = shipmentItemData.orderShipments> <#assign shipmentPackageContents = shipmentItemData.shipmentPackageContents> - <#assign product = shipmentItemData.product?if_exists> + <#assign product = shipmentItemData.product!> <#assign totalQuantityPackaged = shipmentItemData.totalQuantityPackaged> <#assign totalQuantityToPackage = shipmentItemData.totalQuantityToPackage> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentItem.shipmentItemSeqId}</td> - <td colspan="2">${(product.internalName)?if_exists} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId?if_exists}" class="buttontext">${shipmentItem.productId?if_exists}</a></td> + <td colspan="2">${(product.internalName)!} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId!}" class="buttontext">${shipmentItem.productId!}</a></td> <td>${shipmentItem.quantity?default(" ")}</td> <td colspan="2">${shipmentItem.shipmentContentDescription?default(" ")}</td> <td><a href="javascript:document.deleteShipmentItem${shipmentItemData_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></td> @@ -59,9 +59,9 @@ under the License. <#list orderShipments as orderShipment> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> - <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}" class="buttontext">${orderShipment.orderId?if_exists}</a> ${orderShipment.orderItemSeqId?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId!}" class="buttontext">${orderShipment.orderId!}</a> ${orderShipment.orderItemSeqId!}</td> <td> </td> - <td>${orderShipment.quantity?if_exists}</td> + <td>${orderShipment.quantity!}</td> <td> </td> <td> </td> <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td> @@ -70,10 +70,10 @@ under the License. <#list itemIssuances as itemIssuance> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> - <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}" class="buttontext">${itemIssuance.orderId?if_exists}</a> ${itemIssuance.orderItemSeqId?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId?if_exists}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId?if_exists}</a></td> - <td>${itemIssuance.quantity?if_exists}</td> - <td>${itemIssuance.issuedDateTime?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId!}" class="buttontext">${itemIssuance.orderId!}</a> ${itemIssuance.orderItemSeqId!}</td> + <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId!}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId!}</a></td> + <td>${itemIssuance.quantity!}</td> + <td>${itemIssuance.issuedDateTime!}</td> <td class="label">${uiLabelMap.ProductFuturePartyRoleList}</td> <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td> </tr> @@ -82,10 +82,10 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td colspan="2"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageContent.shipmentPackageSeqId}</td> - <td>${shipmentPackageContent.quantity?if_exists} </td> + <td>${shipmentPackageContent.quantity!} </td> <#if shipmentPackageContent.subProductId?has_content> <td><span class="label">${uiLabelMap.ProductSubProduct}</span> ${shipmentPackageContent.subProductId}</td> - <td>${shipmentPackageContent.subProductQuantity?if_exists}</td> + <td>${shipmentPackageContent.subProductQuantity!}</td> <#else> <td colspan="2"> </td> </#if> @@ -146,7 +146,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId!}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -38,18 +38,18 @@ under the License. <#assign alt_row = false> <#list shipmentPackageDatas as shipmentPackageData> <#assign shipmentPackage = shipmentPackageData.shipmentPackage> - <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents?if_exists> - <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs?if_exists> - <#assign weightUom = shipmentPackageData.weightUom?if_exists> + <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents!> + <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs!> + <#assign weightUom = shipmentPackageData.weightUom!> <form method="post" action="<@ofbizUrl>updateShipmentPackage</@ofbizUrl>" name="updateShipmentPackageForm${shipmentPackageData_index}"> <input type="hidden" name="shipmentId" value="${shipmentId}"/> <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentPackage.shipmentPackageSeqId}</td> - <td>${(shipmentPackage.dateCreated.toString())?if_exists}</td> + <td>${(shipmentPackage.dateCreated.toString())!}</td> <td> <span class="label">${uiLabelMap.ProductWeight}</span> - <input type="text" size="5" name="weight" value="${shipmentPackage.weight?if_exists}"/> + <input type="text" size="5" name="weight" value="${shipmentPackage.weight!}"/> <span class="label">${uiLabelMap.ProductWeightUnit}</span> <select name="weightUomId"> <#if weightUom?has_content> @@ -68,11 +68,11 @@ under the License. <select name="shipmentBoxTypeId"> <option value=""> </option> <#list boxTypes as boxType> - <option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?exists && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected="selected"</#if>>${boxType.get("description",locale)}</option> + <option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?? && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected="selected"</#if>>${boxType.get("description",locale)}</option> </#list> </select> <span class="label">${uiLabelMap.ProductShipmentInsuredValuePackage}</span> - <input type="text" size="5" name="insuredValue" value="${shipmentPackage.insuredValue?if_exists}"/> + <input type="text" size="5" name="insuredValue" value="${shipmentPackage.insuredValue!}"/> </td> <td><a href="javascript:document.updateShipmentPackageForm${shipmentPackageData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> <td><a href="javascript:document.deleteShipmentPackage_${shipmentPackageData_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></td> @@ -89,7 +89,7 @@ under the License. <td colspan="2"> <div> <span class="label">${uiLabelMap.ProductQuantity}</span> - ${shipmentPackageContent.quantity?if_exists} + ${shipmentPackageContent.quantity!} <a href="javascript:document.deleteShipmentPackageContent${shipmentPackageData_index}${shipmentPackageContent_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> </td> @@ -136,11 +136,11 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductRouteSegment}</span> ${shipmentPackageRouteSeg.shipmentRouteSegmentId}</td> - <td><span class="label">${uiLabelMap.ProductTrack}</span> <input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/></td> + <td><span class="label">${uiLabelMap.ProductTrack}</span> <input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode!}"/></td> <td colspan="2"> <div> <span class="label">${uiLabelMap.ProductBox}</span> - <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/> + <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber!}"/> <a href="javascript:document.updateShipmentPackageRouteSegForm${shipmentPackageData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="javascript:document.deleteShipmentPackageRouteSeg${shipmentPackageData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> @@ -205,7 +205,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId!}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -56,20 +56,20 @@ under the License. <#assign alt_row = false> <#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> - <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> - <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> - <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> - <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> - <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> - <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> - <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> - <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> - <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> - <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> - <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> - <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> - <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> - <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> + <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs!> + <#assign originFacility = shipmentRouteSegmentData.originFacility!> + <#assign destFacility = shipmentRouteSegmentData.destFacility!> + <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType!> + <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson!> + <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup!> + <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress!> + <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress!> + <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber!> + <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber!> + <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem!> + <#assign currencyUom = shipmentRouteSegmentData.currencyUom!> + <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom!> + <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails!> <form name="duplicateShipmentRouteSegment_${shipmentRouteSegmentData_index}" method="post" action="<@ofbizUrl>duplicateShipmentRouteSegment</@ofbizUrl>"> <input type="hidden" name="shipmentId" value="${shipmentRouteSegment.shipmentId}"/> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> @@ -97,13 +97,13 @@ under the License. <div> <select name="carrierPartyId"> <#if shipmentRouteSegment.carrierPartyId?has_content> - <option value="${shipmentRouteSegment.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId}]</option> + <option value="${shipmentRouteSegment.carrierPartyId}">${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${shipmentRouteSegment.carrierPartyId}]</option> <option value="${shipmentRouteSegment.carrierPartyId}">---</option> <#else> <option value=""> </option> </#if> <#list carrierPartyDatas as carrierPartyData> - <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)!} ${(carrierPartyData.person.middleName)!} ${(carrierPartyData.person.lastName)!} ${(carrierPartyData.partyGroup.groupName)!} [${carrierPartyData.party.partyId}]</option> </#list> </select> <select name="shipmentMethodTypeId"> @@ -142,74 +142,74 @@ under the License. </select> <br /> <div> - <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId?if_exists}"/> - <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</span></#if> + <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId!}"/> + <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}</span></#if> </div> <div> - <input type="text" size="15" name="destContactMechId" value="${shipmentRouteSegment.destContactMechId?if_exists}"/> - <#if destPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${destPostalAddress.toName?if_exists},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</span></#if> + <input type="text" size="15" name="destContactMechId" value="${shipmentRouteSegment.destContactMechId!}"/> + <#if destPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${destPostalAddress.toName!},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName!}, ${destPostalAddress.address1!}, ${destPostalAddress.address2!}, ${destPostalAddress.city!}, ${destPostalAddress.stateProvinceGeoId!}, ${destPostalAddress.postalCode!}, ${destPostalAddress.countryGeoId!}</span></#if> </div> <div> - <input type="text" size="15" name="originTelecomNumberId" value="${shipmentRouteSegment.originTelecomNumberId?if_exists}"/> - <#if originTelecomNumber?has_content><span class="tooltip">${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</span></#if> + <input type="text" size="15" name="originTelecomNumberId" value="${shipmentRouteSegment.originTelecomNumberId!}"/> + <#if originTelecomNumber?has_content><span class="tooltip">${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}</span></#if> </div> <div> - <input type="text" size="15" name="destTelecomNumberId" value="${shipmentRouteSegment.destTelecomNumberId?if_exists}"/> - <#if destTelecomNumber?has_content><span class="tooltip">${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</span></#if> + <input type="text" size="15" name="destTelecomNumberId" value="${shipmentRouteSegment.destTelecomNumberId!}"/> + <#if destTelecomNumber?has_content><span class="tooltip">${destTelecomNumber.countryCode!} ${destTelecomNumber.areaCode!} ${destTelecomNumber.contactNumber!}</span></#if> </div> <div> - <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber?if_exists}"/> + <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber!}"/> </div> <div> - <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode?if_exists}"/> + <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode!}"/> </div> <div> - <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode?if_exists}"/> + <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode!}"/> </div> </div> </td> <td valign="top"> <div> - <#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#if "UPS" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> <br /> ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")} /> - <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> - <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsTrackShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipment}</a> </#if> </#if> - <#if "DHL" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#if "DHL" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.dhlShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentDHL}</a> </#if> </#if> - <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#if "FEDEX" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.fedexShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> <br /> - <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> + <#if shipmentMethodType?? && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> <select name="homeDeliveryType"> <option value="">${uiLabelMap.ProductShipmentNone}</option> <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="DATECERTAIN")?string("selected=\"selected\"","")} value="DATECERTAIN">${uiLabelMap.ProductShipmentFedexHomeDateCertain}</option> <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")} value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option> <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")} value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option> </select> - <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())!}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> <#else> <#-- Todo: implement closeout with Fedex --> <#-- Todo: implement shipment cancellation with Fedex --> <#-- Todo: implement shipment tracking with Fedex --> ${shipmentRouteSegment.homeDeliveryType?default(uiLabelMap.ProductShipmentNone)} - <#if shipmentRouteSegment.homeDeliveryDate?exists> + <#if shipmentRouteSegment.homeDeliveryDate??> (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) </#if> <br /> @@ -228,17 +228,17 @@ under the License. </#list> </select> <br /> - <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> + <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber!}"/> <br /> - <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedArrivalDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())!}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())!}" size="25" maxlength="30" id="estimatedArrivalDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <br /> - <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())!}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())!}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> <td valign="top"> - <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight?if_exists}"/> + <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight!}"/> <select name="billingWeightUomId"> <#if billingWeightUom?has_content> <option value="${billingWeightUom.uomId}">${billingWeightUom.get("description",locale)} [${billingWeightUom.abbreviation}]</option> @@ -263,13 +263,13 @@ under the License. </#list> </select> <br /> - <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}"/> + <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost!}"/> <br /> - <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}"/> + <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost!}"/> <br /> - <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}"/> + <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost!}"/> <br /> - <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}"/> + <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost!}"/> </td> </tr> </form> @@ -309,16 +309,16 @@ under the License. <td valign="top"> <div> <span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId} - <#if shipmentPackageRouteSeg.labelImage?exists> + <#if shipmentPackageRouteSeg.labelImage??> <a href="javascript:document.viewShipmentPackageRouteSegLabelImage_${shipmentRouteSegmentData_index}_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> </#if> - <span class="label">${uiLabelMap.ProductTrack} ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/> + <span class="label">${uiLabelMap.ProductTrack} ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode!}"/> </div> </td> <td valign="top"> <div> <span class="label">${uiLabelMap.ProductBox} ${uiLabelMap.CommonNbr}</span> - <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/> + <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber!}"/> </div> </td> <td valign="top"> @@ -392,7 +392,7 @@ under the License. <select name="carrierPartyId"> <option value=""> </option> <#list carrierPartyDatas as carrierPartyData> - <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)!} ${(carrierPartyData.person.middleName)!} ${(carrierPartyData.person.lastName)!} ${(carrierPartyData.partyGroup.groupName)!} [${carrierPartyData.party.partyId}]</option> </#list> </select> <select name="shipmentMethodTypeId"> @@ -424,7 +424,7 @@ under the License. <td valign="top"> <select name="carrierServiceStatusId"> <option value=""> </option> - <#list carrierServiceStatusValidChangeToDetails?if_exists as carrierServiceStatusValidChangeToDetail> + <#list carrierServiceStatusValidChangeToDetails! as carrierServiceStatusValidChangeToDetail> <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> @@ -438,7 +438,7 @@ under the License. <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td valign="top"> - <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}"/> + <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)!}"/> <select name="billingWeightUomId"> <option value=""> </option> <#list weightUoms as weightUom> @@ -470,7 +470,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId!}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Sat Aug 16 11:34:57 2014 @@ -48,7 +48,7 @@ function lookupShipments() { <tr> <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentId}</td> <td width="5%"> </td> - <td><input type="text" name="shipmentId" value="${shipmentId?if_exists}" /></td> + <td><input type="text" name="shipmentId" value="${shipmentId!}" /></td> </tr> <tr> <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> @@ -133,13 +133,13 @@ function lookupShipments() { <table cellspacing="0" class="basic-table"> <tr> <td> - <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate?if_exists}" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate!}" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class="label">${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td> - <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate?if_exists}" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate!}" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class="label">${uiLabelMap.CommonThru}</span> </td> </tr> @@ -150,7 +150,7 @@ function lookupShipments() { </form> </div> </div> -<#if shipmentList?exists> +<#if shipmentList??> <div id="findOrders_2" class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -185,17 +185,17 @@ function lookupShipments() { <#if shipmentList?has_content> <#assign alt_row = false> <#list shipmentList as shipment> - <#assign originFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId), true)?if_exists /> - <#assign destinationFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId), true)?if_exists /> - <#assign statusItem = delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId), true)?if_exists/> - <#assign shipmentType = delegator.findOne("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId), true)?if_exists/> + <#assign originFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId), true)! /> + <#assign destinationFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId), true)! /> + <#assign statusItem = delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId), true)!/> + <#assign shipmentType = delegator.findOne("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId), true)!/> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${shipment.shipmentId}</a></td> <td>${(shipmentType.get("description",locale))?default(shipmentType.shipmentTypeId?default(""))}</td> <td>${(statusItem.get("description",locale))?default(statusItem.statusId?default("N/A"))}</td> - <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td> - <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td> - <td><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())?if_exists}</span></td> + <td>${(originFacility.facilityName)!} [${shipment.originFacilityId!}]</td> + <td>${(destinationFacility.facilityName)!} [${shipment.destinationFacilityId!}]</td> + <td><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())!}</span></td> <td align="right"> <a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a> </td> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Sat Aug 16 11:34:57 2014 @@ -42,7 +42,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductPackOrder} in ${facility.facilityName?if_exists} [${facilityId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductPackOrder} in ${facility.facilityName!} [${facilityId!}]</li> </ul> <br class="clear"/> </div> @@ -70,13 +70,13 @@ under the License. <!-- select order form --> <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> + <input type="text" name="orderId" size="20" maxlength="20" value="${orderId!}"/> / <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> </td> @@ -97,13 +97,13 @@ under the License. <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/> </td> <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td> <td> </td> @@ -119,14 +119,14 @@ under the License. </table> </form> <form name="clearPackForm" method="post" action="<@ofbizUrl>ClearPackAll</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> </form> <form name="incPkgSeq" method="post" action="<@ofbizUrl>SetNextPackageSeq</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> </form> <form name="clearPackLineForm" method="post" action="<@ofbizUrl>ClearPackLine</@ofbizUrl>"> <input type="hidden" name="facilityId"/> @@ -172,7 +172,7 @@ under the License. ${postalAddress.address2} <br /> </#if> - ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} + ${postalAddress.city!}, ${postalAddress.stateProvinceGeoId!} ${postalAddress.postalCode!} <br /> ${postalAddress.countryGeoId!} <br /> @@ -199,7 +199,7 @@ under the License. <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> <br /> <#if shipmentCostEstimateForShipGroup?exists> - <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/> + <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()!/> <br /> </#if> </td> @@ -220,7 +220,7 @@ under the License. <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="hideGrid" value="${hideGrid}"/> <table cellpadding="2" cellspacing="0" class="basic-table"> <tr> @@ -244,14 +244,14 @@ under the License. </#if> <!-- auto grid form --> - <#assign itemInfos = packingSession.getItemInfos()?if_exists> + <#assign itemInfos = packingSession.getItemInfos()!> <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> <br /> <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="orderId" value="${orderId?if_exists}" /> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}" /> - <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="orderId" value="${orderId!}" /> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}" /> + <input type="hidden" name="originFacilityId" value="${facilityId!}" /> <input type="hidden" name="hideGrid" value="${hideGrid}"/> <table class="basic-table" cellspacing='0'> @@ -278,10 +278,10 @@ under the License. <#list itemInfos as itemInfo> <#-- <#list itemInfos as orderItem> --> <#assign orderItem = itemInfo.orderItem/> - <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists> + <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)!> <#assign orderItemQuantity = itemInfo.quantity/> - <#assign orderProduct = orderItem.getRelatedOne("Product", false)?if_exists/> - <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/> + <#assign orderProduct = orderItem.getRelatedOne("Product", false)!/> + <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)!/> <#-- <#if orderItem.cancelQuantity?exists> <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity> @@ -300,9 +300,9 @@ under the License. </#if> </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 align="right">${orderItemQuantity}</td> @@ -346,7 +346,7 @@ under the License. <td align="right"> <input type="text" size="7" name="numPackages_${rowKey}" value="1" /> </td> - <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId?if_exists}"/> + <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId!}"/> <input type="hidden" name="ite_${rowKey}" value="${orderItem.orderItemSeqId}"/> </tr> <#assign rowKey = rowKey + 1> @@ -368,9 +368,9 @@ under the License. <!-- complete form --> <#if showInput != "N"> <form name="completePackForm" method="post" action="<@ofbizUrl>CompletePack</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="forceComplete" value="${forceComplete?default('false')}"/> <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> <input type="hidden" name="showInput" value="N"/> @@ -384,22 +384,22 @@ under the License. <br /> <#list packageSeqIds as packageSeqId> ${uiLabelMap.ProductPackage} ${packageSeqId} - <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}" /> + <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)!}" /> <br /> </#list> <#if orderItemShipGroup?has_content> - <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> - <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId?if_exists}"/> - <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId?if_exists}"/> - <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId?if_exists}"/> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId!}"/> + <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId!}"/> + <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId!}"/> + <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId!}"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> </#if> </td> </#if> <td nowrap="nowrap"> <span class="label">${uiLabelMap.ProductAdditionalShippingCharge}:</span> <br /> - <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> + <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()!}" size="20"/> <#if packageSeqIds?has_content> <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> <br /> @@ -408,7 +408,7 @@ under the License. <td> <span class="label">${uiLabelMap.ProductHandlingInstructions}:</span> <br /> - <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> + <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()!}</textarea> </td> <td align="right"> <div> @@ -428,14 +428,14 @@ under the License. </div> <!-- display items in packages, per packed package and in order --> - <#assign linesByPackageResultMap = packingSession.getPackingSessionLinesByPackage()?if_exists> - <#assign packageMap = linesByPackageResultMap.get("packageMap")?if_exists> - <#assign sortedKeys = linesByPackageResultMap.get("sortedKeys")?if_exists> + <#assign linesByPackageResultMap = packingSession.getPackingSessionLinesByPackage()!> + <#assign packageMap = linesByPackageResultMap.get("packageMap")!> + <#assign sortedKeys = linesByPackageResultMap.get("sortedKeys")!> <#if ((packageMap?has_content) && (sortedKeys?has_content))> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductPackages} : ${sortedKeys.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductPackages} : ${sortedKeys.size()!}</li> </ul> <br class="clear"/> </div> @@ -444,8 +444,8 @@ under the License. <#assign packedLines = packageMap.get(key)> <#if packedLines?has_content> <br /> - <#assign packedLine = packedLines.get(0)?if_exists> - <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()?if_exists}</span> + <#assign packedLine = packedLines.get(0)!> + <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()!}</span> <br /> <table class="basic-table" cellspacing='0'> <tr class="header-row"> @@ -464,11 +464,11 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName!?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> - <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)?if_exists})</td> + <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)!})</td> <td align="right">${line.getPackageSeq()}</td> <td align="right"><a href="javascript:clearLine('${facilityId}', '${line.getOrderId()}', '${line.getOrderItemSeqId()}', '${line.getProductId()?default("")}', '${line.getShipGroupSeqId()}', '${line.getInventoryItemId()}', '${line.getPackageSeq()}')" class="buttontext">${uiLabelMap.CommonClear}</a></td> </tr> @@ -481,12 +481,12 @@ under the License. </#if> <!-- packed items display --> - <#assign packedLines = packingSession.getLines()?if_exists> + <#assign packedLines = packingSession.getLines()!> <#if packedLines?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductItems} (${uiLabelMap.ProductPackages}): ${packedLines.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductItems} (${uiLabelMap.ProductPackages}): ${packedLines.size()!}</li> </ul> <br class="clear"/> </div> @@ -508,11 +508,11 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName!?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> - <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)?if_exists})</td> + <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)!})</td> <td align="right">${line.getPackageSeq()}</td> <td align="right"><a href="javascript:clearLine('${facilityId}', '${line.getOrderId()}', '${line.getOrderItemSeqId()}', '${line.getProductId()?default("")}', '${line.getShipGroupSeqId()}', '${line.getInventoryItemId()}', '${line.getPackageSeq()}')" class="buttontext">${uiLabelMap.CommonClear}</a></td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Sat Aug 16 11:34:57 2014 @@ -20,7 +20,7 @@ under the License. <#escape x as x?xml> <#if hasPermission> - <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup", false)?if_exists> + <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup", false)!> <#assign carrier = (shipGroup.carrierPartyId)?default("N/A")> <#if packages?has_content> <#list packages as package> @@ -54,15 +54,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block> <#if destinationPostalAddress?has_content> - <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName!}</fo:block> <#if destinationPostalAddress.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName!}</fo:block> </#if> - <fo:block>${destinationPostalAddress.address1?if_exists}</fo:block> - <fo:block>${destinationPostalAddress.address2?if_exists}</fo:block> + <fo:block>${destinationPostalAddress.address1!}</fo:block> + <fo:block>${destinationPostalAddress.address2!}</fo:block> <fo:block> - ${destinationPostalAddress.city?if_exists}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> - ${destinationPostalAddress.postalCode?if_exists} ${destinationPostalAddress.countryGeoId?if_exists} + ${destinationPostalAddress.city!}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> + ${destinationPostalAddress.postalCode!} ${destinationPostalAddress.countryGeoId!} </fo:block> </#if> </fo:block> @@ -72,13 +72,13 @@ under the License. <#if carrier != "_NA_"> ${carrier} </#if> - <#if (shipGroup.shipmentMethodTypeId)?exists> + <#if (shipGroup.shipmentMethodTypeId)??> ${(shipGroup.getRelatedOne("ShipmentMethodType", false).get("description", locale))?default(shipGroup.shipmentMethodTypeId)} </#if> </fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> - <fo:block text-align="right">${shipment.handlingInstructions?if_exists}</fo:block> + <fo:block text-align="right">${shipment.handlingInstructions!}</fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> @@ -148,7 +148,7 @@ under the License. <fo:table> <fo:table-column column-width="450pt"/> <fo:table-body> - <#if shipGroup.giftMessage?exists > + <#if shipGroup.giftMessage?? > <fo:table-row font-weight="bold"> <fo:table-cell> <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |