svn commit: r1639834 - /ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java

[ashish]

Author: ashish
Date: Sat Nov 15 05:18:55 2014
New Revision: 1639834

URL: http://svn.apache.org/r1639834
Log:
Applied bug fix from trunk r1639833.
Applied bug fix from jira issue OFBIZ-5854 - Order On Hold Auto Approves When 
Edited.
Thanks Vikas for creating the issue and thanks Akash for verification.

Modified:
    
ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java

Modified: 
ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1639834&r1=1639833&r2=1639834&view=diff
==============================================================================
--- 
ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java
 (original)
+++ 
ofbiz/branches/release13.07/applications/order/src/org/ofbiz/order/order/OrderServices.java
 Sat Nov 15 05:18:55 2014
@@ -1963,6 +1963,10 @@ public class OrderServices {
 
                 if (changeToApprove) {
                     newStatus = "ORDER_APPROVED";
+                    if ("ORDER_HOLD".equals(orderHeaderStatusId)) {
+                        // Don't let the system to auto approve order if the 
order was put on hold.
+                        return ServiceUtil.returnSuccess();
+                    }
                 }
             }