Author: lektran
Date: Mon Jul 9 00:57:00 2007
New Revision: 554552
URL: http://svn.apache.org/viewvc?view=rev&rev=554552
Log:
Applied fix from trunk for revision: 553114
Modified:
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Modified:
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?view=diff&rev=554552&r1=554551&r2=554552
==============================================================================
---
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
(original)
+++
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Mon Jul 9 00:57:00 2007
@@ -3329,7 +3329,7 @@
List allOpPrefs = new LinkedList();
BigDecimal remainingAmount = new BigDecimal(this.getGrandTotal() -
this.getPaymentTotal());
remainingAmount = remainingAmount.setScale(2,
BigDecimal.ROUND_HALF_UP);
- if (getBillingAccountId() != null) {
+ if (getBillingAccountId() != null && this.billingAccountAmt <= 0) {
double billingAccountAvailableAmount =
CheckOutHelper.availableAccountBalance(getBillingAccountId(), dispatcher);
if (this.billingAccountAmt == 0.0 && billingAccountAvailableAmount
> 0) {
this.billingAccountAmt = billingAccountAvailableAmount;