svn commit: r1811794 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java

[jl...@apache.org]

Author: jleroux
Date: Wed Oct 11 06:02:40 2017
New Revision: 1811794

URL: http://svn.apache.org/viewvc?rev=1811794&view=rev
Log:
Fixed: Purchase Order is not getting canceled automatically if all items are 
canceled
(OFBIZ-9838)

Steps to regenerate:
* Go to OrderView screen. (Purchase Order view screen)
* Click on Edit Items.
* Now cancel all the items.
* Purchase Order status does not change to Cancel status.

Reference mail [http://markmail.org/message/eghwtpym5w76bnrq]


Thanks: Renuka Srishti

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java

Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1811794&r1=1811793&r2=1811794&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Wed Oct 11 06:02:40 2017
@@ -1919,9 +1919,7 @@ public class OrderServices {
             // find the next status to set to (if any)
             String newStatus = null;
             if (allCanceled) {
-                if (!"PURCHASE_ORDER".equals(orderTypeId)) {
-                    newStatus = "ORDER_CANCELLED";
-                }
+                newStatus = "ORDER_CANCELLED";
             } else if (allComplete) {
                 newStatus = "ORDER_COMPLETED";
             } else if (allApproved) {