add config option to disable auto-application of credits to invoices, RT12331

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d9ced6c..c7bcb28 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -653,6 +653,13 @@ my %payment_gateway_options = (
     'description' => 'IP address to assign to new virtual hosts',
     'type'        => 'text',
   },
+  
+  {
+    'key'         => 'credits-auto-apply-disable',
+    'section'     => 'billing',
+    'description' => 'Disable the "Auto-Apply to invoices" UI option for new credits',
+    'type'        => 'checkbox',
+  },
 
   {
     'key'         => 'discount-show-always',
@@ -1311,6 +1318,14 @@ and customer address. Include units.',
     'description' => 'Template to use for payment receipts.',
     %msg_template_options,
   },
+  
+  {
+    'key'         => 'payment_receipt_from',
+    'section'     => 'notification',
+    'description' => 'From: address for payment receipts, if not specified in the template.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
 
   {
     'key'         => 'payment_receipt_email',
@@ -3948,12 +3963,19 @@ and customer address. Include units.',
 
   {
     'key'         => 'cdr-taqua-da_rewrite',
-    'section'     => '',
+    'section'     => 'telephony',
     'description' => 'For the Taqua CDR format, a comma-separated list of directory assistance 800 numbers.  Any CDRs with these numbers as "BilledNumber" will be rewritten to the "CallingPartyNumber" (and CallType "12") on import.',
     'type'        => 'text',
   },
 
   {
+    'key'         => 'cdr-taqua-accountcode_rewrite',
+    'section'     => 'telephony',
+    'description' => 'For the Taqua CDR format, pull accountcodes from secondary CDRs with matching sessionNumber.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_pkg-show_autosuspend',
     'section'     => 'UI',
     'description' => 'Show package auto-suspend dates.  Use with caution for now; can slow down customer view for large insallations.',
@@ -4335,6 +4357,14 @@ and customer address. Include units.',
     'select_enum' => [ '', '7', 'EmulateIE7', '8', 'EmulateIE8' ],
   },
 
+  {
+    'key'         => 'disable_payauto_default',
+    'section'     => 'UI',
+    'description' => 'Disable the "Charge future payments to this (card|check) automatically" checkbox from defaulting to checked.',
+    'type'        => 'checkbox',
+  },
+
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },