===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -r1.8 -r1.11
--- RT/Invoicing/invoice.tex.tt	2011/03/22 00:21:16	1.8
+++ 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.6 2011/03/21 04:25:44 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,57 +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.name | latex_encode %]
+\parbox[t][1.625in]{\linewidth}{\large [% from | latex_encode(except = "\\{}") %] }
 
-[% IF from.attn -%]
-    [% from.attn | latex_encode %]
+\parbox[t][1.5in]{\linewidth}{\Large [% to | latex_encode(except = "\\{}") %] }
 
-[% 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 %]
-
-[% IF from.email -%]
-    [% from.email | latex_encode %]
-
-[% END -%]
-}
-
-\parbox[t][1.5in]{\linewidth}{\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 %]
-[% IF to.email -%]
-    [% to.email | latex_encode %]
-
-[% END -%]
-}
-
 \columnbreak
 
 \begin{flushright}
@@ -83,10 +44,10 @@
 %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 %] \\
 [% IF past_due -%]
@@ -96,8 +57,8 @@
   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}