X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=14bc1dc11cb39dbb95ac755e0164408de23ac888;hb=c22d84e565ab16db142395dce2e8621624eff140;hp=10328ce5ef4cd655c387380846d5940ac4489934;hpb=4af73859347d8d56a9552eb4b5ebaffdda14edd2;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 10328ce5e..14bc1dc11 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1,7 +1,8 @@
 package FS::Conf;
 
 use strict;
-use vars qw( $base_dir @config_items @base_items @card_types $DEBUG
+use vars qw( $base_dir @config_items @base_items @card_types @invoice_terms
+             $DEBUG
              $conf_cache $conf_cache_enabled
            );
 use Carp;
@@ -616,6 +617,14 @@ logo.png
 logo.eps
 );
 
+@invoice_terms = (
+  '',
+  'Payable upon receipt',
+  'Net 0', 'Net 3', 'Net 5', 'Net 7', 'Net 9', 'Net 10', 'Net 14', 
+  'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45', 
+  'Net 60', 'Net 90'
+);
+
 my %msg_template_options = (
   'type'        => 'select-sub',
   'options_sub' => sub { 
@@ -737,29 +746,6 @@ my $validate_email = sub { $_[0] =~
   },
 
   {
-    'key'         => 'alert_expiration',
-    'section'     => 'deprecated',
-    'description' => 'Enable alerts about credit card expiration.  This is obsolete and no longer works.',
-    'type'        => 'checkbox',
-    'per_agent'   => 1,
-  },
-
-  {
-    'key'         => 'alerter_template',
-    'section'     => 'deprecated',
-    'description' => 'Template file for billing method expiration alerts (i.e. expiring credit cards).',
-    'type'        => 'textarea',
-    'per_agent'   => 1,
-  },
-  
-  {
-    'key'         => 'alerter_msgnum',
-    'section'     => 'deprecated',
-    'description' => 'Template to use for credit card expiration alerts.',
-    %msg_template_options,
-  },
-
-  {
     'key'         => 'part_pkg-lineage',
     'section'     => 'packages',
     'description' => 'When editing a package definition, if setup or recur fees are changed, create a new package rather than changing the existing package.',
@@ -1544,11 +1530,8 @@ and customer address. Include units.',
     'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
     'type'        => 'select',
     'per_agent'   => 1,
-    'select_enum' => [ 
-      '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 5', 'Net 7', 'Net 9', 'Net 10', 'Net 14', 
-      'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45', 
-      'Net 60', 'Net 90'
-    ], },
+    'select_enum' => \@invoice_terms,
+  },
 
   { 
     'key'         => 'invoice_show_prior_due_date',
@@ -3464,13 +3447,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'cust_pkg-always_show_location',
-    'section'     => 'packages',
-    'description' => "Always display package locations, even when they're all the default service address.",
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'cust_pkg-group_by_location',
     'section'     => 'packages',
     'description' => "Group packages by location.",
@@ -3566,13 +3542,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'voip-cust_email_csv_cdr',
-    'section'     => 'deprecated',
-    'description' => 'Deprecated, see voip-cdr_email_attach instead.  Used to enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'voip-cdr_email_attach',
     'section'     => 'telephony',
     'description' => 'Enable the per-customer option for including CDR information as an attachment on emailed invoices.',
@@ -3626,6 +3595,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'invoice-all_pkg_addresses',
+    'section'     => 'invoicing',
+    'description' => 'Show all package addresses on invoices, even the default.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'invoice-unitprice',
     'section'     => 'invoicing',
     'description' => 'Enable unit pricing on invoices and quantities on packages.',
@@ -4195,21 +4171,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'referral_credit_type',
-    'section'     => 'deprecated',
-    'description' => 'Used to be the group to use for new, automatically generated credit reasons resulting from referrals.  Now set in a package billing event for the referral.',
-    reason_type_options('R'),
-  },
-
-  # was only used to negate invoices during signup when card was declined, now we just void
-  {
-    'key'         => 'signup_credit_type',
-    'section'     => 'deprecated', #self-service?
-    'description' => 'The group to use for new, automatically generated credit reasons resulting from signup and self-service declines.',
-    reason_type_options('R'),
-  },
-
-  {
     'key'         => 'prepayment_discounts-credit_type',
     'section'     => 'billing',
     'description' => 'Enables the offering of prepayment discounts and establishes the credit reason type.',
@@ -5155,13 +5116,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'tax-cust_exempt-groups-require_individual_nums',
-    'section'     => 'deprecated',
-    'description' => 'Deprecated: see tax-cust_exempt-groups-number_requirement',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'tax-cust_exempt-groups-num_req',
     'section'     => 'taxation',
     'description' => 'When using tax-cust_exempt-groups, control whether individual tax exemption numbers are required for exemption from different taxes.',
@@ -5538,13 +5492,6 @@ and customer address. Include units.',
   },
   
   {
-    'key'         => 'svc_broadband-require-nw-coordinates',
-    'section'     => 'deprecated',
-    'description' => 'Deprecated; see geocode-require_nw_coordinates instead',
-    'type'        => 'checkbox',
-  },
-  
-  {
     'key'         => 'cust-edit-alt-field-order',
     'section'     => 'customer_fields',
     'description' => 'An alternate ordering of fields for the New Customer and Edit Customer screens.',