svn commit: r985844 - in /ofbiz/branches/release10.04: ./ applications/order/src/org/ofbiz/order/order/OrderReturnServices.java specialpurpose/googlecheckout/servicedef/secas.xml

[ashish-18]

Author: ashish
Date: Mon Aug 16 09:44:39 2010
New Revision: 985844

URL: http://svn.apache.org/viewvc?rev=985844&view=rev
Log:
Applied fix from trunk for revision: 940851
===

Fixed a bug in vendor return. The service getReturnableItems returns a map containing the returable quantity corresponding to an item along with
certain other things. Earlier this service was returning an empty map for a purchase order and a vendor return. On order detail page action
block there is a check on this map and if the map comes out to be empty the system does not show the options to create return for the
purchase order. Similary if you create a vendor return directly from the Return Header screen and try to add items on the Return Item screen
using an order Id, this display a message "No returnable items found for order"

Also the method sendItemsShipped in the service sendGoogleShipRequest was throwing a NPE because the code try to pull a product through
ItemIssuance > OrderItem > Product

In the vendor return of type refund the items are issued to the return shipment and a purchase return invoice is generated and hence the process
is not linked to any Order. Adding a condition on the ECA so that this service is not invoked.


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
    ofbiz/branches/release10.04/specialpurpose/googlecheckout/servicedef/secas.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 16 09:44:39 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718

Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=985844&r1=985843&r2=985844&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Mon Aug 16 09:44:39 2010
@@ -492,6 +492,7 @@ public class OrderReturnServices {
                     }
                     // items not issued/shipped are considered as returnable only if they are
                     // not physical items
+                    if ("SALES_ORDER".equals(orderHeader.getString("orderTypeId"))) {
                     BigDecimal quantityIssued = orderItemQuantityIssued.getBigDecimal("quantityIssued");
                     if (UtilValidate.isEmpty(quantityIssued) || quantityIssued.compareTo(BigDecimal.ZERO) == 0) {
                         try {
@@ -505,6 +506,7 @@ public class OrderReturnServices {
                         }
 
                     }
+                    }
                     Map serviceResult = null;
                     try {
                         serviceResult = dispatcher.runSync("getReturnableQuantity", UtilMisc.toMap("orderItem", item));

Modified: ofbiz/branches/release10.04/specialpurpose/googlecheckout/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/googlecheckout/servicedef/secas.xml?rev=985844&r1=985843&r2=985844&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/googlecheckout/servicedef/secas.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/googlecheckout/servicedef/secas.xml Mon Aug 16 09:44:39 2010
@@ -49,6 +49,7 @@ under the License.
     <eca service="updateShipment" event="commit" run-on-failure="false" run-on-error="false">
         <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
         <condition field-name="statusId" operator="equals" value="SHIPMENT_SHIPPED"/>
+        <condition field-name="shipmentTypeId" operator="not-equals" value="PURCHASE_RETURN"/>
         <action service="sendGoogleShipRequest" mode="sync"/>
     </eca>