svn commit: r943168 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

[doogie-3]

Author: doogie
Date: Tue May 11 16:27:10 2010
New Revision: 943168

URL: http://svn.apache.org/viewvc?rev=943168&view=rev
Log:
Fix parsing of otherValue(it was condValue), in PPIP_ORST_HIST.
Previously, if otherValue was not null, it would attempt to convert
condValue to monthsToInclude, *and* also use the same condValue for
order total comparisons.  This was not right at all.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=943168&r1=943167&r2=943168&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Tue May 11 16:27:10 2010
@@ -1063,7 +1063,7 @@ public class ProductPromoWorker {
                 // call the getOrderedSummaryInformation service to get the sub-total
                 int monthsToInclude = 12;
                 if (otherValue != null) {
-                    monthsToInclude = Integer.parseInt(condValue);
+                    monthsToInclude = Integer.parseInt(otherValue);
                 }
                 Map serviceIn = UtilMisc.toMap("partyId", partyId, "roleTypeId", "PLACING_CUSTOMER", "orderTypeId", "SALES_ORDER", "statusId", "ORDER_COMPLETED", "monthsToInclude", Integer.valueOf(monthsToInclude), "userLogin", userLogin);
                 try {