X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=47eccf837d71b06d991048949487c4afb0fb3938;hb=b3cc20aeca25e4351c6ec3b795a951e6124f6376;hp=f280c7fc1b8a58c0ae78a81b4937dd0fca5e8806;hpb=a16891c16e0ddd389b32963b638cdfeadf86c447;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f280c7fc1..47eccf837 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1967,10 +1967,13 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'unsuspendauto',
+    'key'         => 'unsuspend_balance',
     'section'     => 'billing',
-    'description' => 'Enables the automatic unsuspension of suspended packages when a customer\'s balance due changes from positive to zero or negative as the result of a payment or credit',
-    'type'        => 'checkbox',
+    'description' => 'Enables the automatic unsuspension of suspended packages when a customer\'s balance due is at or below the specified amount after a payment or credit',
+    'type'        => 'select',
+    'select_enum' => [ 
+      '', 'Zero', 'Latest invoice charges'
+    ],
   },
 
   {
@@ -3169,7 +3172,7 @@ and customer address. Include units.',
   {
     'key'         => 'ticket_system-appointment-queueid',
     'section'     => 'ticketing',
-    'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+    'description' => 'Ticketing queue to use for appointments.',
     #false laziness w/above
     'type'        => 'select-sub',
     'options_sub' => sub {
@@ -3197,7 +3200,7 @@ and customer address. Include units.',
   {
     'key'         => 'ticket_system-appointment-custom_field',
     'section'     => 'ticketing',
-    'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+    'description' => 'Ticketing custom field to use as an appointment classification.',
     'type'        => 'text',
   },
 
@@ -3939,13 +3942,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'cust_main-enable_order_package',
-    'section'     => 'UI',
-    'description' => 'Display order new package on the basic tab',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'cust_main-edit_calling_list_exempt',
     'section'     => 'UI',
     'description' => 'Display the "calling_list_exempt" checkbox on customer edit.',
@@ -4050,10 +4046,10 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'password-generated-allcaps',
+    'key'         => 'password-generated-characters',
     'section'     => 'password',
-    'description' => 'Causes passwords automatically generated to consist entirely of capital letters',
-    'type'        => 'checkbox',
+    'description' => 'Set of characters to use when generating random passwords. This must contain at least one lowercase letter, uppercase letter, digit, and punctuation mark.',
+    'type'        => 'textarea',
   },
 
 #  {