Author: jonesde
Date: Wed Jul 25 17:22:10 2007
New Revision: 559659
URL:
http://svn.apache.org/viewvc?view=rev&rev=559659Log:
Small change to support fulfillment partner selecting carrier based on service level (shipment method)
Modified:
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?view=diff&rev=559659&r1=559658&r2=559659==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Wed Jul 25 17:22:10 2007
@@ -47,8 +47,9 @@
<of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
<#if shipperId?has_content>
<of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
+ <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc -->
+ <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
</#if>
- <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
<#if shipperId?has_content>
<of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
<#else>