svn commit: r661003 - /ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r661003 - /ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl

jleroux@apache.org
Author: jleroux
Date: Wed May 28 09:19:51 2008
New Revision: 661003

URL: http://svn.apache.org/viewvc?rev=661003&view=rev
Log:
Fix the issue "After using a split shipment from eCommerce when you try to add a product in a new shipment group you get a bug" (https://issues.apache.org/jira/browse/OFBIZ-1778) - OFBIZ-1778

Modified:
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=661003&r1=661002&r2=661003&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl Wed May 28 09:19:51 2008
@@ -60,13 +60,17 @@
                   <td align="right"><div class="tableheadtext">${uiLabelMap.OrderQuantity} :</div></td>
                   <td><input type="text" class="inputBox" size="6" name="quantity" value="${requestParameters.quantity?default("1")}"/></td>
                 </tr>
-                <tr>
-                  <td align="right"><div class="tableheadtext">${uiLabelMap.OrderShipGroup} :</div></td>
-                  <td><input type="text" class="inputBox" size="6" name="shipGroupSeqId" value="00001"/></td>
-                </tr>
-                <tr>
-                  <td colspan="2">&nbsp;</td>
-                </tr>
+                <#if (shipGroups?size > 1)>
+                  <tr>
+                    <td align="right"><div class="tableheadtext">${uiLabelMap.OrderShipGroup} :</div></td>
+                    <td><select name="shipGroupSeqId">
+                            <#list shipGroups as shipGroup>
+                               <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option>
+                            </#list>
+                            </select>
+                        </td>
+                  </tr>            
+                </#if>              
                 <tr>
                   <td align="right"><div class="tableheadtext">${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
                   <td>