X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=ea1d391b1d1425d1d3e33fc7c55e057fdf429a74;hb=8568f687b70154d27c32fe16b0d018420807ded1;hp=6bfe047b9ea6baa76260551620a8a18bf5df6e6a;hpb=068b074adcb3cd0c4d0b39d407c7bb2272a9cade;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6bfe047b9..ea1d391b1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -769,6 +769,13 @@ my $validate_email = sub { $_[0] =~
     'type'        => 'checkbox',
   },
   
+  {
+    'key'         => 'no_saved_cardnumbers',
+    'section'     => 'credit_cards',
+    'description' => 'Do not allow credit card numbers to be written to the database.  Prevents realtime processing unless payment gateway supports tokenization.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'credit-card-surcharge-percentage',
     'section'     => 'credit_cards',
@@ -2185,8 +2192,8 @@ and customer address. Include units.',
 
   {
     'key'         => 'selfservice-payment_gateway',
-    'section'     => 'self-service',
-    'description' => 'Force the use of this payment gateway for self-service.',
+    'section'     => 'deprecated',
+    'description' => '(no longer supported) Force the use of this payment gateway for self-service.',
     %payment_gateway_options,
   },
 
@@ -3930,6 +3937,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cust_main_note-require_class',
+    'section'     => 'customer_fields',
+    'description' => 'Require customer note classes for customer notes',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'cust_main-ticket_statuses',
     'section'     => 'ticketing',
@@ -4426,6 +4440,13 @@ and customer address. Include units.',
                      ],
   },
 
+  {
+    'key'         => 'tax_district_taxname',
+    'section'     => 'taxation',
+    'description' => 'The tax name to display on the invoice for district sales taxes. Defaults to "Tax".',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'company_latitude',
     'section'     => 'taxation',
@@ -5417,10 +5438,14 @@ and customer address. Include units.',
 
   {
     'key'         => 'note-classes',
-    'section'     => 'customer_fields',
-    'description' => 'Use customer note classes',
+    'section'     => 'deprecated',
+    'description' => 'Use customer note classes (now automatically used if classes are defined)',
     'type'        => 'select',
-    'select_enum' => [ '', 'Enabled', 'Required' ],
+    'select_hash' => [
+                       0 => 'Disabled',
+		       1 => 'Enabled',
+		       2 => 'Enabled, with tabs',
+		     ],
   },
 
   {
@@ -5528,14 +5553,6 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'ie-compatibility_mode',
-    'section'     => 'UI',
-    'description' => "Compatibility mode META tag for Internet Explorer, used on the customer view page.  Not necessary in normal operation unless custom content (notes, cust_main-custom_link) is included on customer view that is incompatibile with newer IE verisons.",
-    'type'        => 'select',
-    'select_enum' => [ '', '7', 'EmulateIE7', '8', 'EmulateIE8' ],
-  },
-
   {
     'key'         => 'disable_payauto_default',
     'section'     => 'payments',