===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -r1.4 -r1.11
--- RT/Invoicing/invoice.tex.tt	2011/03/21 04:19:25	1.4
+++ RT/Invoicing/invoice.tex.tt	2011/03/22 05:48:19	1.11
@@ -1,6 +1,6 @@
 [% USE Latex -%]
 [% FILTER latex("pdf") -%]
-% $AFresh1: invoice.tex.tt,v 1.3 2011/03/20 05:20:11 andrew Exp $
+% $AFresh1: invoice.tex.tt,v 1.10 2011/03/22 03:21:30 andrew Exp $
 \documentclass[oneside]{report}
 \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry}
 \usepackage{multicol}
@@ -13,49 +13,18 @@
 \chead{Invoice \#\textbf{[% id | format('%06d') | latex_encode %]}}
 \rhead{Page {\thepage}}
 
-\lfoot{[% info.0 | latex_encode %]}
+\lfoot{[% info.0 | latex_encode(except = "\\{}") %]}
 \cfoot{}
-\rfoot{[% info.1 | latex_encode %]}
+\rfoot{[% info.1 | latex_encode(except = "\\{}") %]}
 
 \begin{document}
 \thispagestyle{empty}
-
+\vspace*{-.75in}
 \begin{multicols}{2}
+\parbox[t][1.625in]{\linewidth}{\large [% from | latex_encode(except = "\\{}") %] }
 
-{\large
-[% from.name | latex_encode %]
+\parbox[t][1.5in]{\linewidth}{\Large [% to | latex_encode(except = "\\{}") %] }
 
-[% IF from.attn -%]
-    [% from.attn | latex_encode %]
-
-[% END -%]
-[% from.addr1 | latex_encode %]
-
-[% IF from.addr2 -%]
-    [% from.addr2 | latex_encode %]
-
-[% END -%]
-[% from.city | latex_encode %], [% from.state | latex_encode %] \ [% from.zip | latex_encode %]
-}
-
-\vspace{.75in}
-
-{\Large
-[% to.name | latex_encode %]
-
-[% IF to.attn -%]
-    [% to.attn | latex_encode %] 
-
-[% END -%]
-[% to.addr1 | latex_encode %]
-
-[% IF to.addr2 -%]
-    [% to.addr2 | latex_encode %]
-
-[% END -%]
-[% to.city | latex_encode %], [% to.state | latex_encode %] \ [% to.zip | latex_encode %]
-}
-
 \columnbreak
 
 \begin{flushright}
@@ -75,21 +44,21 @@
 %Page          & {\thepage} \\
 Invoice Date  & \today \\
 [%- IF start %]
-    Start & [% start | latex_encode %] \\
+    From & [% start | latex_encode %] \\
 [%- END %]
 [%- IF end- %]
-    End & [% end | latex_encode %] \\
+    Through & [% end | latex_encode %] \\
 [%- END %]
-Invoice Total & [% total | format('%.2f') | latex_encode %] \\
+Invoice Total & [% total | format('$%.2f') | latex_encode %] \\
 [% IF past_due -%]
-  Past Due    & [% past_due | format('%.2f') | latex_encode %] \\
+  Past Due    & [% past_due | format('$%.2f') | latex_encode %] \\
 [%- END %]
 [%- IF total_due -%]
-  Total Due   & [% total_due | format('%.2f') | latex_encode %] \\
+  Total Due   & [% total_due | format('$%.2f') | latex_encode %] \\
 [%- END %]
 \hline
-\multicolumn{2}{|c|}{[% info.0 | latex_encode %]} \\
-\multicolumn{2}{|c|}{[% info.1 | latex_encode %]} \\
+\multicolumn{2}{|c|}{[% info.0 | latex_encode(except = "\\{}") %]} \\
+\multicolumn{2}{|c|}{[% info.1 | latex_encode(except = "\\{}") %]} \\
 \hline
 \end{tabular}
 
@@ -98,28 +67,33 @@
 \end{multicols}
 
 \begin{invoice}{USD}{0}
- [%- FOR p IN projects %]
+
+[%- FOR p IN projects %]
  \ProjectTitle{[% p.title | latex_encode %]}%
-   [%- IF p.detail %]
-    \\\multicolumn{5}{l}{[% p.detail | latex_encode %]}\\%
-   [% END -%]
+  [%- IF p.detail %]
+   \\\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 %]}
+   \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 | latex_encode %]}{[% e.amount | latex_encode %]}
+   \EBC{[% e.contents | latex_encode %]}{[% e.amount | latex_encode %]}%
    [%- IF e.detail %]
     \multicolumn{5}{l}{\small \textbullet \ [% e.detail | latex_encode %]}\\%
    [% END -%]
   [%- END -%]
- [%- END %]
- [%- IF discount %]
-  \\\Discount{[% discount.contents | latex_encode %]}{[% discount.amount | latex_encode %]}%
- [%- END %]
+
+[%- END # projects %]
+
+[%- IF discount %]
+  \\\Discount{[% discount.contents | latex_encode %]}{[% discount.amount | latex_encode %]}\\%
+[%- END %]
+
 \end{invoice}
 
 \end{document}