You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/09/16 02:24:42 UTC
svn commit: r576004 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
Author: lektran
Date: Sat Sep 15 17:24:41 2007
New Revision: 576004
URL: http://svn.apache.org/viewvc?rev=576004&view=rev
Log:
Removed deprecated getShippingTotal() and renamed getShippingTotalBd()
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=576004&r1=576003&r2=576004&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:24:41 2007
@@ -752,15 +752,10 @@
return null;
}
- public BigDecimal getShippingTotalBd() {
+ public BigDecimal getShippingTotal() {
return OrderReadHelper.calcOrderAdjustmentsBd(getOrderHeaderAdjustments(), getOrderItemsSubTotalBd(), false, false, true);
}
- /** @deprecated Use getShippingTotalBd() instead */
- public double getShippingTotal() {
- return getShippingTotalBd().doubleValue();
- }
-
public BigDecimal getHeaderTaxTotalBd() {
return OrderReadHelper.calcOrderAdjustmentsBd(getOrderHeaderAdjustments(), getOrderItemsSubTotalBd(), false, true, false);
}
@@ -1975,7 +1970,7 @@
orderFactorNotReturned = totalSubTotalNotReturned.divide(orderItemsSubTotal, 100, rounding);
}
BigDecimal orderTaxNotReturned = this.getHeaderTaxTotalBd().multiply(orderFactorNotReturned).setScale(scale, rounding);
- BigDecimal orderShippingNotReturned = this.getShippingTotalBd().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);
}