projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
db303b2
)
remove double summary listing of svc_phone usage when used with invoice summary,...
author
levinse
<levinse>
Sun, 5 Jun 2011 03:45:30 +0000
(
03:45
+0000)
committer
levinse
<levinse>
Sun, 5 Jun 2011 03:45:30 +0000
(
03:45
+0000)
conf/invoice_htmlsummary
patch
|
blob
|
history
conf/invoice_latexsummary
patch
|
blob
|
history
diff --git
a/conf/invoice_htmlsummary
b/conf/invoice_htmlsummary
index
b158478
..
a06c8ff
100644
(file)
--- a/
conf/invoice_htmlsummary
+++ b/
conf/invoice_htmlsummary
@@
-32,9
+32,9
@@
</tr>
<tr><td colspan=2><br></td></tr>
<%=
</tr>
<tr><td colspan=2><br></td></tr>
<%=
- my ($last) = grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)} reverse @sections;
+ my ($last) = grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)
and $_->{'description'} !~ /^\d+ $/
} reverse @sections;
- foreach my $section ( grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)} @sections ) {
+ foreach my $section ( grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)
and $_->{'description'} !~ /^\d+ $/
} @sections ) {
$OUT .= '<tr><td><b>'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '</b></td>';
my $celltype = ($last == $section) ? 'th' : 'td';
$OUT .= qq(<$celltype align="right"><b>). $section->{'subtotal'}. "</b></$celltype></tr>";
$OUT .= '<tr><td><b>'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '</b></td>';
my $celltype = ($last == $section) ? 'th' : 'td';
$OUT .= qq(<$celltype align="right"><b>). $section->{'subtotal'}. "</b></$celltype></tr>";
diff --git
a/conf/invoice_latexsummary
b/conf/invoice_latexsummary
index
a181ee4
..
4e4f62b
100644
(file)
--- a/
conf/invoice_latexsummary
+++ b/
conf/invoice_latexsummary
@@
-21,7
+21,7
@@
\textbf{\underline{Summary of New Charges}} & \\
&\\
[@--
\textbf{\underline{Summary of New Charges}} & \\
&\\
[@--
- foreach my $section ( grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)} @sections ) {
+ foreach my $section ( grep { $_->{tax_section} || !$_->{summarized} and !($finance_section && $_->{'description'} eq $finance_section)
and $_->{'description'} !~ /^\d+ $/
} @sections ) {
$OUT .= '\textbf{'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '}';
$OUT .= '&\textbf{'. $section->{'subtotal'}. '}\\\\';
}
$OUT .= '\textbf{'. ($section->{'description'} ? $section->{'description'} : 'Charges' ). '}';
$OUT .= '&\textbf{'. $section->{'subtotal'}. '}\\\\';
}