X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=302bae72c605a6b7b3fe23ee9ae37c27a349f795;hb=6941a2c5684a7483dbdfe6afa50af3633b6dbddb;hp=76ba30664722246f18abd77e9f156e2a3c22fc96;hpb=352c40dffca003ef8212333ab22d14faaf8830ce;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 76ba30664..302bae72c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -788,6 +788,14 @@ my $validate_email = sub { $_[0] =~
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'credit-card-surcharge-text',
+    'section'     => 'credit_cards',
+    'description' => 'Text for the credit card surcharge invoice line.  If not set, it will default to Credit Card Surcharge.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'discount-show-always',
     'section'     => 'invoicing',
@@ -2169,7 +2177,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'unmask_ss',
-    'section'     => 'e-checks',
+    'section'     => 'deprecated',
     'description' => "Don't mask social security numbers in the web interface.",
     'type'        => 'checkbox',
   },
@@ -2787,6 +2795,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'manual_process-single_invoice_amount',
+    'section'     => 'deprecated',
+    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'payments',