[freeside-commits] freeside/conf invoice_latexsummary, 1.1, 1.1.6.1 invoice_htmlsummary, 1.1, 1.1.6.1

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv8348/conf

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	invoice_latexsummary invoice_htmlsummary 
Log Message:
remove double summary listing of svc_phone usage when used with invoice summary, RT12637

Index: invoice_latexsummary
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latexsummary,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -w -d -r1.1 -r1.1.6.1
--- invoice_latexsummary	5 Oct 2009 00:49:33 -0000	1.1
+++ invoice_latexsummary	5 Jun 2011 03:45:31 -0000	1.1.6.1
@@ -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'}. '}\\\\';
   }

Index: invoice_htmlsummary
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_htmlsummary,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -w -d -r1.1 -r1.1.6.1
--- invoice_htmlsummary	5 Oct 2009 00:49:33 -0000	1.1
+++ invoice_htmlsummary	5 Jun 2011 03:45:31 -0000	1.1.6.1
@@ -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>";