You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/09/13 21:53:21 UTC
svn commit: r575418 -
/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Author: jleroux
Date: Thu Sep 13 12:53:20 2007
New Revision: 575418
URL: http://svn.apache.org/viewvc?rev=575418&view=rev
Log:
We still had "3, BigDecimal.ROUND_CEILING" in TaxAuthorityServices, it uses now "salestaxCalcDecimals, salestaxRounding"
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=575418&r1=575417&r2=575418&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 Thu Sep 13 12:53:20 2007
@@ -57,6 +57,9 @@
public static final BigDecimal ZERO_BASE = new BigDecimal("0.000");
public static final BigDecimal ONE_BASE = new BigDecimal("1.000");
public static final BigDecimal PERCENT_SCALE = new BigDecimal("100.000");
+ public static int salestaxFinalDecimals=UtilNumber.getBigDecimalScale("salestax.final.decimals");
+ public static int salestaxCalcDecimals=UtilNumber.getBigDecimalScale("salestax.calc.decimals");
+ public static int salestaxRounding=UtilNumber.getBigDecimalRoundingMode("salestax.rounding");
public static Map rateProductTaxCalcForDisplay(DispatchContext dctx, Map context) {
GenericDelegator delegator = dctx.getDelegator();
@@ -69,9 +72,6 @@
if (quantity == null) quantity = ONE_BASE;
BigDecimal amount = basePrice.multiply(quantity);
- int salestaxFinalDecimals=UtilNumber.getBigDecimalScale("salestax.final.decimals");
- int salestaxCalcDecimals=UtilNumber.getBigDecimalScale("salestax.calc.decimals");
- int salestaxRounding=UtilNumber.getBigDecimalRoundingMode("salestax.rounding");
BigDecimal taxTotal = ZERO_BASE;
BigDecimal taxPercentage = ZERO_BASE;
@@ -209,7 +209,7 @@
}
String postalCodeGeoId = ContactMechWorker.getPostalAddressPostalCodeGeoId(shippingAddress, delegator);
if (UtilValidate.isNotEmpty(postalCodeGeoId)) {
- geoIdSet.add(postalCodeGeoId);
+ geoIdSet.add(postalCodeGeoId);
}
} else {
Debug.logWarning("shippingAddress was null, adding nothing to taxAuthoritySet", module);
@@ -330,7 +330,7 @@
}
// taxRate is in percentage, so needs to be divided by 100
- BigDecimal taxAmount = (taxable.multiply(taxRate)).divide(PERCENT_SCALE, 3, BigDecimal.ROUND_CEILING);
+ BigDecimal taxAmount = (taxable.multiply(taxRate)).divide(PERCENT_SCALE, salestaxCalcDecimals, salestaxRounding);
String taxAuthGeoId = taxAuthorityRateProduct.getString("taxAuthGeoId");
String taxAuthPartyId = taxAuthorityRateProduct.getString("taxAuthPartyId");