Author: jacopoc
Date: Mon Dec 28 14:40:50 2009
New Revision: 894182
URL: http://svn.apache.org/viewvc?rev=894182&view=rev
Log:
Added ability to set multi ship groups also for purchase orders.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=894182&r1=894181&r2=894182&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Mon
Dec 28 14:40:50 2009
@@ -24,9 +24,14 @@
<#if facilityMaps?exists>
<form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>"
name="checkoutsetupform">
<input type="hidden" name="finalizeMode" value="ship"/>
+ <#if (cart.getShipGroupSize() > 1)>
+ <input type="hidden" name="finalizeReqShipGroups" value="true"/>
+ </#if>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class="boxboutside">
<tr>
<td>
+ <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonCreateNew}
${uiLabelMap.OrderShipGroup}</a>
+
<#list 1..cart.getShipGroupSize() as currIndex>
<#assign shipGroupIndex = currIndex - 1>
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=894182&r1=894181&r2=894182&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Mon Dec 28 14:40:50 2009
@@ -604,7 +604,6 @@
<#assign facilities =
facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
<#if facilities?has_content>
<div>
- <a
href="javascript:document.createShipment2_${shipGroup.shipGroupSeqId}.submit()"
class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
<form name="createShipment2_${shipGroup.shipGroupSeqId}"
method="post" action="/facility/control/createShipment">
<input type="hidden" name="primaryOrderId"
value="${orderId}"/>
<input type="hidden" name="primaryShipGroupSeqId"
value="${shipGroup.shipGroupSeqId}"/>
