You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/02/24 14:33:47 UTC
svn commit: r1661941 - in /ofbiz/branches/release14.12: ./
applications/order/src/org/ofbiz/order/order/OrderServices.java
Author: jleroux
Date: Tue Feb 24 13:33:46 2015
New Revision: 1661941
URL: http://svn.apache.org/r1661941
Log:
"Applied fix from trunk for revision: 1661940"
------------------------------------------------------------------------
r1661940 | jleroux | 2015-02-24 14:33:10 +0100 (mar., 24 févr. 2015) | 1 line
Reverts r1661778 (was for OFBIZ-6101), it blocks demo data loading. To be revisited
------------------------------------------------------------------------
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 Tue Feb 24 13:33:46 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,1661778,1661853,1661862,1661873
+/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,1661853,1661862,1661873,1661940
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=1661941&r1=1661940&r2=1661941&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 Tue Feb 24 13:33:46 2015
@@ -3743,7 +3743,7 @@ public class OrderServices {
return ServiceUtil.returnError(e.getMessage());
}
- if (groupQty.compareTo(BigDecimal.ZERO) < 0) {
+ if (groupQty.compareTo(BigDecimal.ONE) < 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"OrderItemQtyMustBePositive", locale));
}