X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=d12a86e452c81d7df09a817f28ca7fc4bbf50428;hb=8fa3c92544cc617ea696dee9dfdce3f9ed6b2c99;hp=3fef424ed657de7e19d97cbb87db950886831204;hpb=6f5ea058941c0acb13b02c86287c54974bd3d59f;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3fef424ed..d12a86e45 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -511,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);
@@ -981,7 +981,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 ) ],
},
{
@@ -996,7 +996,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 ) ],
},
{
@@ -1231,14 +1231,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',
},
@@ -1298,7 +1298,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',
},
@@ -1844,6 +1844,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.',
@@ -1888,7 +1895,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',
},
@@ -3044,7 +3051,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) ],
@@ -3470,13 +3477,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.",
@@ -5037,6 +5037,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.',
@@ -5647,6 +5654,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',