svn commit: r512870 - /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: r512870 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

sichen
Author: sichen
Date: Wed Feb 28 09:48:49 2007
New Revision: 512870

URL: http://svn.apache.org/viewvc?view=rev&rev=512870
Log:
Disable updating of shipping method for purchase orders.  OFBIZ-365

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?view=diff&rev=512870&r1=512869&r2=512870
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Feb 28 09:48:49 2007
@@ -61,8 +61,9 @@
                 </tr>
                 </#if>
                 
-                <#if shipGroup.shipmentMethodTypeId?has_content>
-                <tr>
+                <#-- the setting of shipping method is only supported for sales orders at this time -->
+                <#if orderHeader.orderTypeId == "SALES_ORDER" && shipGroup.shipmentMethodTypeId?has_content>
+                  <tr>
                     <td align="right" valign="top" width="15%">
                         <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonMethod}</b></div>
                     </td>