projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3f2ec9
)
RT# 78190 Fix format bug for invoices sectioned by location
author
Mitch Jackson
<mitch@freeside.biz>
Sun, 15 Apr 2018 21:13:21 +0000
(16:13 -0500)
committer
Mitch Jackson
<mitch@freeside.biz>
Mon, 16 Apr 2018 23:37:45 +0000
(23:37 +0000)
conf/invoice_html
patch
|
blob
|
history
diff --git
a/conf/invoice_html
b/conf/invoice_html
index
d8a2d0a
..
935c943
100644
(file)
--- 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) {
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">'.
$OUT .=
'<table width="100%"><tr><td>'.
'<p align="right"><b><font size="+1">'.
@@
-145,7
+145,10
@@
'</td></tr>';
}
unless ($section->{'summarized'}) {
'</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;
$OUT .= '<table><tr><td>';
$OUT .= '<p class="allcaps"><b>';
my $sectionhead;
@@
-292,9
+295,6
@@
'<p>';
$OUT .= '</td></tr>';
}
'<p>';
$OUT .= '</td></tr>';
}
-
- $notfirst++;
-
}
my $style = 'border-top: 3px solid #000000;';
}
my $style = 'border-top: 3px solid #000000;';