Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / Conf.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e4f5819..ea1d391 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -769,6 +769,13 @@ my $validate_email = sub { $_[0] =~
     'type'        => 'checkbox',
   },
   
     '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',
   {
     'key'         => 'credit-card-surcharge-percentage',
     'section'     => 'credit_cards',


@@ -2185,8 +2192,8 @@ and customer address. Include units.',
 
   {
     'key'         => 'selfservice-payment_gateway',
 
   {
     '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,
   },
 
     %payment_gateway_options,
   },
 


@@ -4433,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',
   {
     'key'         => 'company_latitude',
     'section'     => 'taxation',


@@ -5539,14 +5553,6 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     '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',
   {
     'key'         => 'disable_payauto_default',
     'section'     => 'payments',