svn commit: r560134 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java

[apatel-2]

Author: apatel
Date: Fri Jul 27 00:39:32 2007
New Revision: 560134

URL: http://svn.apache.org/viewvc?view=rev&rev=560134
Log:
Modified as per David's comments.

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?view=diff&rev=560134&r1=560133&r2=560134
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Fri Jul 27 00:39:32 2007
@@ -714,7 +714,7 @@
     }
 
     public void calcAndAddTax(GenericValue shipAddress) throws GeneralException {
-        if (!"SALES_ORDER".equals(cart.getOrderType()) || UtilValidate.isEmpty(cart.getShippingContactMechId())) {
+        if (!"SALES_ORDER".equals(cart.getOrderType()) || (UtilValidate.isEmpty(cart.getShippingContactMechId()) && UtilValidate.isEmpty(cart.getBillingAddress()))) {
             return;
         }