X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=f3e2890a128a67d84c20903a5b175a89d3eb0eb3;hb=6981e02e3ba3c08a39faffd09f4a93d680b916ee;hp=9b891879bd1e1ed4fe05bbeadcfed98a218c9eaa;hpb=77daf007ef522ae71041d9b094643cf868d8ecce;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9b891879b..f3e2890a1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1578,11 +1578,20 @@ and customer address. Include units.',
   { 
     'key'         => 'invoice_sections',
     'section'     => 'invoicing',
-    'description' => 'Split invoice into sections and label according to package category when enabled.',
+    'description' => 'Split invoice into sections and label according to either package category or location when enabled.',
     'type'        => 'checkbox',
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'invoice_sections_multilocation',
+    'section'     => 'invoicing',
+    'description' => 'Enable invoice_sections for for any bill with at least this many locations on the bill.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+    'validate'    => sub { shift =~ /^\d+$/ ? undef : 'Please enter a number' },
+  },
+
   { 
     'key'         => 'invoice_include_aging',
     'section'     => 'invoice_balances',
@@ -1599,6 +1608,13 @@ and customer address. Include units.',
   },
 
   {
+    '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',
     'description' => 'How to group line items when calculating summary subtotals.  By default, it will be the same method used for grouping invoice sections.',
@@ -5961,4 +5977,3 @@ and customer address. Include units.',
 );
 
 1;
-