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

[jonesde]

Author: jonesde
Date: Tue Jun 22 12:03:59 2010
New Revision: 956858

URL: http://svn.apache.org/viewvc?rev=956858&view=rev
Log:
Small change to not blow up if orderHeader.salesChannelEnumId is not set in the order manager order detail screen

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=956858&r1=956857&r2=956858&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jun 22 12:03:59 2010
@@ -48,7 +48,7 @@ under the License.
     }
 </script>
 
-<#if (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)) && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
+<#if (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)) && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
   <div class="screenlet">
     <div class="screenlet-title-bar">
       <ul><li class="h3">&nbsp;${uiLabelMap.OrderActions}</li></ul>
@@ -183,7 +183,7 @@ under the License.
   </div>
 </#if>
 
-<#if shipGroups?has_content && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
+<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
 <#list shipGroups as shipGroup>
   <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists>
   <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>