svn commit: r1064955 - /ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

[mor-2]

Author: mor
Date: Sat Jan 29 05:41:42 2011
New Revision: 1064955

URL: http://svn.apache.org/viewvc?rev=1064955&view=rev
Log:
Merged from trunk r1064954.
Log: Bug fix - Under the order items on Order Detail Page the Quantity Returned wasn't correct 'cause system is also adding up the quantities from a corresponding canceled return.

Modified:
    ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1064955&r1=1064954&r2=1064955&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sat Jan 29 05:41:42 2011
@@ -1733,8 +1733,10 @@ public class OrderReadHelper {
        Map<String, BigDecimal> returnMap = FastMap.newInstance();
        for (Iterator<GenericValue> iter = this.getValidOrderItems().iterator(); iter.hasNext();) {
            GenericValue orderItem = iter.next();
-           List<GenericValue> group = EntityUtil.filterByAnd(returnItems,
-                   UtilMisc.toMap("orderId", orderItem.get("orderId"), "orderItemSeqId", orderItem.get("orderItemSeqId")));
+           List<GenericValue> group = EntityUtil.filterByAnd(returnItems, UtilMisc.toList(
+                   EntityCondition.makeCondition("orderId", orderItem.get("orderId")),
+                   EntityCondition.makeCondition("orderItemSeqId", orderItem.get("orderItemSeqId")),
+                   EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "RETURN_CANCELLED")));
 
            // add up the returned quantities for this group TODO: received quantity should be used eventually
            BigDecimal returned = BigDecimal.ZERO;