===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RT/Invoicing/invoice.tex.tt	2011/03/20 02:34:42	1.2
+++ RT/Invoicing/invoice.tex.tt	2011/03/20 06:20:11	1.3
@@ -71,9 +71,16 @@
 
 \begin{tabular}{ | r l | }
 \hline
-Invoice No.  & \textbf{[% id | format('%06d') | latex_encode %]} \\
-Invoice Date & \today \\
-Page         & {\thepage} \\
+Invoice No.   & \textbf{[% id | format('%06d') | latex_encode %]} \\
+Invoice Date  & \today \\
+Invoice Total & [% total | format('%.2f') | latex_encode %] \\
+[% IF past_due -%]
+  Past Due    & [% past_due | format('%.2f') | latex_encode %] \\
+[%- END %]
+[%- IF total_due -%]
+  Total Due   & [% total_due | format('%.2f') | latex_encode %] \\
+[%- END %]
+Page          & {\thepage} \\
 \hline
 \multicolumn{2}{|c|}{[% info1 | latex_encode %]} \\
 \multicolumn{2}{|c|}{[% info2 | latex_encode %]} \\
@@ -88,27 +95,24 @@
  [%- FOR p IN projects %]
  \ProjectTitle{[% p.title | latex_encode %]}%
    [%- IF p.detail %]
-    \\\multicolumn{5}{l}{[% p.detail | latex_encode %]}%
+    \\\multicolumn{5}{l}{[% p.detail | latex_encode %]}\\%
    [% END -%]
 
   [%- FOR f IN p.fees %]
    \Fee{[% f.contents | latex_encode %]}{[% f.rate | latex_encode %]}{[% f.count | latex_encode %]}
    [%- IF f.detail %]
-    {\small [% f.detail | latex_encode %]}
+    \multicolumn{5}{l}{\small \textbullet \ [% f.detail | latex_encode %]}\\%
    [% END -%]
   [%- END -%]
   [%- FOR e IN p.expenses %]
    \EBC{[% e.contents | latex_encode %]}{[% e.amount | latex_encode %]}
    [%- IF e.detail %]
-    {\small [% e.detail | latex_encode %]}
+    \multicolumn{5}{l}{\small \textbullet \ [% e.detail | latex_encode %]}\\%
    [% END -%]
   [%- END -%]
-  [%- FOR d IN p.discounts %]
-   \Discount{[% d.contents | latex_encode %]}{[% d.amount | latex_encode %]}
-   [%- IF d.detail %]
-    {\small [% d.detail | latex_encode %]}
-   [% END -%]
-  [%- END -%]
+ [%- END %]
+ [%- IF discount %]
+  \\\Discount{[% discount.contents | latex_encode %]}{[% discount.amount | latex_encode %]}%
  [%- END %]
 \end{invoice}