svn commit: r576006 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

[lektran]

Author: lektran
Date: Sat Sep 15 17:26:11 2007
New Revision: 576006

URL: http://svn.apache.org/viewvc?rev=576006&view=rev
Log:
Removed deprecated getHeaderTaxTotal() and renamed getHeaderTaxTotalBd()

Modified:
    
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

Modified: 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=576006&r1=576005&r2=576006&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java 
(original)
+++ 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java 
Sat Sep 15 17:26:11 2007
@@ -756,15 +756,10 @@
         return 
OrderReadHelper.calcOrderAdjustmentsBd(getOrderHeaderAdjustments(), 
getOrderItemsSubTotalBd(), false, false, true);
     }
 
-    public BigDecimal getHeaderTaxTotalBd() {
+    public BigDecimal getHeaderTaxTotal() {
         return 
OrderReadHelper.calcOrderAdjustmentsBd(getOrderHeaderAdjustments(), 
getOrderItemsSubTotalBd(), false, true, false);
     }
 
-    /** @deprecated Use getHeaderTaxTotalBd() instead */
-    public double getHeaderTaxTotal() {
-        return getHeaderTaxTotalBd().doubleValue();
-    }
-
     public BigDecimal getTaxTotalBd() {
         return OrderReadHelper.calcOrderAdjustmentsBd(getAdjustments(), 
getOrderItemsSubTotalBd(), false, true, false);
     }
@@ -1969,7 +1964,7 @@
             // pro-rated factor (subtotal not returned / item subtotal), which 
shouldn't be rounded to 2 decimals
             orderFactorNotReturned = 
totalSubTotalNotReturned.divide(orderItemsSubTotal, 100, rounding);
         }
-        BigDecimal orderTaxNotReturned = 
this.getHeaderTaxTotalBd().multiply(orderFactorNotReturned).setScale(scale, 
rounding);
+        BigDecimal orderTaxNotReturned = 
this.getHeaderTaxTotal().multiply(orderFactorNotReturned).setScale(scale, 
rounding);
         BigDecimal orderShippingNotReturned = 
this.getShippingTotal().multiply(orderFactorNotReturned).setScale(scale, 
rounding);
 
         return 
totalTaxNotReturned.add(totalShippingNotReturned).add(orderTaxNotReturned).add(orderShippingNotReturned).setScale(scale,
 rounding);