svn commit: r770148 - in /ofbiz/trunk/applications/order: script/org/ofbiz/order/order/OrderReturnServices.xml servicedef/secas.xml servicedef/services_return.xml

[mor-2]

Author: mor
Date: Thu Apr 30 10:24:22 2009
New Revision: 770148

URL: http://svn.apache.org/viewvc?rev=770148&view=rev
Log:
Changed currentStatusId --> oldStatusId, as this was actually old status and not current status.

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
    ofbiz/trunk/applications/order/servicedef/secas.xml
    ofbiz/trunk/applications/order/servicedef/services_return.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=770148&r1=770147&r2=770148&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Thu Apr 30 10:24:22 2009
@@ -245,7 +245,7 @@
             <check-errors/>
         </if-compare>
 
-        <field-to-result field="returnHeader.statusId" result-name="currentStatusId"/>
+        <field-to-result field="returnHeader.statusId" result-name="oldStatusId"/>
         <set-nonpk-fields map="parameters" value-field="returnHeader"/>
         <store-value value-field="returnHeader"/>
     </simple-method>
@@ -414,7 +414,7 @@
         <find-by-primary-key entity-name="ReturnItem" map="lookupPKMap" value-field="returnItem"/>
         <set field="originalReturnPrice" from-field="returnItem.returnPrice"/>
         <set field="originalReturnQuantity" from-field="returnItem.returnQuantity"/>
-        <field-to-result field="returnItem.statusId" result-name="currentStatusId"/>
+        <field-to-result field="returnItem.statusId" result-name="oldStatusId"/>
 
         <set-nonpk-fields map="parameters" value-field="returnItem"/>
         <store-value value-field="returnItem"/>

Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=770148&r1=770147&r2=770148&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Thu Apr 30 10:24:22 2009
@@ -184,7 +184,7 @@
     </eca>
     <eca service="updateReturnHeader" event="commit">
         <condition field-name="statusId" operator="equals" value="RETURN_ACCEPTED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="RETURN_ACCEPTED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="RETURN_ACCEPTED"/>
         <action service="processWaitReplacementReservedReturn" mode="sync"/>
         <action service="createShipmentAndItemsForReturn" mode="sync"/>
         <action service="processCrossShipReplacementReturn" mode="sync"/>
@@ -194,7 +194,7 @@
 
     <eca service="updateReturnHeader" event="commit">
         <condition field-name="statusId" operator="equals" value="RETURN_RECEIVED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="RETURN_RECEIVED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="RETURN_RECEIVED"/>
         <action service="processWaitReplacementReturn" mode="sync"/>
         <action service="processWaitReplacementReservedReturn" mode="sync"/>
         <action service="processRepairReplacementReturn" mode="sync"/>
@@ -211,25 +211,25 @@
 
     <eca service="updateReturnHeader" event="commit">
         <condition field-name="statusId" operator="equals" value="RETURN_COMPLETED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="RETURN_COMPLETED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="RETURN_COMPLETED"/>
         <action service="sendReturnCompleteNotification" mode="async" persist="true"/>
         <action service="processSubscriptionReturn" mode="sync"/>
     </eca>
     <eca service="updateReturnHeader" event="commit">
         <condition field-name="statusId" operator="equals" value="RETURN_CANCELLED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="RETURN_CANCELLED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="RETURN_CANCELLED"/>
         <action service="cancelReturnItems" mode="sync"/>
         <action service="sendReturnCancelNotification" mode="async" persist="true"/>
     </eca>
     <eca service="updateReturnHeader" event="commit">
         <condition field-name="statusId" operator="equals" value="SUP_RETURN_SHIPPED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="SUP_RETURN_SHIPPED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="SUP_RETURN_SHIPPED"/>
         <action service="processWaitReplacementReturn" mode="sync"/>
     </eca>
 
     <eca service="updateReturnItem" event="commit">
         <condition field-name="statusId" operator="equals" value="RETURN_CANCELLED"/>
-        <condition field-name="currentStatusId" operator="not-equals" value="RETURN_CANCELLED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="RETURN_CANCELLED"/>
         <action service="cancelReplacementOrderItems" mode="sync"/>
     </eca>
 

Modified: ofbiz/trunk/applications/order/servicedef/services_return.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_return.xml?rev=770148&r1=770147&r2=770148&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_return.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_return.xml Thu Apr 30 10:24:22 2009
@@ -47,7 +47,7 @@
         <description>Update a ReturnHeader</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <attribute name="currentStatusId" type="String" mode="OUT" optional="false"/>
+        <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="createReturnItemBilling" engine="simple" default-entity-name="ReturnItemBilling"
             location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="createReturnItemBilling">
@@ -78,7 +78,7 @@
         <description>Update a ReturnItem and related adjustments</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <attribute name="currentStatusId" type="String" mode="OUT" optional="false"/>
+        <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="updateReturnItemsStatus" engine="simple"
             location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml" invoke="updateReturnItemsStatus">
@@ -163,7 +163,7 @@
         <description>update Return Item or Adjustment based on the parameters passed in</description>
         <auto-attributes mode="IN" include="all" entity-name="ReturnAdjustment" optional="true"/>
         <auto-attributes mode="IN" include="all" entity-name="ReturnItem" optional="true"/>
-        <attribute name="currentStatusId" type="String" mode="OUT" optional="true"/>
+        <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/>
     </service>
 
     <!-- services to verify that returns refunds aren't issued more than once -->