svn commit: r796695 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

[ashish]

Author: ashish
Date: Wed Jul 22 13:11:49 2009
New Revision: 796695

URL: http://svn.apache.org/viewvc?rev=796695&view=rev
Log:
Minor Fix.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=796695&r1=796694&r2=796695&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
Wed Jul 22 13:11:49 2009
@@ -567,7 +567,7 @@
                     <div>
                         ${uiLabelMap.CommonNbr}<a 
href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${shipment.shipmentId}</a>&nbsp;&nbsp;
                         <#assign shipmentRoutSegment = 
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment",
 {"shipmentId":shipment.shipmentId}))>
-                        <#if "UPS" == shipmentRoutSegment.carrierPartyId && 
"ORDER_COMPLETED" == orderHeader.statusId>
+                        <#if "UPS" == 
shipmentRoutSegment.carrierPartyId?if_exists && "ORDER_COMPLETED" == 
orderHeader.statusId>
                             <a 
href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" 
class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
                         </#if>
                         <a 
href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${uiLabelMap.ProductPackingSlip}</a>