X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=c7bcb28b04f9307134b95dd8c4255dd689f003f0;hb=9199477fb4ab87db98f5a8eb2ee6a051508293a5;hp=b8c349d6516db5ed48250b334a3539c52b8e1683;hpb=6f2740eb64792d8273963b5252f582e270661057;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b8c349d65..c7bcb28b0 100644
--- 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',
@@ -2048,6 +2063,14 @@ and customer address. Include units.',
     'description' => 'Template to use for welcome messages when a svc_acct record is created.',
     %msg_template_options,
   },
+  
+  {
+    'key'         => 'svc_acct_welcome_exclude',
+    'section'     => 'notification',
+    'description' => 'A list of svc_acct services for which no welcome email is to be sent.',
+    'type'        => 'select-part_svc',
+    'multiple'    => 1,
+  },
 
   {
     'key'         => 'welcome_email',
@@ -2634,6 +2657,14 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'company_phonenum',
+    'section'     => 'notification',
+    'description' => 'Your company phone number',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
+  {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',
     'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
@@ -3932,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.',
@@ -4319,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" },