diff -u -r1.8.2.1.2.1.2.15.2.14 flexicharge.module
--- flexicharge.module  13 Aug 2007 19:23:34 -0000      1.8.2.1.2.1.2.15.2.14
+++ flexicharge.module  31 Aug 2007 13:47:45 -0000
@@ -83,7 +83,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();
@@ -271,7 +271,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) {