X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fbase_delayed.pm;h=c6864a692116774d6d644a7b1a16dff6aa457e2f;hb=ecb7665dc7dadd32cdfa5a1b98be57f0850c234d;hp=ddd4caf7373a052ed61ae1af3a3ff3b44713a0a4;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git

diff --git a/FS/FS/part_pkg/base_delayed.pm b/FS/FS/part_pkg/base_delayed.pm
index ddd4caf73..c6864a692 100644
--- a/FS/FS/part_pkg/base_delayed.pm
+++ b/FS/FS/part_pkg/base_delayed.pm
@@ -10,32 +10,23 @@ use FS::part_pkg::base_rate;
 %info = (
   'name' => 'Free (or setup fee) for X days, then base rate'.
             ' (anniversary billing)',
+  'shortname' => 'Bulk (manual from "units" option), w/intro period',
+  'inherit_fields' => [ 'global_Mixin' ],
   'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
     'free_days' => { 'name' => 'Initial free days',
                      'default' => 0,
                    },
-    'recur_fee' => { 'name' => 'Recurring base fee for this package',
-                     'default' => 0,
-                    },
     'recur_notify' => { 'name' => 'Number of days before recurring billing'.
-                                  'commences to notify customer. (0 means '.
-                                  'no warning)',
+                                  ' commences to notify customer. (0 means'.
+                                  ' no warning)',
                      'default' => 0,
                     },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
   },
-  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'recur_notify',
-                    'unused_credit'
+  'fieldorder' => [ 'free_days', 'recur_notify',
                   ],
   #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
   #'recur' => 'what.recur_fee.value',
-  'weight' => 50,
+  'weight' => 54, #&g!
 );
 
 sub calc_setup {