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

Author: jleroux
Date: Wed Jul  9 13:32:53 2014
New Revision: 1609147

URL: http://svn.apache.org/r1609147
Log:
Reverts the change in r1608517, better to add a "no shipping" method in product store
Keeps the indentations

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=1609147&r1=1609146&r2=1609147&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Jul  9 13:32:53 2014
@@ -253,8 +253,6 @@ under the License.
                             <select name="shipmentMethod">
                                 <#if shipGroup.shipmentMethodTypeId?has_content>
                                   <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if>&nbsp;${shipmentMethodType.get("description",locale)!}</option>
-                                <#else>
-                                  <option value="NO_SHIPPING@_NA_@CARRIER">&nbsp;No Shipping</option>
                                 </#if>
                                 <#list productStoreShipmentMethList as productStoreShipmentMethod>
                                   <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>