From 35c18f29bc29dedfe2fa4ef037390d90b17f87ba Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 6 Mar 2015 14:20:22 -0800
Subject: estimate tax on quotations, #32489

---
 conf/quotation_html  |  4 +++-
 conf/quotation_latex | 18 ++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'conf')

diff --git a/conf/quotation_html b/conf/quotation_html
index a05bb60b8..44164b690 100644
--- a/conf/quotation_html
+++ b/conf/quotation_html
@@ -231,8 +231,10 @@
 
       foreach my $line ( @total_items ) {
 
+        # in the quotation logic, we specifically tag the total line
+        # instead of using "the second one from the bottom"
         $style .= 'border-bottom: 3px solid #000000;'
-          if ++$linenum == scalar(@total_items) - ( $balance_due_below_line ? 1 : 0 );
+          if $line->{break_after};
 
         $OUT .=
           '<tr class="invoice_totaldesc">';
diff --git a/conf/quotation_latex b/conf/quotation_latex
index 7ebc38d75..6aac16075 100644
--- a/conf/quotation_latex
+++ b/conf/quotation_latex
@@ -281,18 +281,16 @@
         }
       }
 
-      #if ($section == $sections[$#sections]) {
-        foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) {
-          if ($section->{total_line_generator}) {
-            $OUT .= &{$section->{total_line_generator}}($line);
-          } else {
-            $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .
-                    '{' . $line->{'total_amount'} . '}' . "\n";
-          }
+      foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) {
+        if ($section->{total_line_generator}) {
+          $OUT .= &{$section->{total_line_generator}}($line);
+        } else {
+          $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .
+                  '{' . $line->{'total_amount'} . '}' . "\n";
+          $OUT .= '\hline' . "\n" if $line->{'break_after'};
         }
-      #}
+      }
 
-      $OUT .= '\hline';
       $OUT .= '\endlastfoot';
 
       my $lastref = 0;
-- 
cgit v1.2.1