diff -u -r1.8.2.1.2.1.2.17 flexicharge.module
--- flexicharge.module  12 Jul 2007 02:46:04 -0000      1.8.2.1.2.1.2.17
+++ flexicharge.module  3 Sep 2007 10:43:18 -0000
@@ -76,7 +76,7 @@
  */
 function flexicharge_form_alter($form_id, &$form) {

-  if (isset($form['product']) && isset($form['product']['ptype'])) {
+               if (product_form_is_product($form_id, $form)) {
     $ptype = $form['product']['ptype']['#value'];

     _flexicharge_partners();
@@ -504,7 +504,15 @@
 function flexicharge_nodeapi(&$node, $op, $teaser) {
   // Only act on products.
   if (!isset($node->ptype)) {
-    return;
+                               $product = product_load($node);
+    if ($product) {
+      foreach ($product as $key => $value) {
+        $node->$key = $value;
+      }
+    }
+    else {
+                                       return;
+                        }
   }

   switch ($op) {