diff options
| author | levinse <levinse> | 2011-06-05 03:45:30 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-06-05 03:45:30 +0000 |
| commit | 76a1ecdb1b69fa83a8385adc4a50ac243096c994 (patch) | |
| tree | e8f19ece062d92ae2b0421ffce35b6abfd92fabb /conf | |
| parent | db303b2cb273b45e03467f36e076b7c1db3bc4a4 (diff) | |
remove double summary listing of svc_phone usage when used with invoice summary, RT12637
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_htmlsummary | 4 | ||||
| -rw-r--r-- | conf/invoice_latexsummary | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/invoice_htmlsummary b/conf/invoice_htmlsummary index b158478..a06c8ff 100644 --- a/conf/invoice_htmlsummary +++ b/conf/invoice_htmlsummary @@ -32,9 +32,9 @@ </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>"; diff --git a/conf/invoice_latexsummary b/conf/invoice_latexsummary index a181ee4..4e4f62b 100644 --- a/conf/invoice_latexsummary +++ b/conf/invoice_latexsummary @@ -21,7 +21,7 @@ \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'}. '}\\\\'; } |