This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / FS / FS / part_pkg / flat.pm

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index ee54c09..975e80a 100644 (file)
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -20,11 +20,6 @@ tie my %temporalities, 'Tie::IxHash',
   'preceding' => "Preceding (past)",
 ;
 
-tie my %contract_years, 'Tie::IxHash', (
-  '(none)'    => '',
-  map { $_*12 => $_ } (1..5),
-);
-
 %usage_fields = (
 
     'seconds'       => { 'name' => 'Time limit for this package',
@@ -122,11 +117,6 @@ tie my %contract_years, 'Tie::IxHash', (
                        },
     'adjourn_months'=> { 'name' => 'Auto-add a suspension date this number of months out',
                        },
-    'contract_end_months'=> { 
-                        'name' => 'Auto-add a contract end date this number of years out',
-                        'type' => 'select',
-                        'select_options' => \%contract_years,
-                      },
     #used in cust_pkg.pm so could add to any price plan where it made sense
     'start_1st'     => { 'name' => 'Auto-add a start date to the 1st, ignoring the current month.',
                          'type' => 'checkbox',
@@ -135,9 +125,6 @@ tie my %contract_years, 'Tie::IxHash', (
                                     'with the customer\'s other packages',
                           'type' => 'checkbox',
                         },
-    'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
-                        'type' => 'checkbox',
-                      },
     'unsuspend_adjust_bill' => 
                         { 'name' => 'Adjust next bill date forward when '.
                                     'unsuspending',
@@ -154,9 +141,8 @@ tie my %contract_years, 'Tie::IxHash', (
   'fieldorder' => [ qw( setup_fee recur_fee
                         recur_temporality unused_credit
                         expire_months adjourn_months
-                        contract_end_months
                         start_1st sync_bill_date
-                        suspend_bill unsuspend_adjust_bill
+                        unsuspend_adjust_bill
                       ),
                     @usage_fieldorder, @usage_recharge_fieldorder,
                     qw( externalid ),