svn commit: r576008 - in /ofbiz/trunk/applications: accounting/src/org/ofbiz/accounting/invoice/ order/src/org/ofbiz/order/order/ order/src/org/ofbiz/order/shoppingcart/shipping/ product/webapp/facility/WEB-INF/actions/shipment/

[lektran]

Author: lektran
Date: Sat Sep 15 17:30:35 2007
New Revision: 576008

URL: http://svn.apache.org/viewvc?rev=576008&view=rev
Log:
Removed deprecated getShippableTotal() and renamed getShippableTotalBd()

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=576008&r1=576007&r2=576008&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Sat Sep 15 17:30:35 2007
@@ -220,7 +220,7 @@
             BigDecimal totalItemsInOrder = orh.getTotalOrderItemsQuantityBd();
 
             // get some price totals
-            BigDecimal shippableAmount = orh.getShippableTotalBd(null);
+            BigDecimal shippableAmount = orh.getShippableTotal(null);
             BigDecimal orderSubTotal = orh.getOrderItemsSubTotalBd();
 
             // these variables are for pro-rating order amounts across invoices, so they should not be rounded off for maximum accuracy

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=576008&r1=576007&r2=576008&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:30:35 2007
@@ -913,7 +913,7 @@
         return taxApplies;
     }
 
-    public BigDecimal getShippableTotalBd(String shipGroupSeqId) {
+    public BigDecimal getShippableTotal(String shipGroupSeqId) {
         BigDecimal shippableTotal = ZERO;
         List validItems = getValidOrderItems(shipGroupSeqId);
         if (validItems != null) {
@@ -935,11 +935,6 @@
             }
         }
         return shippableTotal.setScale(scale, rounding);
-    }
-
-    /** @deprecated Use getShippableTotalBd() instead */
-    public double getShippableTotal(String shipGroupSeqId) {
-        return getShippableTotalBd(shipGroupSeqId).doubleValue();
     }
 
     public BigDecimal getShippableQuantityBd() {

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=576008&r1=576007&r2=576008&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Sat Sep 15 17:30:35 2007
@@ -111,7 +111,7 @@
         String contactMechId = shipAddr.getString("contactMechId");
         return getShipGroupEstimate(dispatcher, delegator, orh.getOrderTypeId(), shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId,
                 contactMechId, orh.getProductStoreId(), orh.getShippableItemInfo(shipGroupSeqId), orh.getShippableWeightBd(shipGroupSeqId).doubleValue(),
-                orh.getShippableQuantityBd(shipGroupSeqId).doubleValue(), orh.getShippableTotalBd(shipGroupSeqId).doubleValue());
+                orh.getShippableQuantityBd(shipGroupSeqId).doubleValue(), orh.getShippableTotal(shipGroupSeqId).doubleValue());
     }
 
     public static Map getShipGroupEstimate(LocalDispatcher dispatcher, GenericDelegator delegator, String orderTypeId,

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh?rev=576008&r1=576007&r2=576008&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh Sat Sep 15 17:30:35 2007
@@ -133,7 +133,7 @@
                 productStoreId = orh.getProductStoreId();
                 shippableItemInfo = orh.getOrderItemAndShipGroupAssoc(shipGroupSeqId);
                 shippableItems = delegator.findByAnd("OrderItemAndShipGrpInvResAndItemSum", UtilMisc.toMap("orderId", orderId, "shipGroupSeqId", shipGroupSeqId));
-                shippableTotal = new Double(orh.getShippableTotalBd(shipGroupSeqId).doubleValue());
+                shippableTotal = new Double(orh.getShippableTotal(shipGroupSeqId).doubleValue());
                 shippableWeight = new Double(orh.getShippableWeightBd(shipGroupSeqId).doubleValue());
                 shippableQuantity = new Double(orh.getShippableQuantityBd(shipGroupSeqId).doubleValue());
                 shipmentCostEstimate = packSession.getShipmentCostEstimate(orderItemShipGroup, productStoreId, shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity);