[freeside-commits] branch master updated. fc7539c3b8a0ae3326df9f47e924e36de3ef2cfe

Ivan ivan at 420.am
Tue Mar 19 19:46:48 PDT 2013


The branch, master has been updated
       via  fc7539c3b8a0ae3326df9f47e924e36de3ef2cfe (commit)
      from  5528f6bb00a3a7aa69b14acff8456c73edff50de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc7539c3b8a0ae3326df9f47e924e36de3ef2cfe
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 19 19:46:45 2013 -0700

    fix quotations vs invoice_sections, RT#21103

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index fbac011..a676e66 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1529,8 +1529,18 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Split invoice into sections and label according to package category when enabled.',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
+  #quotations seem broken-ish with sections ATM?
+  #{ 
+  #  'key'         => 'quotation_sections',
+  #  'section'     => 'invoicing',
+  #  'description' => 'Split quotations into sections and label according to package category when enabled.',
+  #  'type'        => 'checkbox',
+  #  'per_agent'   => 1,
+  #},
+
   { 
     'key'         => 'usage_class_as_a_section',
     'section'     => 'invoicing',
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index b645b6e..e3958a4 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -737,7 +737,7 @@ sub print_generic {
   $adjust_section->{'sort_weight'} = $adjust_weight;
 
   my $unsquelched = $params{unsquelch_cdr} || $cust_main->squelch_cdr ne 'Y';
-  my $multisection = $conf->exists('invoice_sections', $cust_main->agentnum);
+  my $multisection = $conf->exists($tc.'_sections', $cust_main->agentnum);
   $invoice_data{'multisection'} = $multisection;
   my $late_sections = [];
   my $extra_sections = [];

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm           |   10 ++++++++++
 FS/FS/Template_Mixin.pm |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)




More information about the freeside-commits mailing list