Index: contrib/shipcalc/shipcalc.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/contrib/shipcalc/shipcalc.module,v
retrieving revision 1.5.2.2.2.1.2.7
diff -u -p -r1.5.2.2.2.1.2.7 shipcalc.module
--- contrib/shipcalc/shipcalc.module	20 Feb 2007 11:44:45 -0000	1.5.2.2.2.1.2.7
+++ contrib/shipcalc/shipcalc.module	16 Aug 2007 17:56:04 -0000
@@ -62,6 +62,18 @@ function shipcalc_menu($may_cache) {
   return $items;
 }
 
+/**
+ * Themes the testing results.
+ *
+ * @param $rates
+ *   array The array of rate information.
+ * @return
+ *   string The themed output.
+ */
+function theme_shipcalc_testing_results($rates) {
+  return "The {$rates[0]['#service']} test was successful.";
+}
+
 /*** ecommerce hooks ***/
 
 /**
Index: contrib/shipcalc/partners/canadapost.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/contrib/shipcalc/partners/canadapost.inc,v
retrieving revision 1.1.2.2.4.1
diff -u -p -r1.1.2.2.4.1 canadapost.inc
--- contrib/shipcalc/partners/canadapost.inc	8 Mar 2007 23:01:49 -0000	1.1.2.2.4.1
+++ contrib/shipcalc/partners/canadapost.inc	16 Aug 2007 17:56:04 -0000
@@ -148,7 +148,7 @@ function canadapost_settings_form_submit
       if (product_is_shippable(NULL, $ptype)) {
         $last_ptype = $ptype;
         // Load the first product of this type.
-        $nid = db_result(db_queryd(db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {ec_product} p ON n.vid = p.vid WHERE p.ptype = '%s' LIMIT 1"), $ptype));
+        $nid = db_result(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {ec_product} p ON n.vid = p.vid WHERE p.ptype = '%s' LIMIT 1"), $ptype));
         if ($nid && $node = node_load($nid)) {
           break;
         }
Index: contrib/shipcalc/partners/ups.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/contrib/shipcalc/partners/ups.inc,v
retrieving revision 1.1.2.8.4.4
diff -u -p -r1.1.2.8.4.4 ups.inc
--- contrib/shipcalc/partners/ups.inc	9 Aug 2007 23:55:07 -0000	1.1.2.8.4.4
+++ contrib/shipcalc/partners/ups.inc	16 Aug 2007 17:56:04 -0000
@@ -158,7 +158,7 @@ function ups_settings_form_submit(&$form
     foreach (array_keys($ptypes) as $ptype) {
       if (product_is_shippable(NULL, $ptype)) {
         // Load the first product of this type.
-        $nid = db_result(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {ec_product} p ON n.nid = p.nid WHERE p.ptype = '%s' LIMIT 1", $ptype)));
+        $nid = db_result(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {ec_product} p ON n.nid = p.nid WHERE p.ptype = '%s' LIMIT 1"), $ptype));
         if ($nid) {
           $node = node_load($nid);
         }
Index: shipping/shipping.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/shipping/shipping.info,v
retrieving revision 1.3.2.12
diff -u -p -r1.3.2.12 shipping.info
--- shipping/shipping.info	27 Jul 2007 04:54:33 -0000	1.3.2.12
+++ shipping/shipping.info	16 Aug 2007 17:56:04 -0000
@@ -1,6 +1,6 @@
 ; $Id:$
 core          = "5.0"
 dependencies  = store
-description   = "Enable a shipping module API for ecommerce. You must also install and enable at least one shipping module to use the API."
+description   = "Enable a shipping module API for ecommerce. You must also install and enable at least one shipping module and at least one address module (address or ecivicrm) to use the API."
 package       = "E-Commerce Uncategorized"
 name          = "Shipping API"