Author: jleroux
Date: Sat May 19 10:05:33 2012
New Revision: 1340400
URL: http://svn.apache.org/viewvc?rev=1340400&view=rev
Log:
A patch from Sebastian Leitner for "Possible Freemarker error in
ordershippinginfo.ftl" https://issues.apache.org/jira/browse/OFBIZ-4881
If the shipgroup does not have a carrierPartyId (which is the case, if an order
does not need shipping and its shipping method is NA), there is an FTL-error.
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=1340400&r1=1340399&r2=1340400&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Sat May 19 10:05:33 2012
@@ -252,7 +252,7 @@ under the License.
-->
<select name="shipmentMethod">
<#if
shipGroup.shipmentMethodTypeId?has_content>
- <option
value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if
shipGroup.carrierPartyId !=
"_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
+ <option
value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if
shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId !=
"_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
<#else>
<option value=""/>
</#if>
