===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.1
retrieving revision 1.8
diff -u -r1.1 -r1.8
--- RT/Invoicing/invoice.tex.tt	2011/03/19 23:27:16	1.1
+++ RT/Invoicing/invoice.tex.tt	2011/03/22 00:21:16	1.8
@@ -1,6 +1,6 @@
 [% USE Latex -%]
 [% FILTER latex("pdf") -%]
-% $AFresh1$
+% $AFresh1: invoice.tex.tt,v 1.6 2011/03/21 04:25:44 andrew Exp $
 \documentclass[oneside]{report}
 \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry}
 \usepackage{multicol}
@@ -9,51 +9,59 @@
 
 \pagestyle{fancy}
 
-\lhead{[% from.name %]}
-\chead{Invoice \#\textbf{[% id | format('%06d') %]}}
+\lhead{[% from.name | latex_encode %]}
+\chead{Invoice \#\textbf{[% id | format('%06d') | latex_encode %]}}
 \rhead{Page {\thepage}}
 
-\lfoot{[% info1 %]}
+\lfoot{[% info.0 | latex_encode %]}
 \cfoot{}
-\rfoot{[% info2 %]}
+\rfoot{[% info.1 | latex_encode %]}
 
 \begin{document}
 \thispagestyle{empty}
-
+\vspace*{-.75in}
 \begin{multicols}{2}
+\parbox[t][1.625in]{\linewidth}{\large
+[% from.name | latex_encode %]
 
-{\large
-[% from.name %]
-
 [% IF from.attn -%]
-    [% from.attn %]
+    [% from.attn | latex_encode %]
 
 [% END -%]
-[% from.addr1 %]
+[% from.addr1 | latex_encode %]
 
 [% IF from.addr2 -%]
-    [% from.addr2 %]
+    [% from.addr2 | latex_encode %]
 
 [% END -%]
-[% from.city %], [% from.state %] \ [% from.zip %]
-}
+[% from.city | latex_encode %], 
+[% from.state | latex_encode %] \ [% from.zip | latex_encode %]
 
-\vspace{.75in}
+[% IF from.email -%]
+    [% from.email | latex_encode %]
 
-{\Large
-[% to.name %]
+[% END -%]
+}
 
+\parbox[t][1.5in]{\linewidth}{\Large
+[% to.name | latex_encode %]
+
 [% IF to.attn -%]
-    [% to.attn %] 
+    [% to.attn | latex_encode %] 
 
 [% END -%]
-[% to.addr1 %]
+[% to.addr1 | latex_encode %]
 
 [% IF to.addr2 -%]
-    [% to.addr2 %]
+    [% to.addr2 | latex_encode %]
 
 [% END -%]
-[% to.city %], [% to.state %] \ [% to.zip %]
+[% to.city | latex_encode %], 
+[% to.state | latex_encode %] \ [% to.zip | latex_encode %]
+[% IF to.email -%]
+    [% to.email | latex_encode %]
+
+[% END -%]
 }
 
 \columnbreak
@@ -71,12 +79,25 @@
 
 \begin{tabular}{ | r l | }
 \hline
-Invoice No.  & \textbf{[% id | format('%06d') %]} \\
-Invoice Date & \today \\
-Page         & {\thepage} \\
+Invoice No.   & \textbf{[% id | format('%06d') | latex_encode %]} \\
+%Page          & {\thepage} \\
+Invoice Date  & \today \\
+[%- IF start %]
+    Start & [% start | latex_encode %] \\
+[%- END %]
+[%- IF end- %]
+    End & [% end | latex_encode %] \\
+[%- END %]
+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 %]
 \hline
-\multicolumn{2}{|c|}{[% info1 %]} \\
-\multicolumn{2}{|c|}{[% info2 %]} \\
+\multicolumn{2}{|c|}{[% info.0 | latex_encode %]} \\
+\multicolumn{2}{|c|}{[% info.1 | latex_encode %]} \\
 \hline
 \end{tabular}
 
@@ -85,18 +106,33 @@
 \end{multicols}
 
 \begin{invoice}{USD}{0}
- [%- FOR p IN projects %]
- \ProjectTitle{[% p.title %]}
+
+[%- FOR p IN projects %]
+ \ProjectTitle{[% p.title | latex_encode %]}%
+  [%- IF p.detail %]
+   \\\multicolumn{5}{l}{[% p.detail | latex_encode %]}\\%
+  [% END -%]
+
   [%- FOR f IN p.fees %]
-   \Fee{[% f.contents %]}{[% f.rate %]}{[% f.count %]}
+   \Fee{[% f.contents | latex_encode %]}{[% f.rate | latex_encode %]}{[% f.count | latex_encode %]}%
+   [%- IF f.detail %]
+    \multicolumn{5}{l}{\small \textbullet \ [% f.detail | latex_encode %]}\\%
+   [% END -%]
   [%- END -%]
+
   [%- FOR e IN p.expenses %]
-   \EBC{[% e.contents %]}{[% e.amount %]}
+   \EBC{[% e.contents | latex_encode %]}{[% e.amount | latex_encode %]}%
+   [%- IF e.detail %]
+    \multicolumn{5}{l}{\small \textbullet \ [% e.detail | latex_encode %]}\\%
+   [% END -%]
   [%- END -%]
-  [%- FOR d IN p.discounts %]
-   \Discount{[% d.contents %]}{[% d.amount %]}
-  [%- END -%]
- [%- END %]
+
+[%- END # projects %]
+
+[%- IF discount %]
+  \\\Discount{[% discount.contents | latex_encode %]}{[% discount.amount | latex_encode %]}\\%
+[%- END %]
+
 \end{invoice}
 
 \end{document}