[freeside-commits] freeside/conf invoice_html, 1.40, 1.41 invoice_latex, 1.47, 1.48

[Mark Wells]

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

Modified Files:
	invoice_html invoice_latex 
Log Message:
show available term discounts on invoice, #14210

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -w -d -r1.47 -r1.48
--- invoice_latex	15 Sep 2011 10:18:52 -0000	1.47
+++ invoice_latex	1 Oct 2011 02:25:05 -0000	1.48
@@ -272,7 +272,7 @@
       $OUT .= '\endfoot';
       $OUT .= '\hline';
 
-      if (scalar(@sections) > 1) {
+      if (scalar(@sections) > 1 and !$section->{no_subtotal}) {
         if ($section->{total_generator}) {
           $OUT .= &{$section->{total_generator}}($section);
         } else {

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -d -r1.40 -r1.41
--- invoice_html	15 Sep 2011 10:18:52 -0000	1.40
+++ invoice_html	1 Oct 2011 02:25:05 -0000	1.41
@@ -191,7 +191,7 @@
           }
 
 
-          if ($section->{'description'} || $multisection) {
+          if ($section->{'description'} || $multisection and !$section->{no_subtotal}) {
             my $style = 'border-top: 3px solid #000000;'.
                         'border-bottom: 3px solid #000000;';
             $OUT .=