invoice cosmetic improvements

2 files changed, 39 insertions, 4 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index 14b25c671..ae6910dba 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -70,6 +70,16 @@
 
   <%=
       foreach my $section ( @sections ) {
+        if ($section->{'pretotal'}) {
+          $OUT .=
+            '<table width="100%"><tr><td>'.
+            '<p align="right"><b><font size="+1">'.
+            uc(substr($section->{'pretotal'},0,1)).
+            '</font><font size="+0">'. uc(substr($section->{'pretotal'},1)).
+            '</font></b>'.
+            '<p>'.
+            '</td></tr></table>';
+        }
         $OUT .= '<table><tr><td>';
         if ($section->{'description'}) {
           $OUT .=
@@ -132,6 +142,16 @@
             '</tr>'
         ;
         }
+
+        if ($section->{'posttotal'}) {
+          $OUT .= '<tr><td align="right" colspan=3>';
+          $OUT .=
+            '<p><font size="+1">'. $section->{'posttotal'}.
+            '</font>'.
+            '<p>';
+          $OUT .= '</td></tr>';
+        }
+
       }
 
       my $style = 'border-top: 3px solid #000000;';
diff --git a/conf/invoice_latex b/conf/invoice_latex
index ece0897da..aadd326c5 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 

 \documentclass[letterpaper]{article}

 

-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}

+\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption}

 \usepackage{graphicx}			% required for logo graphic

 

 \addtolength{\voffset}{-0.0cm}		% top margin to top of header

@@ -35,6 +35,8 @@
 \setlength{\oddsidemargin}{-0.9cm} 	% odd page left margin

 \setlength{\evensidemargin}{-0.9cm} 	% even page left margin

 

+\LTchunksize=40

+

 \renewcommand{\headrulewidth}{0pt}

 \renewcommand{\footrulewidth}{1pt}

 

@@ -188,11 +190,19 @@ Terms: [@-- $terms --@]\\
 \end{minipage}}

 \vspace{1.5cm}

 %

+\section*{}

 [@--

   foreach my $section ( @sections ) {

-    $OUT .= '\section*{\textsc{';

-    $OUT .= ($section->{'description'}) ? $section->{'description'} : 'Charges';

-    $OUT .= '}}\begin{longtable}{cllllllr}';

+    if ($section->{'pretotal'}) {

+      $OUT .= '\begin{flushright}';

+      $OUT .= '\large\textsc{'. $section->{'pretotal'}. '}\\\\';

+      $OUT .= '\\end{flushright}';

+    }

+    $OUT .= '\captionsetup{singlelinecheck=false,justification=raggedright,font={Large,sc,bf}}';

+    $OUT .= '\begin{longtable}{cllllllr}';

+    $OUT .= '\caption*{ ';

+    $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';

+    $OUT .= '}\\\\';

     $OUT .= '\hline';

     $OUT .= '\rule{0pt}{2.5ex}';

     $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';

@@ -256,6 +266,11 @@ Terms: [@-- $terms --@]\\
 

     $OUT .= '\end{longtable}';

 

+    if ($section->{'posttotal'}) {

+      $OUT .= '\begin{flushright}';

+      $OUT .= '\normalfont\large\bfseries\textsc{'. $section->{'posttotal'}. '}\\\\';

+      $OUT .= '\\end{flushright}';

+    }

   }

 

 --@]