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 2008/03/01 01:30:16 UTC
svn commit: r632508 -
/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Author: jleroux
Date: Fri Feb 29 16:30:14 2008
New Revision: 632508
URL: http://svn.apache.org/viewvc?rev=632508&view=rev
Log:
Fix some 1.4 issues introduced in r608352
Modified:
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Modified: ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=632508&r1=632507&r2=632508&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Feb 29 16:30:14 2008
@@ -53,8 +53,8 @@
public class TaxAuthorityServices {
public static final String module = TaxAuthorityServices.class.getName();
- public static final BigDecimal ZERO_BASE = BigDecimal.ZERO;
- public static final BigDecimal ONE_BASE = BigDecimal.ONE;
+ 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");
@@ -182,7 +182,7 @@
// this is an add and not an addAll because we want a List of Lists of GenericValues, one List of Adjustments per item
itemAdjustments.add(taxList);
}
- if (orderShippingAmount != null && orderShippingAmount.compareTo(BigDecimal.ZERO) > 0) {
+ if (orderShippingAmount != null && orderShippingAmount.doubleValue() > 0) {
List taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId, taxAuthoritySet, ZERO_BASE, ZERO_BASE, orderShippingAmount);
orderAdjustments.addAll(taxList);
}
@@ -313,7 +313,7 @@
taxable = taxable.add(shippingAmount);
}
- if (taxable.compareTo(BigDecimal.ZERO) == 0) {
+ if (taxable.doubleValue() == 0) {
// this should make it less confusing if the taxable flag on the product is not Y/true, and there is no shipping and such
continue;
}