Author: sichen
Date: Mon Dec 10 11:13:14 2007
New Revision: 602999
URL: http://svn.apache.org/viewvc?rev=602999&view=rev
Log:
Prevent prefs with refunded status from being canceled when doing a partial
cancel on an OrderItem.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=602999&r1=602998&r2=602999&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Mon Dec 10 11:13:14 2007
@@ -3405,6 +3405,7 @@
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL,
"PAYMENT_CANCELLED"));
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL,
"PAYMENT_DECLINED"));
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL,
"PAYMENT_SETTLED"));
+ exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL,
"PAYMENT_REFUNDED"));
EntityCondition cond = new EntityConditionList(exprs,
EntityOperator.AND);
paymentPrefsToCancel =
delegator.findByCondition("OrderPaymentPreference", cond, null, null);
} catch (GenericEntityException e) {
