svn commit: r1618336 [20/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [20/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Sat Aug 16 11:34:57 2014 @@ -24,7 +24,7 @@ function setWeight(weight) { </script> <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> - <h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1> + <h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName!} [${uiLabelMap.CommonId}:${facilityId!}]</h1> <div class="button-bar"> <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNextShipment}</a> <#if shipment?has_content> @@ -32,26 +32,26 @@ function setWeight(weight) { </#if> </div> - <#if shipment?exists> + <#if shipment??> <#if 1 < shipmentPackages.size()> <#-- multiple packages --> <div><font color="red">${uiLabelMap.ProductMorePackageFoundShipment}.</font></div> <#else> <#-- single package --> - <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))?if_exists> + <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))!> <#if shipmentPackage?has_content> <#assign weight = (shipmentPackage.weight)?default(0.00)> - <#if (0 < weight?double) && !requestParameters.reweigh?exists> + <#if (0 < weight?double) && !requestParameters.reweigh??> <#if 1 < shipmentRoutes.size()> <#-- multiple routes --> <div><font color="red">${uiLabelMap.ProductMoreRouteSegmentFound}.</font></div> - <#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists> + <#elseif !requestParameters.shipmentRouteSegmentId?? || requestAttributes._ERROR_MESSAGE_??> <form name="routeForm" method="post" action="<@ofbizUrl>setQuickRouteInfo</@ofbizUrl>"> - <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists> - <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson", false))?if_exists> - <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup", false))?if_exists> - <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType", false))?if_exists> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))!> + <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson", false))!> + <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup", false))!> + <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType", false))!> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="shipmentId" value="${shipmentRoute.shipmentId}"/> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRoute.shipmentRouteSegmentId}"/> <table border="0" cellpadding="2" cellspacing="0"> @@ -61,13 +61,13 @@ function setWeight(weight) { <td width="1%" nowrap="nowrap"> <select name="carrierPartyId"> <#if shipmentRoute.carrierPartyId?has_content> - <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRoute.carrierPartyId}]</option> + <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${shipmentRoute.carrierPartyId}]</option> <option value="${shipmentRoute.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> </td> @@ -123,8 +123,8 @@ function setWeight(weight) { </#if> <#else> <form name="weightForm" method="post" action="<@ofbizUrl>setQuickPackageWeight</@ofbizUrl>"> - <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)?if_exists> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)!> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="shipmentId" value="${shipmentPackage.shipmentId}"/> <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> <table cellspacing="0" class="basic-table"> @@ -176,15 +176,15 @@ function setWeight(weight) { </#if> <#else> <form name="selectOrderForm" method="post" action="<@ofbizUrl>createQuickShipment</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="originFacilityId" value="${facilityId!}" /> <input type="hidden" name="setPackedOnly" value="Y" /> <table border='0' cellpadding='2' cellspacing='0'> <tr> <td width="25%" align='right'><span class="label">${uiLabelMap.ProductOrderNumber}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}" /> + <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId!}" /> </td> <td> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.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??> <#-- JS to populate the quantity_o_# field required by the chained issueOrderItemToShipment service --> <script type="text/javascript"> @@ -31,7 +31,7 @@ under the License. } </script> - <#assign productId = parameters.productId?if_exists/> + <#assign productId = parameters.productId!/> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -45,26 +45,26 @@ under the License. <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorShipmentNotPurchaseShipment?interpret><@uiLabelWithVar/> </div> - <#elseif orderId?has_content && !orderHeader?exists> + <#elseif orderId?has_content && !orderHeader??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/> </div> - <#elseif orderHeader?exists && orderHeader.orderTypeId != "PURCHASE_ORDER"> + <#elseif orderHeader?? && orderHeader.orderTypeId != "PURCHASE_ORDER"> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderNotPurchaseOrder?interpret><@uiLabelWithVar/> </div> - <#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?exists> + <#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> - <#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?exists> + <#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> </#if> - <#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?exists> + <#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder??> <div class="errorMessage" style="color:green"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> @@ -75,21 +75,21 @@ under the License. <form name="ReceiveInventoryAgainstPurchaseOrder" action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>"> <input type="hidden" name="clearAll" value="Y"/> <div> - <span class="label">${uiLabelMap.ProductShipmentId}</span> <input type="text" size="20" name="shipmentId" value="${shipmentId?if_exists}"/> + <span class="label">${uiLabelMap.ProductShipmentId}</span> <input type="text" size="20" name="shipmentId" value="${shipmentId!}"/> <span class="label">${uiLabelMap.ProductOrderId}</span> <span> - <@htmlTemplate.lookupField value="${orderId?if_exists}" formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> + <@htmlTemplate.lookupField value="${orderId!}" formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> </span> - <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/> </div> </form> -<#if shipment?exists> +<#if shipment??> <#if isPurchaseShipment> <#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/> - <#if orderItemDatas?exists> + <#if orderItemDatas??> <br /> <#assign rowCount = 0> <#assign totalReadyToReceive = 0/> @@ -119,22 +119,22 @@ under the License. </#if> </tr> <#assign alt_row = false> - <#list orderItemDatas?if_exists as orderItemData> + <#list orderItemDatas! as orderItemData> <#assign orderItem = orderItemData.orderItem> - <#assign product = orderItemData.product?if_exists> - <#assign itemShipGroupSeqId = orderItemData.shipGroupSeqId?if_exists> + <#assign product = orderItemData.product!> + <#assign itemShipGroupSeqId = orderItemData.shipGroupSeqId!> <#assign totalQuantityReceived = orderItemData.totalQuantityReceived?default(0)> <#assign availableToReceive = orderItemData.availableToReceive?default(0)> <#assign backOrderedQuantity = orderItemData.backOrderedQuantity?default(0)> <#assign fulfilledReservations = orderItemData.fulfilledReservations> <tr id="orderItemData_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td>${(product.internalName)?if_exists} [${orderItem.productId?default("N/A")}]</div></td> + <td>${(product.internalName)!} [${orderItem.productId?default("N/A")}]</div></td> <td> <div> <#assign upcaLookup = Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", product.productId, "goodIdentificationTypeId", "UPCA")/> - <#assign upca = delegator.findOne("GoodIdentification", upcaLookup, true)?if_exists/> + <#assign upca = delegator.findOne("GoodIdentification", upcaLookup, true)!/> <#if upca?has_content> - ${upca.idValue?if_exists} + ${upca.idValue!} </#if> </div> </td> @@ -158,20 +158,20 @@ under the License. </td> <#if availableToReceive > 0 > <td> - <input type="hidden" name="productId_o_${rowCount}" value="${(product.productId)?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="shipmentId_o_${rowCount}" value="${shipmentId}"/> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> - <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${itemShipGroupSeqId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${itemShipGroupSeqId!}"/> <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> <input type="hidden" name="unitCost_o_${rowCount}" value="${orderItem.unitPrice?default(0)}"/> <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?default("")}"/> - <input type="hidden" name="ownerPartyId_o_${rowCount}" value="${(facility.ownerPartyId)?if_exists}"/> + <input type="hidden" name="ownerPartyId_o_${rowCount}" value="${(facility.ownerPartyId)!}"/> <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"/> <input type="hidden" name="quantityRejected_o_${rowCount}" value="0"/> <#-- quantity field required by the chained issueOrderItemToShipment service --> <input type="hidden" name="quantity_o_${rowCount}" id="quantity_o_${rowCount}" value=""/> - <#if itemQuantitiesToReceive?exists && itemQuantitiesToReceive.get(orderItem.orderItemSeqId)?exists> + <#if itemQuantitiesToReceive?? && itemQuantitiesToReceive.get(orderItem.orderItemSeqId)??> <#assign quantityToReceive = itemQuantitiesToReceive.get(orderItem.orderItemSeqId)> <#else> <#assign quantityToReceive = 0> @@ -243,5 +243,5 @@ under the License. </div> </div> <#elseif parameters.shipmentId?has_content> - <h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</h3> + <h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId!}]</h3> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Sat Aug 16 11:34:57 2014 @@ -36,11 +36,11 @@ under the License. <fo:block>${uiLabelMap.ProductRouteSegment}: ${shipmentRouteSegment.shipmentRouteSegmentId}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="#D4D0C8"> - <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty", false)?if_exists> + <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty", false)!> <fo:block text-align="center">${uiLabelMap.ProductCarrier}: <#if carrierParty.description?has_content>${carrierParty.description}<#else>${carrierParty.partyId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="#D4D0C8"> - <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false)?if_exists> + <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false)!> <fo:block text-align="right">${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA}</#if></fo:block> </fo:table-cell> </fo:table-row> @@ -50,15 +50,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block> <#if originPostalAddress?has_content> - <fo:block>${uiLabelMap.CommonFrom}: ${originPostalAddress.toName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonFrom}: ${originPostalAddress.toName!}</fo:block> <#if originPostalAddress.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName!}</fo:block> </#if> - <fo:block>${originPostalAddress.address1?if_exists}</fo:block> - <fo:block>${originPostalAddress.address2?if_exists}</fo:block> + <fo:block>${originPostalAddress.address1!}</fo:block> + <fo:block>${originPostalAddress.address2!}</fo:block> <fo:block> - ${originPostalAddress.city?if_exists}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId}</#if> - ${originPostalAddress.postalCode?if_exists} ${originPostalAddress.countryGeoId?if_exists} + ${originPostalAddress.city!}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId}</#if> + ${originPostalAddress.postalCode!} ${originPostalAddress.countryGeoId!} </fo:block> </#if> </fo:block> @@ -66,15 +66,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block text-align="center"> <#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> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.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 requestAttributes.uiLabelMap?exists> +<#if requestAttributes.uiLabelMap??> <#assign uiLabelMap = requestAttributes.uiLabelMap> </#if> <#assign selected = tabButtonItem?default("void")> @@ -25,17 +25,17 @@ under the License. <ul> <li<#if selected="ViewShipment"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li> <li<#if selected="EditShipment"> class="selected"</#if>><a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId = "PURCHASE_RETURN"> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId = "PURCHASE_RETURN"> <li<#if selected="AddItemsFromInventory"> class="selected"</#if>><a href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> </#if> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId = "SALES_SHIPMENT"> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId = "SALES_SHIPMENT"> <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li> <li<#if selected="AddItemsFromOrder"> class="selected"</#if>><a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> <li<#if selected="EditShipmentItems"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li> <li<#if selected="EditShipmentPackages"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li> <li<#if selected="EditShipmentRouteSegments"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li> </#if> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT'> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId='PURCHASE_SHIPMENT'> <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductVerify} ${uiLabelMap.OrderOrder} ${uiLabelMap.CommonIn} ${facility.facilityName?if_exists} [${facility.facilityId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductVerify} ${uiLabelMap.OrderOrder} ${uiLabelMap.CommonIn} ${facility.facilityName!} [${facility.facilityId!}]</li> </ul> <br class="clear"/> </div> @@ -33,7 +33,7 @@ under the License. <div> <span class="label">${uiLabelMap.ProductShipmentId}</span><a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> </div> - <#if invoiceIds?exists && invoiceIds?has_content> + <#if invoiceIds?? && invoiceIds?has_content> <div> <span class="label">${uiLabelMap.AccountingInvoices}:</span> <ul> @@ -50,7 +50,7 @@ under the License. <br /> <div class="screenlet-body"> <form name="selectOrderForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> @@ -59,7 +59,7 @@ under the License. <#if shipmentId?has_content> <input type="text" name="orderId" size="20" maxlength="20" value=""/> <#else> - <input type="text" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> + <input type="text" name="orderId" size="20" maxlength="20" value="${orderId!}"/> </#if> / <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> @@ -77,13 +77,13 @@ under the License. <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.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> </td> </tr> @@ -96,13 +96,13 @@ under the License. </table> </form> <form name="clearPickForm" method="post" action="<@ofbizUrl>cancelAllRows</@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="${facility.facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> </form> </div> </div> - <#if showInput != "N" && orderHeader?exists && orderHeader?has_content> + <#if showInput != "N" && orderHeader?? && orderHeader?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -131,7 +131,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 /> @@ -164,9 +164,9 @@ under the License. </#if> <hr /> <form name="singlePickForm" method="post" action="<@ofbizUrl>processVerifyPick</@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="${facility.facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> <table cellpadding="2" cellspacing="0" class="basic-table"> <tr> <td> @@ -182,12 +182,12 @@ under the License. </table> </form> <br /> - <#assign orderItems = orderItems?if_exists> + <#assign orderItems = orderItems!> <form name="multiPickForm" method="post" action="<@ofbizUrl>processBulkVerifyPick</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> - <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> + <input type="hidden" name="userLoginId" value="${userLoginId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td> </td> @@ -204,7 +204,7 @@ under the License. <#assign counter = 1> <#assign isShowVerifyItemButton = "false"> <#list orderItems as orderItem> - <#assign orderItemSeqId = orderItem.orderItemSeqId?if_exists> + <#assign orderItemSeqId = orderItem.orderItemSeqId!> <#assign readyToVerify = verifyPickSession.getReadyToVerifyQuantity(orderId,orderItemSeqId)> <#assign orderItemQuantity = orderItem.getBigDecimal("quantity")> <#assign verifiedQuantity = 0.000000> @@ -223,7 +223,7 @@ under the License. <#assign counter = counter +1> </#if> <#assign orderItemQuantity = orderItemQuantity.subtract(verifiedQuantity)> - <#assign product = orderItem.getRelatedOne("Product", false)?if_exists/> + <#assign product = orderItem.getRelatedOne("Product", false)!/> <tr> <#if (orderItemQuantity.compareTo(readyToVerify) > 0) > <td><input type="checkbox" name="sel_${rowKey}" value="Y" checked=""/></td> @@ -231,35 +231,35 @@ under the License. <#else> <td> </td> </#if> - <td>${orderItemSeqId?if_exists}</td> + <td>${orderItemSeqId!}</td> <td>${product.productId?default("N/A")}</td> <td> - <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> </td> <td> <select name="geo_${rowKey}"> <#if product.originGeoId?has_content> <#assign originGeoId = product.originGeoId> <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", originGeoId), true)> - <option value="${originGeoId}">${geo.geoName?if_exists}</option> + <option value="${originGeoId}">${geo.geoName!}</option> <option value="${originGeoId}">---</option> </#if> <option value=""></option> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> </td> - <td align="right">${orderItemQuantity?if_exists}</td> - <td align="right">${readyToVerify?if_exists}</td> + <td align="right">${orderItemQuantity!}</td> + <td align="right">${readyToVerify!}</td> <td align="center"> <#if (orderItemQuantity.compareTo(readyToVerify) > 0)> <#assign qtyToVerify = orderItemQuantity.subtract(readyToVerify) > - <input type="text" size="7" name="qty_${rowKey}" value="${qtyToVerify?if_exists}"/> + <input type="text" size="7" name="qty_${rowKey}" value="${qtyToVerify!}"/> <#else> 0 </#if> </td> - <input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)?if_exists}"/> - <input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)?if_exists}"/> + <input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)!}"/> + <input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)!}"/> </tr> <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)/> <#if workOrderItemFulfillments?has_content> @@ -283,9 +283,9 @@ under the License. <tr> <td colspan="2"></td> <td>${product.productId?default("N/A")}</td> - <td>${product.internalName?if_exists}</td> + <td>${product.internalName!}</td> <td></td> - <td align="right">${workEffortInventoryAssign.quantity?if_exists}</td> + <td align="right">${workEffortInventoryAssign.quantity!}</td> </tr> </#list> <tr><td colspan="8"><hr /></td></tr> @@ -316,18 +316,18 @@ under the License. <br /> </div> </div> - <#assign orderId = orderId?if_exists > - <#assign pickRows = verifyPickSession.getPickRows(orderId)?if_exists> + <#assign orderId = orderId! > + <#assign pickRows = verifyPickSession.getPickRows(orderId)!> <form name="completePickForm" method="post" action="<@ofbizUrl>completeVerifiedPick</@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="${facility.facilityId?if_exists}"/> - <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> + <input type="hidden" name="userLoginId" value="${userLoginId!}"/> <#if pickRows?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductVerified} ${uiLabelMap.OrderItems} : ${pickRows.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductVerified} ${uiLabelMap.OrderItems} : ${pickRows.size()!}</li> </ul> <br class="clear"/> </div> @@ -341,12 +341,12 @@ under the License. <td> </td> </tr> <#list pickRows as pickRow> - <#if (pickRow.getOrderId()?if_exists).equals(orderId)> + <#if (pickRow.getOrderId()!).equals(orderId)> <tr> - <td>${pickRow.getOrderItemSeqId()?if_exists}</td> - <td>${pickRow.getProductId()?if_exists}</td> - <td>${pickRow.getInventoryItemId()?if_exists}</td> - <td align="right">${pickRow.getReadyToVerifyQty()?if_exists}</td> + <td>${pickRow.getOrderItemSeqId()!}</td> + <td>${pickRow.getProductId()!}</td> + <td>${pickRow.getInventoryItemId()!}</td> + <td align="right">${pickRow.getReadyToVerifyQty()!}</td> </tr> </#if> </#list> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.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> @@ -32,94 +32,94 @@ under the License. </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> - <td width="80%">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</td> + <td width="80%">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId!)}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonStatus}</td> - <td width="80%">${(statusItem.get("description",locale))?default(shipment.statusId?if_exists)}</td> + <td width="80%">${(statusItem.get("description",locale))?default(shipment.statusId!)}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryOrderId}</td> - <td width="80%"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td> + <td width="80%"><#if shipment.primaryOrderId??><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryReturnId}</td> - <td width="80%"><#if shipment.primaryReturnId?exists><a href="/ordermgr/control/returnMain?returnId=${shipment.primaryReturnId}" class="buttontext">${shipment.primaryReturnId}</a></#if></td> + <td width="80%"><#if shipment.primaryReturnId??><a href="/ordermgr/control/returnMain?returnId=${shipment.primaryReturnId}" class="buttontext">${shipment.primaryReturnId}</a></#if></td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</td> - <td width="80%">${shipment.primaryShipGroupSeqId?if_exists}</td> + <td width="80%">${shipment.primaryShipGroupSeqId!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedDates}</td> <td width="80%"> <span> - <span>${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())?if_exists} - <span>${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())?if_exists} - <span>${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())?if_exists} + <span>${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())!} + <span>${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())!} + <span>${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())!} </span> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductLatestCancelDate}</td> - <td width="80%">${(shipment.latestCancelDate.toString())?if_exists}</td> + <td width="80%">${(shipment.latestCancelDate.toString())!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedShipCost}</td> - <td width="80%">${(shipment.estimatedShipCost)?if_exists}</td> + <td width="80%">${(shipment.estimatedShipCost)!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductAdditionalShippingCharge}</td> <td width="80%"> - <#if shipment.additionalShippingCharge?exists> - <@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId?if_exists /> + <#if shipment.additionalShippingCharge??> + <@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId! /> </#if> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductHandlingInstructions}</td> - <td width="80%">${shipment.handlingInstructions?if_exists}</td> + <td width="80%">${shipment.handlingInstructions!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductFacilities}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]</div> - <div>${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]</div> + <div>${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)!} [${(shipment.originFacilityId!)}]</div> + <div>${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)!} [${(shipment.destinationFacilityId!)}]</div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.PartyParties}</td> <td width="80%"> <span> - <span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)?if_exists} ${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists} ${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}]</span> - <span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)?if_exists} ${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists} ${(fromPartyGroup.groupName)?if_exists} [${shipment.partyIdFrom?if_exists}]</span> + <span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)!} ${(toPerson.middleName)!} ${(toPerson.lastName)!} ${(toPartyGroup.groupName)!} [${shipment.partyIdTo!}]</span> + <span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)!} ${(fromPerson.middleName)!} ${(fromPerson.lastName)!} ${(fromPartyGroup.groupName)!} [${shipment.partyIdFrom!}]</span> </span> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductAddresses}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${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}]</#if></div> - <div>${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]</#if></div> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId!} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId!} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName!}, ${destinationPostalAddress.address1!}, ${destinationPostalAddress.address2!}, ${destinationPostalAddress.city!}, ${destinationPostalAddress.stateProvinceGeoId!}, ${destinationPostalAddress.postalCode!}, ${destinationPostalAddress.countryGeoId!}]</#if></div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPhoneNumbers}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if></div> - <div>${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]</#if></div> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId!} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId!} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode!} ${destinationTelecomNumber.areaCode!} ${destinationTelecomNumber.contactNumber!}]</#if></div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonCreated}</td> <td width="80%"> - <div>${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}</div> + <div>${uiLabelMap.CommonBy} [${shipment.createdByUserLogin!}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())!}</div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonLastUpdated}</td> <td width="80%"> - <div>${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}</div> + <div>${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin!}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())!}</div> </td> </tr> </table> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl Sat Aug 16 11:34:57 2014 @@ -34,19 +34,19 @@ 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!> <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> </tr> <#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}&externalLoginKey=${requestAttributes.externalLoginKey}" 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!}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId!}</a>${orderShipment.orderItemSeqId!}</td> <td> </td> - <td>${orderShipment.quantity?if_exists}</td> + <td>${orderShipment.quantity!}</td> <td> </td> <td> </td> </tr> @@ -54,10 +54,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}&externalLoginKey=${requestAttributes.externalLoginKey}" 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!}&externalLoginKey=${requestAttributes.externalLoginKey}" 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> </tr> </#list> @@ -65,7 +65,7 @@ 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> <td colspan="2"> </td> </tr> </#list> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl Sat Aug 16 11:34:57 2014 @@ -29,20 +29,20 @@ 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!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentPackage.shipmentPackageSeqId}</td> - <td>${(shipmentPackage.dateCreated.toString())?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductWeight}</span> ${shipmentPackage.weight?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}</#if></td> + <td>${(shipmentPackage.dateCreated.toString())!}</td> + <td><span class="label">${uiLabelMap.ProductWeight}</span> ${shipmentPackage.weight!}</td> + <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId!}</#if></td> </tr> <#list shipmentPackageContents as shipmentPackageContent> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductItem}</span> ${shipmentPackageContent.shipmentItemSeqId}</td> - <td><span class="label">${uiLabelMap.ProductQuantity}</span> ${shipmentPackageContent.quantity?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductQuantity}</span> ${shipmentPackageContent.quantity!}</td> <td> </td> </tr> </#list> @@ -50,8 +50,8 @@ 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.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode!}</td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber!}</td> </tr> </#list> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl Sat Aug 16 11:34:57 2014 @@ -46,53 +46,53 @@ 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!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentRouteSegment.shipmentRouteSegmentId}</td> <td> - <span>${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> - <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> + <span>${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${shipmentRouteSegment.carrierPartyId!}]</span> + <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId!)}</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span>${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> + <span>${(originFacility.facilityName)!} [${originFacility.facilityId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span>${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> + <span>${(destFacility.facilityName)!} [${destFacility.facilityId!}]</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span><#if originPostalAddress?has_content>${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}</#if> [${shipmentRouteSegment.originContactMechId?if_exists}]</span> + <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}</#if> [${shipmentRouteSegment.originContactMechId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span><#if destPostalAddress?has_content>${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}</#if> [${shipmentRouteSegment.destContactMechId?if_exists}]</span> + <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName!}, ${destPostalAddress.address1!}, ${destPostalAddress.address2!}, ${destPostalAddress.city!}, ${destPostalAddress.stateProvinceGeoId!}, ${destPostalAddress.postalCode!}, ${destPostalAddress.countryGeoId!}</#if> [${shipmentRouteSegment.destContactMechId!}]</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.originTelecomNumberId?if_exists}]</span> + <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}</#if> [${shipmentRouteSegment.originTelecomNumberId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.destTelecomNumberId?if_exists}]</span> + <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode!} ${destTelecomNumber.areaCode!} ${destTelecomNumber.contactNumber!}</#if> [${shipmentRouteSegment.destTelecomNumberId!}]</span> <br /> </td> <td> <div>${(carrierServiceStatus.description)?default(" ")}</div> <div>${shipmentRouteSegment.trackingIdNumber?default(" ")}</div> - <div>${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}</div> - <div>${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}</div> + <div>${(shipmentRouteSegment.estimatedStartDate.toString())!} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())!}</div> + <div>${(shipmentRouteSegment.actualStartDate.toString())!} - ${(shipmentRouteSegment.actualArrivalDate.toString())!}</div> </td> <td> - <div>${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div> + <div>${shipmentRouteSegment.billingWeight!} ${(billingWeightUom.get("description",locale))!} [${(billingWeightUom.abbreviation)!}]</div> <div>${(currencyUom.get("description",locale))?default(" ")}</div> <div>${(shipmentRouteSegment.actualTransportCost)?default(" ")}</div> <div>${(shipmentRouteSegment.actualServiceCost)?default(" ")}</div> @@ -104,8 +104,8 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId}</td> - <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode!}</td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber!}</td> </tr> </#list> <#-- toggle the row color --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |