X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=fda199e00bfe05cf0819b01e0f7c5092500ecc86;hb=4da3c98f2f021ac48b195dd205bdbb85dc5b58b9;hp=7dbc2ebf21a4eb3efe52118627b80b427db9b0f1;hpb=5a0e11b8136c2138b8044c3d1343b9ae4fafd38c;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7dbc2ebf2..fda199e00 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1752,7 +1752,7 @@ and customer address. Include units.',
   {
     'key'         => 'passwordmax',
     'section'     => 'password',
-    'description' => 'Maximum password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)',
+    'description' => 'Maximum password length (default 12) (don\'t set this over 12 if you need to import or export crypt() passwords)',
     'type'        => 'text',
   },
 
@@ -2617,7 +2617,7 @@ and customer address. Include units.',
     'type'        => 'select',
     'select_hash' => [
                        'actual_oncard' => 'Default/classic behavior: set the flag if a customer has actual previous charges on the card.',
-		       'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
+		       'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, regardless of previous charges on the card.',
                      ],
   },
 
@@ -3970,13 +3970,6 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
-  {
-    'key'         => 'enable_fuzzy_on_exact',
-    'section'     => 'UI',
-    'description' => 'Enable approximate customer searching even when an exact match is found.',
-    'type'        => 'checkbox',
-  },
-
   { 'key'         => 'pkg_referral',
     'section'     => '',
     'description' => 'Enable package-specific advertising sources.',
@@ -5172,6 +5165,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'tax-round_per_line_item',
+    'section'     => 'billing',
+    'description' => 'Calculate tax and round to the nearest cent for each line item, rather than for the whole invoice.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_main-default_view',
     'section'     => 'UI',
     'description' => 'Default customer view, for users who have not selected a default view in their preferences.',