Author: lektran
Date: Sat Sep 15 22:42:00 2007
New Revision: 576036
URL: http://svn.apache.org/viewvc?rev=576036&view=rev
Log:
Removed deprecated getOrderNonReturnedTaxAndShipping() and renamed
getOrderNonReturnedTaxAndShippingBd()
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.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=576036&r1=576035&r2=576036&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 22:42:00 2007
@@ -1837,7 +1837,7 @@
return getOrderReturnedTotalByTypeBd(null, includeAll);
}
- public BigDecimal getOrderNonReturnedTaxAndShippingBd() {
+ public BigDecimal getOrderNonReturnedTaxAndShipping() {
// first make a Map of orderItemSeqId key, returnQuantity value
List returnedItemsBase = getOrderReturnItems();
List returnedItems = new ArrayList(returnedItemsBase.size());
@@ -1963,11 +1963,6 @@
/** Gets the total return refund amount with refunds and credits to the
billing account figured in */
public BigDecimal getReturnedRefundTotalWithBillingAccountBd() {
return
getOrderReturnedRefundTotalBd().add(getBillingAccountReturnedCreditTotalBd()).subtract(getBillingAccountReturnedRefundTotalBd());
- }
-
- /** @deprecated */
- public double getOrderNonReturnedTaxAndShipping() {
- return getOrderNonReturnedTaxAndShippingBd().doubleValue();
}
public BigDecimal getOrderBackorderQuantityBd() {
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=576036&r1=576035&r2=576036&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Sat Sep 15 22:42:00 2007
@@ -1180,7 +1180,7 @@
BigDecimal updatedTotal = orh.getOrderGrandTotal();
// calculate subTotal as grandTotal - returnsTotal - (tax +
shipping of items not returned)
- BigDecimal remainingSubTotal =
updatedTotal.subtract(orh.getOrderReturnedTotal()).subtract(orh.getOrderNonReturnedTaxAndShippingBd());
+ BigDecimal remainingSubTotal =
updatedTotal.subtract(orh.getOrderReturnedTotal()).subtract(orh.getOrderNonReturnedTaxAndShipping());
if (currentTotal == null || currentSubTotal == null ||
updatedTotal.compareTo(currentTotal) != 0 ||
remainingSubTotal.compareTo(currentSubTotal) != 0) {
