svn commit: r465443 - in /incubator/ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/controller.xml order/editorderitems.ftl

[sichen]

Author: sichen
Date: Wed Oct 18 18:44:12 2006
New Revision: 465443

URL: http://svn.apache.org/viewvc?view=rev&rev=465443
Log:
Allow specifying ship group when creating order adjustments in editorderitems.  Force a recalcOrderTax after createOrderAdjustment so that new adjustments get taxed correctly.  Fixes bug where new shipping adjustments are not taxed correctly.

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=465443&r1=465442&r2=465443
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Oct 18 18:44:12 2006
@@ -222,7 +222,7 @@
     <request-map uri="createOrderAdjustment">
         <security https="true" auth="true"/>
         <event type="service" invoke="createOrderAdjustment"/>
-        <response name="success" type="view" value="editorderitems"/>
+        <response name="success" type="request" value="recalcTax"/>
         <response name="error" type="view" value="editorderitems"/>
     </request-map>
     <request-map uri="updateOrderAdjustment">
@@ -234,6 +234,12 @@
     <request-map uri="deleteOrderAdjustment">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteOrderAdjustment"/>
+        <response name="success" type="view" value="editorderitems"/>
+        <response name="error" type="view" value="editorderitems"/>
+    </request-map>
+    <request-map uri="recalcTax">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="recalcTaxTotal"/>
         <response name="success" type="view" value="editorderitems"/>
         <response name="error" type="view" value="editorderitems"/>
     </request-map>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=465443&r1=465442&r2=465443
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Wed Oct 18 18:44:12 2006
@@ -252,6 +252,12 @@
                          <option value="${type.orderAdjustmentTypeId}">${type.get("description",locale)?default(type.orderAdjustmentTypeId)}</option>
                     </#list>
                   </select>
+                  <select name="shipGroupSeqId" class="selectBox">
+                    <option value="_NA_"></option>
+                    <#list shipGroups as shipGroup>
+                    <option value="${shipGroup.shipGroupSeqId}">${uiLabelMap.OrderShipGroup} ${shipGroup.shipGroupSeqId}</option>
+                    </#list>
+                  </select>
                 </td>
                 <td align="left"><div class="tabletext"><input type="text" name="description" value="" size="30" maxlength="60" class="inputBox"></div></td>
                 <td  align="left">