svn commit: r576035 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order/order: OrderReadHelper.java OrderReturnServices.java OrderServices.java

[lektran]

Author: lektran
Date: Sat Sep 15 22:37:06 2007
New Revision: 576035

URL: http://svn.apache.org/viewvc?rev=576035&view=rev
Log:
Removed deprecated getOrderReturnedTotal() and renamed getOrderReturnedTotalBd()

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.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=576035&r1=576034&r2=576035&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:37:06 2007
@@ -1767,16 +1767,6 @@
         return returnedQuantity.setScale(scale, rounding);
     }
 
-    /** @deprecated */
-    public double getOrderReturnedTotal() {
-        return getOrderReturnedTotalBd().doubleValue();
-    }
-
-    /** @deprecated */
-    public double getOrderReturnedTotal(boolean includeAll) {
-        return getOrderReturnedTotalBd(includeAll).doubleValue();
-    }
-
     /**
      * Get the returned total by return type (credit, refund, etc.).  Specify returnTypeId = null to get sum over all
      * return types.  Specify includeAll = true to sum up over all return statuses except cancelled.  Specify includeAll
@@ -1835,7 +1825,7 @@
     }
 
     /** Gets the total return amount (all return types) for COMPLETED and RECEIVED returns. */
-    public BigDecimal getOrderReturnedTotalBd() {
+    public BigDecimal getOrderReturnedTotal() {
         return getOrderReturnedTotalByTypeBd(null, false);
     }
 
@@ -1843,7 +1833,7 @@
      * Gets the total returned over all return types.  Specify true to include all return statuses
      * except cancelled.  Specify false to include only COMPLETED and RECEIVED returns.
      */
-    public BigDecimal getOrderReturnedTotalBd(boolean includeAll) {
+    public BigDecimal getOrderReturnedTotal(boolean includeAll) {
         return getOrderReturnedTotalByTypeBd(null, includeAll);
     }
 

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=576035&r1=576034&r2=576035&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sat Sep 15 22:37:06 2007
@@ -113,7 +113,7 @@
         if (countNewReturnItems == null) {
             countNewReturnItems = Boolean.FALSE;
         }
-        BigDecimal returnTotal = orh.getOrderReturnedTotalBd(countNewReturnItems.booleanValue());
+        BigDecimal returnTotal = orh.getOrderReturnedTotal(countNewReturnItems.booleanValue());
         BigDecimal orderTotal = orh.getOrderGrandTotal();
         BigDecimal available = orderTotal.subtract(returnTotal).subtract(adj);
 

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=576035&r1=576034&r2=576035&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:37:06 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.getOrderReturnedTotalBd()).subtract(orh.getOrderNonReturnedTaxAndShippingBd());
+            BigDecimal remainingSubTotal = updatedTotal.subtract(orh.getOrderReturnedTotal()).subtract(orh.getOrderNonReturnedTaxAndShippingBd());
 
             if (currentTotal == null || currentSubTotal == null || updatedTotal.compareTo(currentTotal) != 0 ||
                     remainingSubTotal.compareTo(currentSubTotal) != 0) {