X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=3d7ffe7cd391d4ea53ef23361568b9fc054ece3e;hb=6039166baf177b99594832363a955d6d70b4037a;hp=54a9ca392eceaca28afc3c7bc5e3bb40ccd9bdf6;hpb=38c49e73b24608ef28ef8086410d5e594d56f0c4;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 54a9ca392..3d7ffe7cd 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1114,7 +1114,7 @@ sub reason_type_options {
{
'key' => 'unapplycredits',
'section' => 'deprecated',
- 'description' => 'DEPRECATED, now controlled by ACLs. Used to nable "unapplication" of unclosed credits.',
+ 'description' => 'DEPRECATED, now controlled by ACLs. Used to enable "unapplication" of unclosed credits.',
'type' => 'checkbox',
},
@@ -1527,6 +1527,13 @@ and customer address. Include units.',
'type' => 'checkbox',
},
+ {
+ 'key' => 'invoice_print_pdf-duplex',
+ 'section' => 'invoicing',
+ 'description' => 'Insert blank pages so that spooled invoices are each an even number of pages. Use this for double-sided printing.',
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'invoice_default_terms',
'section' => 'invoicing',
@@ -1561,11 +1568,19 @@ and customer address. Include units.',
},
{
- 'key' => 'invoice_sections_by_location',
+ 'key' => 'invoice_sections_method',
'section' => 'invoicing',
- 'description' => 'Divide invoice into sections according to service location. Currently, this overrides sectioning by package category.',
- 'type' => 'checkbox',
- 'per_agent' => 1,
+ 'description' => 'How to group line items on multi-section invoices.',
+ 'type' => 'select',
+ 'select_enum' => [ qw(category location) ],
+ },
+
+ {
+ 'key' => 'summary_subtotals_method',
+ 'section' => 'invoicing',
+ 'description' => 'How to group line items when calculating summary subtotals. By default, it will be the same method used for grouping invoice sections.',
+ 'type' => 'select',
+ 'select_enum' => [ qw(category location) ],
},
#quotations seem broken-ish with sections ATM?
@@ -3464,13 +3479,6 @@ and customer address. Include units.',
'type' => 'checkbox',
},
- {
- 'key' => 'cust_pkg-show_fcc_voice_grade_equivalent',
- 'section' => 'UI',
- 'description' => "Show fields on package definitions for FCC Form 477 classification",
- 'type' => 'checkbox',
- },
-
{
'key' => 'cust_pkg-large_pkg_size',
'section' => 'UI',
@@ -3485,6 +3493,13 @@ and customer address. Include units.',
'type' => 'checkbox',
},
+ {
+ 'key' => 'part_pkg-show_fcc_options',
+ 'section' => 'UI',
+ 'description' => "Show fields on package definitions for FCC Form 477 classification",
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'svc_acct-edit_uid',
'section' => 'shell',
@@ -5755,9 +5770,17 @@ and customer address. Include units.',
'type' => 'select',
'select_hash' => [ '' => 'NANPA (US/Canada)',
'AU' => 'Australia',
+ 'NZ' => 'New Zealand',
],
},
+ {
+ 'key' => 'old_fcc_report',
+ 'section' => '',
+ 'description' => 'Use the old (pre-2014) FCC Form 477 report format.',
+ '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" },