X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=721b7bdf9ee207c668a5140f7a851b528274d6b4;hb=ec34b8903d969fe8ac4ff6947a92e16e07f71fa0;hp=ed72354ddb01fcdb08c86406205ed868ff0311f3;hpb=6f94e176aa7b143eb9f1fa5c3a1cdd362361636f;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ed72354dd..721b7bdf9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1546,7 +1546,7 @@ and customer address. Include units.',
   { 
     'key'         => 'invoice_default_terms',
     'section'     => 'invoicing',
-    'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
+    'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.  WARNING: If you do not want to change the terms on existing invoices, do not change this after going live.',
     'type'        => 'select',
     'per_agent'   => 1,
     'select_enum' => \@invoice_terms,
@@ -1598,6 +1598,13 @@ and customer address. Include units.',
     'select_enum' => [ qw(category location) ],
   },
 
+  {
+    'key'         => 'invoice_sections_with_taxes',
+    'section'     => 'invoicing',
+    'description' => 'Include taxes within each section of mutli-section invoices.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'summary_subtotals_method',
     'section'     => 'invoicing',
@@ -2752,13 +2759,6 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'manual_process-single_invoice_amount',
-    'section'     => 'payments',
-    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
-    'type'        => 'checkbox',
-  },
-
   {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'payments',
@@ -5968,4 +5968,3 @@ and customer address. Include units.',
 );
 
 1;
-