svn commit: r830528 - /ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java

Author: jleroux
Date: Wed Oct 28 13:28:58 2009
New Revision: 830528

URL: http://svn.apache.org/viewvc?rev=830528&view=rev
Log:
A patch from Patrick Antivackis "PriceServices.calculateProductPrice should not process or return obsolete PriceRules" (https://issues.apache.org/jira/browse/OFBIZ-3096) - OFBIZ-3096
This patch is a 1st step and add only a filterByDate to the PriceRules obtained after the call to the makeProducePriceRuleList function

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=830528&r1=830527&r2=830528&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Wed Oct 28 13:28:58 2009
@@ -557,6 +557,7 @@
         } else {
             try {
                 List<GenericValue> allProductPriceRules = makeProducePriceRuleList(delegator, optimizeForLargeRuleSet, productId, virtualProductId, prodCatalogId, productStoreGroupId, webSiteId, partyId, currencyUomId);
+                allProductPriceRules = EntityUtil.filterByDate(allProductPriceRules, true);
 
                 List<GenericValue> quantityProductPriceRules = null;
                 List<GenericValue> nonQuantityProductPriceRules = null;