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