diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/Conf.pm | 17 | ||||
| -rw-r--r-- | FS/FS/Upgrade.pm | 8 | ||||
| -rw-r--r-- | FS/FS/cust_main_note.pm | 3 |
3 files changed, 15 insertions, 13 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 8794bfdcb..d9d43a12a 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -3944,6 +3944,13 @@ and customer address. Include units.', }, { + 'key' => 'cust_main_note-require_class', + 'section' => 'customer_fields', + 'description' => 'Require customer note classes for customer notes', + 'type' => 'checkbox', + }, + + { 'key' => 'cust_main-ticket_statuses', 'section' => 'ticketing', 'description' => 'Show tickets with these statuses on the customer view page.', @@ -5452,10 +5459,14 @@ and customer address. Include units.', { 'key' => 'note-classes', - 'section' => 'customer_fields', - 'description' => 'Use customer note classes', + 'section' => 'deprecated', + 'description' => 'Use customer note classes (now automatically used if classes are defined)', 'type' => 'select', - 'select_enum' => [ '', 'Enabled', 'Required' ], + 'select_hash' => [ + 0 => 'Disabled', + 1 => 'Enabled', + 2 => 'Enabled, with tabs', + ], }, { diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index 05ff8fca6..5a1ac2bce 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -178,14 +178,6 @@ If you need to continue using the old Form 477 report, turn on the $conf->set('cust-fields',$cust_fields); } - #repurposed - $conf->set('note-classes','Enabled') - if $conf->exists('note-classes') - and grep {$_ eq $conf->config('note-classes')} ('1','2'); - $conf->set('note-classes','') - if $conf->exists('note-classes') - and '0' eq $conf->config('note-classes'); - enable_banned_pay_pad() unless length($conf->config('banned_pay-pad')); # if translate-auto-insert is enabled for a locale, ensure that invoice diff --git a/FS/FS/cust_main_note.pm b/FS/FS/cust_main_note.pm index 4c48eb609..2288d7c4e 100644 --- a/FS/FS/cust_main_note.pm +++ b/FS/FS/cust_main_note.pm @@ -120,8 +120,7 @@ sub check { if (!$self->classnum) { my $conf = new FS::Conf; return 'Note class is required' - if $conf->exists('note-classes') - and $conf->config('note-classes') eq 'Required'; + if $conf->exists('cust_main_note-require_class'); } $self->SUPER::check; |