Index: product/product.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/ecommerce/product/product.module,v
retrieving revision 1.116.2.6
diff -u -r1.116.2.6 product.module
--- product/product.module	29 Jun 2006 11:54:30 -0000	1.116.2.6
+++ product/product.module	24 Jul 2006 12:19:51 -0000
@@ -525,7 +525,7 @@
     '#size' => 25,
     '#maxlength' => 50,
     '#required' => TRUE,
-    '#default_value' => $node->price,
+    '#default_value' => module_invoke('payment', 'format', $node->price),
     '#description' => t('How much does this product retail for? Note: This price may be different from the selling price due to price adjustments elsewhere.'),
     '#weight' => -20,
   );
@@ -540,7 +540,7 @@
 
     $interval = drupal_map_assoc(range(0, 31));
     $interval[0] = '--';
-    $unit = array(0 => t('-please choose-'), 'D' => t('Day(s)'), 'W' => t('Week(s)'), 'M' => t('Month(s)'), 'Y' => t('Year(s)'));
+    $unit = array(0 => t('-please choose-'), '-M' => t('Minute(s)'), '-H' => t('Hour(s)'), 'D' => t('Day(s)'), 'W' => t('Week(s)'), 'M' => t('Month(s)'), 'Y' => t('Year(s)'));
     $form['billing_cycle']['price_interval'] = array(
       '#type' => 'select',
       '#title' => t('Interval'),
@@ -886,7 +886,7 @@
   $result = pager_query(db_rewrite_sql($sql), 50);
 
   while ($data = db_fetch_object($result)) {
-    $rows[] = array($data->nid, $data->sku, l($data->title, "node/$data->nid"), product_adjust_price($data)+product_get_specials($data, true), $data->ptype);
+    $rows[] = array($data->nid, $data->sku, l($data->title, "node/$data->nid"), module_invoke('payment', 'format', product_adjust_price($data)+product_get_specials($data, true)), $data->ptype);
   }
 
   $pager = theme('pager', NULL, 50, 0);
@@ -922,7 +922,7 @@
   $result = pager_query(db_rewrite_sql($sql), 50);
 
   while ($data = db_fetch_object($result)) {
-    $rows[] = array($data->nid, $data->sku, $data->title, product_adjust_price($data)+product_get_specials($data, true), $data->ptype);
+    $rows[] = array($data->nid, $data->sku, $data->title, module_invoke('payment', 'format', product_adjust_price($data)+product_get_specials($data, true)), $data->ptype);
   }
 
   $pager = theme("pager", NULL, 50, 0);