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

[apatel-2]

Author: apatel
Date: Thu Jul 26 16:56:18 2007
New Revision: 560035

URL: http://svn.apache.org/viewvc?view=rev&rev=560035
Log:
if there is no shipping contact mech in shoppingcart then do not attempt to calc tax.

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=560035&r1=560034&r2=560035
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Thu Jul 26 16:56:18 2007
@@ -714,7 +714,7 @@
     }
 
     public void calcAndAddTax(GenericValue shipAddress) throws GeneralException {
-        if (!"SALES_ORDER".equals(cart.getOrderType())) {
+        if (!"SALES_ORDER".equals(cart.getOrderType()) || UtilValidate.isEmpty(cart.getShippingContactMechId())) {
             return;
         }