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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

mor-2
Author: mor
Date: Fri Aug 14 14:58:06 2009
New Revision: 804247

URL: http://svn.apache.org/viewvc?rev=804247&view=rev
Log:
Formatting changes only.

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=804247&r1=804246&r2=804247&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Aug 14 14:58:06 2009
@@ -557,15 +557,15 @@
                       <#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId>
                         <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId})>
                         <#if shipmentRouteSegments?has_content>
-                        <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)>
-                        <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists>
-                          <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
-                        </#if>
-                        <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>">
-                          <input type="hidden" name="orderId" value="${orderId}"/>
-                          <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/>
-                          <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}>
-                        </form>
+                          <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)>
+                          <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists>
+                            <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
+                          </#if>
+                          <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>">
+                            <input type="hidden" name="orderId" value="${orderId}"/>
+                            <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/>
+                            <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}>
+                          </form>
                         </#if>
                       </#if>
                     </div>