X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=0808c3885bad5fb17731ef142005956397eb925a;hb=ba6079dc54bdec02fd3a83396a8430ad095ee2d3;hp=8e07c72bb255aecee0c11edab9215d6543299e1d;hpb=932a41248987b59d271994a209545280ef38498e;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8e07c72bb..0808c3885 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4179,6 +4179,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'cust_main_note-require_class',
+    'section'     => 'UI',
+    'description' => 'Require customer note classes for customer notes',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_main-ticket_statuses',
     'section'     => 'UI',
     'description' => 'Show tickets with these statuses on the customer view page.',
@@ -5744,10 +5751,14 @@ and customer address. Include units.',
 
   {
     'key'         => 'note-classes',
-    'section'     => 'UI',
-    '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',
+		     ],
   },
 
   {