[freeside-commits] branch FREESIDE_4_BRANCH updated. a93644139befbadd246c758f433811a2f0e9c2a4

[Mitch Jackson]

The branch, FREESIDE_4_BRANCH has been updated
       via  a93644139befbadd246c758f433811a2f0e9c2a4 (commit)
      from  35e572b136e0197043ea159ae28fef3d57aeeec2 (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 a93644139befbadd246c758f433811a2f0e9c2a4
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Sun Apr 15 16:13:21 2018 -0500

    RT# 78190 Fix format bug for invoices sectioned by location

diff --git a/conf/invoice_html b/conf/invoice_html
index d8a2d0a97..935c94346 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -134,7 +134,7 @@
       my $columncount = $unitprices ? 5 : 3;
       foreach my $section ( grep { !$summary || $_->{description} ne $finance_section } @sections ) {
         if ($section->{'pretotal'} && !$summary) {
-          $OUT .= '</table>' if $notfirst;
+          $OUT .= '</table>' if $notfirst++;
           $OUT .=
             '<table width="100%"><tr><td>'.
             '<p align="right"><b><font size="+1">'.
@@ -145,7 +145,10 @@
             '</td></tr>';
         }
         unless ($section->{'summarized'}) {
-          $OUT .= '</table>' if ( $notfirst || $section->{'pretotal'} && !$summary );
+          if ( $notfirst || $section->{'pretotal'} && !$summary ) {
+            $OUT .= '</table>';
+            $notfirst = 1;
+          }
           $OUT .= '<table><tr><td>';
           $OUT .= '<p class="allcaps"><b>';
           my $sectionhead;
@@ -292,9 +295,6 @@
             '<p>';
           $OUT .= '</td></tr>';
         }
-
-        $notfirst++;
-
       }
 
       my $style = 'border-top: 3px solid #000000;';

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

Summary of changes:
 conf/invoice_html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)