svn commit: r943173 - in /ofbiz/branches/release4.0: ./ applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

[doogie-3]

Author: doogie
Date: Tue May 11 16:48:27 2010
New Revision: 943173

URL: http://svn.apache.org/viewvc?rev=943173&view=rev
Log:
Applied fix from trunk for revision: 943168

Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 16:48:27 2010
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245
+/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,943168

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=943173&r1=943172&r2=943173&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Tue May 11 16:48:27 2010
@@ -990,7 +990,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", new Integer(monthsToInclude), "userLogin", userLogin);
                 try {