[OFBiz] SVN: r6492 - trunk/applications/order/src/org/ofbiz/order/order

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-01-12 15:24:56 -0600 (Thu, 12 Jan 2006)
New Revision: 6492

Modified:
   trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Log:
Fixed bug for canceling flagged sales orders, thanks to suggestion from David Welton.  OFBIZ-661

Modified: trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
===================================================================
--- trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java	2006-01-12 18:33:21 UTC (rev 6491)
+++ trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java	2006-01-12 21:24:56 UTC (rev 6492)
@@ -2471,7 +2471,7 @@
                         String dontCancelUserLogin = orderItem.getString("dontCancelSetUserLogin");
 
                         if (dontCancelUserLogin == null && dontCancelDate == null && autoCancelDate != null) {
-                            if (autoCancelDate.equals(nowTimestamp) || autoCancelDate.after(nowTimestamp)) {
+                            if (nowTimestamp.equals(autoCancelDate) || nowTimestamp.after(autoCancelDate)) {
                                 // cancel the order item
                                 Map svcCtx = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "statusId", "ITEM_CANCELLED", "userLogin", userLogin);
                                 try {