Index: openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl,v
diff -u -r1.7 -r1.7.8.1
--- openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl	10 Sep 2002 22:22:36 -0000	1.7
+++ openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl	15 Dec 2004 10:51:55 -0000	1.7.8.1
@@ -285,7 +285,11 @@
 	    set total_shipping_cost [expr $total_shipping_cost + ([ec_decode $weight "" 0 $weight] * $add_exp_amount_by_weight)]
 	}
     }
-    
+    # See if this is a pickup item
+    if { $shipping_method == "pickup" } {
+        set total_shipping_cost 0
+    }
+
     # To return:
 
     set shipping_to_return $total_shipping_cost