You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/01/31 15:23:59 UTC
svn commit: r739561 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: jleroux
Date: Sat Jan 31 14:23:58 2009
New Revision: 739561
URL: http://svn.apache.org/viewvc?rev=739561&view=rev
Log:
Fix bugs for POS orders, anyway this does not make sense for POS order
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=739561&r1=739560&r2=739561&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat Jan 31 14:23:58 2009
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)>
+<#if (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)) && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
<div class="screenlet">
<div class="screenlet-title-bar">
<ul><li class="h3"> ${uiLabelMap.OrderActions}</li></ul>
@@ -88,7 +88,7 @@
</div>
</#if>
-<#if shipGroups?has_content>
+<#if shipGroups?has_content && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
<#list shipGroups as shipGroup>
<#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists>
<#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>