Author: jleroux Date: Mon Feb 23 20:53:23 2015 New Revision: 1661779 URL: http://svn.apache.org/r1661779 Log: "Applied fix from trunk for revision: 1661778 " ------------------------------------------------------------------------ r1661778 | jleroux | 2015-02-23 21:52:36 +0100 (lun., 23 févr. 2015) | 6 lines
A patch from Christian Carlow for "Error updating order when item quantity less than 1 but greater than 0 exists" https://issues.apache.org/jira/browse/OFBIZ-6101 This error occurred when I updated a purchase order containing an item with quantity > 0 but less than 1: "Quantity must be >0, use cancel item to cancel completely!" ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/order/OrderServices.java Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 23 20:53:23 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661778 Modified: ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1661779&r1=1661778&r2=1661779&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Feb 23 20:53:23 2015 @@ -3726,7 +3726,7 @@ public class OrderServices { return ServiceUtil.returnError(e.getMessage()); } - if (groupQty.compareTo(BigDecimal.ONE) < 0) { + if (groupQty.compareTo(BigDecimal.ZERO) < 0) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "OrderItemQtyMustBePositive", locale)); }

