[freeside-commits] branch FREESIDE_3_BRANCH updated. def6b8e117f3f470170be6fc62e70911450e0aca

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  def6b8e117f3f470170be6fc62e70911450e0aca (commit)
      from  40a41fd8ce8cbab036e952a56b1bb5d68293c97c (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 def6b8e117f3f470170be6fc62e70911450e0aca
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed May 18 21:48:50 2016 -0500

    RT#42591: OBH Adding Quotation error

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 5e79ae1..6b23149 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1063,7 +1063,7 @@ sub print_generic {
   # start setting up summary subtotals
   my @summary_subtotals;
   my $method = $conf->config('summary_subtotals_method');
-  if ( $method and $method ne $conf->config($tc.'sections_method') ) {
+  if ( ( ref($self) ne 'FS::quotation' ) and $method and $method ne $conf->config($tc.'sections_method') ) {
     # then re-section them by the correct method
     my %section_method = ( by_category => 1 );
     if ( $conf->config('summary_subtotals_method') eq 'location' ) {

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

Summary of changes:
 FS/FS/Template_Mixin.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)