X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=cf6e9096059bdb8002c53a7f288f8e9ebe7eef51;hb=2da1326a2ba34b1e322af040b174f24c618dc1a7;hp=10328ce5ef4cd655c387380846d5940ac4489934;hpb=4af73859347d8d56a9552eb4b5ebaffdda14edd2;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 10328ce5e..cf6e90960 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1,7 +1,8 @@
package FS::Conf;
use strict;
-use vars qw( $base_dir @config_items @base_items @card_types $DEBUG
+use vars qw( $base_dir @config_items @base_items @card_types @invoice_terms
+ $DEBUG
$conf_cache $conf_cache_enabled
);
use Carp;
@@ -510,7 +511,7 @@ sub _orbase_items {
'key' => $_,
'base_key' => $proto->key,
'section' => $proto->section,
- 'description' => 'Alternate ' . $proto->description . ' See the billing documentation for details.',
+ 'description' => 'Alternate ' . $proto->description . ' See the billing documentation for details.',
'type' => $proto->type,
};
} &$listmaker($base);
@@ -616,6 +617,14 @@ logo.png
logo.eps
);
+@invoice_terms = (
+ '',
+ 'Payable upon receipt',
+ 'Net 0', 'Net 3', 'Net 5', 'Net 7', 'Net 9', 'Net 10', 'Net 14',
+ 'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45',
+ 'Net 60', 'Net 90'
+);
+
my %msg_template_options = (
'type' => 'select-sub',
'options_sub' => sub {
@@ -737,29 +746,6 @@ my $validate_email = sub { $_[0] =~
},
{
- 'key' => 'alert_expiration',
- 'section' => 'deprecated',
- 'description' => 'Enable alerts about credit card expiration. This is obsolete and no longer works.',
- 'type' => 'checkbox',
- 'per_agent' => 1,
- },
-
- {
- 'key' => 'alerter_template',
- 'section' => 'deprecated',
- 'description' => 'Template file for billing method expiration alerts (i.e. expiring credit cards).',
- 'type' => 'textarea',
- 'per_agent' => 1,
- },
-
- {
- 'key' => 'alerter_msgnum',
- 'section' => 'deprecated',
- 'description' => 'Template to use for credit card expiration alerts.',
- %msg_template_options,
- },
-
- {
'key' => 'part_pkg-lineage',
'section' => 'packages',
'description' => 'When editing a package definition, if setup or recur fees are changed, create a new package rather than changing the existing package.',
@@ -972,7 +958,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'credit_cards',
'description' => 'Currency parameter for Business::OnlinePayment transactions.',
'type' => 'select',
- 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ) ],
+ 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ARS ) ],
},
{
@@ -987,7 +973,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'localization',
'description' => 'Main accounting currency',
'type' => 'select',
- 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ) ],
+ 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ARS ) ],
},
{
@@ -1222,14 +1208,14 @@ my $validate_email = sub { $_[0] =~
{
'key' => 'invoice_template',
'section' => 'invoice_templates',
- 'description' => 'Text template file for invoices. Used if no invoice_html template is defined, and also seen by users using non-HTML capable mail clients. See the billing documentation for details.',
+ 'description' => 'Text template file for invoices. Used if no invoice_html template is defined, and also seen by users using non-HTML capable mail clients. See the billing documentation for details.',
'type' => 'textarea',
},
{
'key' => 'invoice_html',
'section' => 'invoice_templates',
- 'description' => 'HTML template for invoices. See the billing documentation for details.',
+ 'description' => 'HTML template for invoices. See the billing documentation for details.',
'type' => 'textarea',
},
@@ -1289,7 +1275,7 @@ my $validate_email = sub { $_[0] =~
{
'key' => 'invoice_latex',
'section' => 'invoice_templates',
- 'description' => 'Optional LaTeX template for typeset PostScript invoices. See the billing documentation for details.',
+ 'description' => 'Optional LaTeX template for typeset PostScript invoices. See the billing documentation for details.',
'type' => 'textarea',
},
@@ -1544,11 +1530,8 @@ and customer address. Include units.',
'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
'type' => 'select',
'per_agent' => 1,
- 'select_enum' => [
- '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 5', 'Net 7', 'Net 9', 'Net 10', 'Net 14',
- 'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45',
- 'Net 60', 'Net 90'
- ], },
+ 'select_enum' => \@invoice_terms,
+ },
{
'key' => 'invoice_show_prior_due_date',
@@ -1838,6 +1821,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'cust_main-packages-num_per_page',
+ 'section' => 'packages',
+ 'description' => 'Number of packages to display per page on customer view (default 10).',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'disable_maxselect',
'section' => 'reporting',
'description' => 'Prevent changing the number of records per page.',
@@ -1882,7 +1872,7 @@ and customer address. Include units.',
{
'key' => 'signupurl',
'section' => 'signup',
- 'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your signup server CGI, the customer view screen will display a customized link to self-signup with the appropriate customer as referral',
+ 'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your signup server CGI, the customer view screen will display a customized link to self-signup with the appropriate customer as referral',
'type' => 'text',
},
@@ -3038,7 +3028,7 @@ and customer address. Include units.',
{
'key' => 'ticket_system',
'section' => 'ticketing',
- 'description' => 'Ticketing system integration. RT_Internal uses the built-in RT ticketing system (see the integrated ticketing installation instructions). RT_External accesses an external RT installation in a separate database (local or remote).',
+ 'description' => 'Ticketing system integration. RT_Internal uses the built-in RT ticketing system (see the integrated ticketing installation instructions). RT_External accesses an external RT installation in a separate database (local or remote).',
'type' => 'select',
#'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ],
'select_enum' => [ '', qw(RT_Internal RT_External) ],
@@ -3464,13 +3454,6 @@ and customer address. Include units.',
},
{
- 'key' => 'cust_pkg-always_show_location',
- 'section' => 'packages',
- 'description' => "Always display package locations, even when they're all the default service address.",
- 'type' => 'checkbox',
- },
-
- {
'key' => 'cust_pkg-group_by_location',
'section' => 'packages',
'description' => "Group packages by location.",
@@ -3566,13 +3549,6 @@ and customer address. Include units.',
},
{
- 'key' => 'voip-cust_email_csv_cdr',
- 'section' => 'deprecated',
- 'description' => 'Deprecated, see voip-cdr_email_attach instead. Used to enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
- 'type' => 'checkbox',
- },
-
- {
'key' => 'voip-cdr_email_attach',
'section' => 'telephony',
'description' => 'Enable the per-customer option for including CDR information as an attachment on emailed invoices.',
@@ -3626,6 +3602,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'invoice-all_pkg_addresses',
+ 'section' => 'invoicing',
+ 'description' => 'Show all package addresses on invoices, even the default.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'invoice-unitprice',
'section' => 'invoicing',
'description' => 'Enable unit pricing on invoices and quantities on packages.',
@@ -4195,21 +4178,6 @@ and customer address. Include units.',
},
{
- 'key' => 'referral_credit_type',
- 'section' => 'deprecated',
- 'description' => 'Used to be the group to use for new, automatically generated credit reasons resulting from referrals. Now set in a package billing event for the referral.',
- reason_type_options('R'),
- },
-
- # was only used to negate invoices during signup when card was declined, now we just void
- {
- 'key' => 'signup_credit_type',
- 'section' => 'deprecated', #self-service?
- 'description' => 'The group to use for new, automatically generated credit reasons resulting from signup and self-service declines.',
- reason_type_options('R'),
- },
-
- {
'key' => 'prepayment_discounts-credit_type',
'section' => 'billing',
'description' => 'Enables the offering of prepayment discounts and establishes the credit reason type.',
@@ -4989,6 +4957,13 @@ and customer address. Include units.',
# },
{
+ 'key' => 'cdr-skip_duplicate_rewrite',
+ 'section' => 'telephony',
+ 'description' => 'Use the freeside-cdrrewrited daemon to prevent billing CDRs with a src, dst and calldate identical to an existing CDR',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'cdr-charged_party_rewrite',
'section' => 'telephony',
'description' => 'Do charged party rewriting in the freeside-cdrrewrited daemon; useful if CDRs are being dropped off directly in the database and require special charged_party processing such as cdr-charged_party-accountcode or cdr-charged_party-truncate*.',
@@ -5024,6 +4999,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'cdr-userfield_dnis_rewrite',
+ 'section' => 'telephony',
+ 'description' => 'If the CDR userfield contains "DNIS=" followed by a sequence of digits, use that as the destination number for the call.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'cdr-intl_to_domestic_rewrite',
'section' => 'telephony',
'description' => 'Strip the "011" international prefix from CDR destination numbers if the rest of the number is 7 digits or shorter, and so probably does not contain a country code.',
@@ -5155,13 +5137,6 @@ and customer address. Include units.',
},
{
- 'key' => 'tax-cust_exempt-groups-require_individual_nums',
- 'section' => 'deprecated',
- 'description' => 'Deprecated: see tax-cust_exempt-groups-number_requirement',
- 'type' => 'checkbox',
- },
-
- {
'key' => 'tax-cust_exempt-groups-num_req',
'section' => 'taxation',
'description' => 'When using tax-cust_exempt-groups, control whether individual tax exemption numbers are required for exemption from different taxes.',
@@ -5538,13 +5513,6 @@ and customer address. Include units.',
},
{
- 'key' => 'svc_broadband-require-nw-coordinates',
- 'section' => 'deprecated',
- 'description' => 'Deprecated; see geocode-require_nw_coordinates instead',
- 'type' => 'checkbox',
- },
-
- {
'key' => 'cust-edit-alt-field-order',
'section' => 'customer_fields',
'description' => 'An alternate ordering of fields for the New Customer and Edit Customer screens.',
@@ -5634,6 +5602,13 @@ and customer address. Include units.',
'rate_low' => 'Lowest rate first',
],
},
+
+ {
+ 'key' => 'cdr-lrn_lookup',
+ 'section' => 'telephony',
+ 'description' => 'Look up LRNs of destination numbers for exact matching to the terminating carrier. This feature requires a Freeside support contract.',
+ 'type' => 'checkbox',
+ },
{
'key' => 'brand-agent',