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/12/13 11:55:53 UTC
svn commit: r890044 -
/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl
Author: jleroux
Date: Sun Dec 13 10:55:53 2009
New Revision: 890044
URL: http://svn.apache.org/viewvc?rev=890044&view=rev
Log:
This was a problem for the POS where NO_SHIPPING is used
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=890044&r1=890043&r2=890044&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl Sun Dec 13 10:55:53 2009
@@ -42,7 +42,7 @@
<#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/>
<#assign shipGroupAssoc = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("OrderItemShipGroupAssoc", {"orderId" : orderId}))/>
<#assign shipGroup = delegator.findOne("OrderItemShipGroup", {"orderId" : orderId, "shipGroupSeqId" : shipGroupAssoc.shipGroupSeqId}, false)>
- <#if shipGroup?exists>
+ <#if shipGroup?exists && shipGroup.shipmentMethodTypeId != "NO_SHIPPING">
<#assign shipGroupShipment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment", {"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" : shipGroup.shipGroupSeqId}))/>
<#if shipGroupShipment?exists>
<#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipGroupShipment.shipmentId}))>