Author: paulfoxworthy Date: Fri Mar 15 11:21:56 2013 New Revision: 1456900 URL: http://svn.apache.org/r1456900 Log: Exclude expired product category members from tax calc (OFBIZ-4940)
Modified: ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Modified: ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1456900&r1=1456899&r2=1456900&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Mar 15 11:21:56 2013 @@ -326,7 +326,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); for(GenericValue pcm : pcmList) { productCategoryIdSet.add(pcm.getString("productCategoryId"));