Author: paulfoxworthy
Date: Fri Mar 15 11:25:50 2013
New Revision: 1456902
URL: http://svn.apache.org/r1456902
Log:
Exclude expired product category members from tax calc (OFBIZ-4940)
Modified:
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Modified:
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1456902&r1=1456901&r2=1456902&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
(original)
+++
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Fri Mar 15 11:25:50 2013
@@ -330,7 +330,7 @@ public class TaxAuthorityServices {
} else {
productIdCond = EntityCondition.makeCondition("productId",
EntityOperator.EQUALS, product.getString("productId"));
}
- List<GenericValue> pcmList =
delegator.findList("ProductCategoryMember", productIdCond,
UtilMisc.toSet("productCategoryId"), null, null, true);
+ List<GenericValue> pcmList =
delegator.findList("ProductCategoryMember", productIdCond,
UtilMisc.toSet("productCategoryId", "fromDate", "thruDate"), null, null, true);
pcmList = EntityUtil.filterByDate(pcmList, true);
Iterator<GenericValue> pcmIter = pcmList.iterator();
while (pcmIter.hasNext()) {
