X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=e4f581961817b09da5d5a7f851b5f774f312ecf1;hp=6bfe047b9ea6baa76260551620a8a18bf5df6e6a;hb=f675734f1eda5b39f891a6fc8f2f29cbd2e36c35;hpb=511c1f635c1c64c90a7ae882730504f145c8a09c

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6bfe047b9..e4f581961 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3931,6 +3931,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.',
@@ -5417,10 +5424,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',
+		     ],
   },
 
   {