svn commit: r1067891 - /ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java

[jonesde]

Author: jonesde
Date: Mon Feb  7 09:43:05 2011
New Revision: 1067891

URL: http://svn.apache.org/viewvc?rev=1067891&view=rev
Log:
Small change so that VAT included in price is supported for other price types, especially when applied with a price rule as a flat amount override

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1067891&r1=1067890&r2=1067891&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Mon Feb  7 09:43:05 2011
@@ -409,7 +409,7 @@ public class TaxAuthorityServices {
                     // find a ProductPrice for the productId and taxAuth* valxues, and see if it has a priceWithTax value
                     Map<String, String> priceFindMap = UtilMisc.toMap("productId", product.getString("productId"),
                             "taxAuthPartyId", taxAuthPartyId, "taxAuthGeoId", taxAuthGeoId,
-                            "productPriceTypeId", "DEFAULT_PRICE", "productPricePurposeId", "PURCHASE");
+                            "productPricePurposeId", "PURCHASE");
                     List<GenericValue> productPriceList = delegator.findByAnd("ProductPrice", priceFindMap, UtilMisc.toList("-fromDate"));
                     productPriceList = EntityUtil.filterByDate(productPriceList, true);
                     productPrice = (productPriceList != null && productPriceList.size() > 0) ? productPriceList.get(0): null;