[OFBiz] SVN: r6731 - in trunk/applications/order/webapp/ordermgr/WEB-INF: . actions/return

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-02-14 08:48:35 -0600 (Tue, 14 Feb 2006)
New Revision: 6731

Modified:
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh
   trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
Log:
Changes to return items screens to accomodate separate return adjustment lines

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh	2006-02-14 14:46:28 UTC (rev 6730)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh	2006-02-14 14:48:35 UTC (rev 6731)
@@ -43,6 +43,9 @@
     context.put("party", party);
 }
 
+returnHeaders = delegator.findByAnd("ReturnHeader", UtilMisc.toMap("statusId", "RETURN_REQUESTED"), UtilMisc.toList("entryDate"));
+context.put("returnHeaders", returnHeaders);
+
 // put in the return to party information from the order header
 if (orderId != null) {
     order = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh	2006-02-14 14:46:28 UTC (rev 6730)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh	2006-02-14 14:48:35 UTC (rev 6731)
@@ -44,6 +44,9 @@
 returnItems = delegator.findByAnd("ReturnItem", UtilMisc.toMap("returnId", returnId));
 context.put("returnItems", returnItems);
 
+returnAdjustments = delegator.findByAnd("ReturnAdjustment", UtilMisc.toMap("returnId", returnId), UtilMisc.toList("returnItemSeqId", "returnAdjustmentTypeId"));
+context.put("returnAdjustments", returnAdjustments);
+
 returnTypes = delegator.findAll("ReturnType", UtilMisc.toList("sequenceId"));
 context.put("returnTypes", returnTypes);
 

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml	2006-02-14 14:46:28 UTC (rev 6730)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml	2006-02-14 14:48:35 UTC (rev 6731)
@@ -811,7 +811,23 @@
         <event type="service" invoke="removeReturnItem"/>
         <response name="success" type="view" value="returnitems"/>
     </request-map>
-
+    <request-map uri="createReturnAdjustments">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="createReturnAdjustment"/>
+        <response name="success" type="view" value="returnitems"/>
+    </request-map>
+    <request-map uri="updateReturnAdjustments">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updateReturnItem"/>
+        <response name="success" type="view" value="returnitems"/>
+    </request-map>
+    <request-map uri="removeReturnAdjustment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="removeReturnItem"/>
+        <response name="success" type="view" value="returnitems"/>
+    </request-map>
+    
+    
     <!-- Payment Processor Setup Requests -->
     <request-map uri="paysetup">
         <security https="true" auth="true"/>