Index: branches/version-2_5-dev/html/js/products.js
===================================================================
--- branches/version-2_5-dev/html/js/products.js	(revision 20366)
+++ branches/version-2_5-dev/html/js/products.js	(revision 20463)
@@ -51,7 +51,6 @@
                 $sele2.append(option);
             }
-        }
-        if ($sele1.val()) {
-            checkStock($form, product_id, $sele1.val(), $sele2.val());
+            checkStock($form, product_id, $sele1.val() ? $sele1.val() : '',
+                       $sele2.val() ? $sele2.val() : '');
         }
     }
@@ -82,5 +81,9 @@
         && typeof classcat2['product_code'] != 'undefined') {
         $product_code_default.hide();
+        $product_code_dynamic.show();
         $product_code_dynamic.text(classcat2['product_code']);
+    } else {
+        $product_code_default.show();
+        $product_code_dynamic.hide();
     }
     
@@ -142,8 +145,10 @@
     var $product_class_id_dynamic = $form.find('[id^=product_class_id]');
     if (classcat2
-        && typeof classcat2['product_type'] != 'undefined'
-        && String(classcat2['product_type']).length >= 1) {
+        && typeof classcat2['product_class_id'] != 'undefined'
+        && String(classcat2['product_class_id']).length >= 1) {
 
         $product_class_id_dynamic.val(classcat2['product_class_id']);
+    } else {
+        $product_class_id_dynamic.val('');
     }
 }