svn commit: r1032618 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java

[jonesde]

Author: jonesde
Date: Mon Nov  8 16:13:52 2010
New Revision: 1032618

URL: http://svn.apache.org/viewvc?rev=1032618&view=rev
Log:
Changed to round grand total in ShoppingCart.getGrandTotal method; this is needed so the JDBC driver or database won't be doing the rounding (or truncation), and is also useful for any code that uses getGrandTotal for checking interim results

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1032618&r1=1032617&r2=1032618&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Mon Nov  8 16:13:52 2010
@@ -2616,7 +2616,9 @@ public class ShoppingCart implements Ite
     public BigDecimal getGrandTotal() {
         // sales tax and shipping are not stored as adjustments but rather as part of the ship group
         // Debug.logInfo("Subtotal:" + this.getSubTotal() + " Shipping:" + this.getTotalShipping() + "SalesTax: "+ this.getTotalSalesTax() + " others: " + this.getOrderOtherAdjustmentTotal(),module);
-        return this.getSubTotal().add(this.getTotalShipping()).add(this.getTotalSalesTax()).add(this.getOrderOtherAdjustmentTotal());
+        BigDecimal grandTotal = this.getSubTotal().add(this.getTotalShipping()).add(this.getTotalSalesTax()).add(this.getOrderOtherAdjustmentTotal());
+        grandTotal = grandTotal.setScale(2, BigDecimal.ROUND_HALF_UP);
+        return grandTotal;
     }
 
     public BigDecimal getDisplaySubTotal() {