X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=43e7aaa3de092d22049b8adc5a8f85e432b3ff5b;hb=3714fa41c5306981c9f500df13eea52c72d82545;hp=6ea5a51eb9d6a85a6d9baa8a6ec1a4bdf1ac65a1;hpb=2bdc70cd2805eb4299c7e5b26b9e9c455654b27f;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6ea5a51eb..43e7aaa3d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1318,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',
@@ -2658,6 +2666,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' => 'DEPRECATED, now controlled by ACLs. Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
@@ -3956,12 +3972,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.',
@@ -4364,6 +4387,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 => "DEPRECATED", type => "text" },
{ key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" },
{ key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" },