svn commit: r1340403 - in /ofbiz/branches/release10.04: ./ applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Author: jleroux
Date: Sat May 19 10:06:51 2012
New Revision: 1340403

URL: http://svn.apache.org/viewvc?rev=1340403&view=rev
Log:
"Applied fix from trunk for revision: 1340400  "
------------------------------------------------------------------------
r1340400 | jleroux | 2012-05-19 12:05:33 +0200 (sam., 19 mai 2012) | 3 lines

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/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1340400

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1340403&r1=1340402&r2=1340403&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat May 19 10:06:51 2012
@@ -248,7 +248,7 @@ under the License.
                             "@" symbol.
                             -->
                             <select name="shipmentMethod">
-                                <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if>&nbsp;${shipmentMethodType.get("description",locale)!}</option>
+                                <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if>&nbsp;${shipmentMethodType.get("description",locale)!}</option>
                                 <#list productStoreShipmentMethList as productStoreShipmentMethod>
                                 <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>
                                 <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>