===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- RT/Invoicing/invoice.tex.tt	2011/03/22 01:46:41	1.9
+++ RT/Invoicing/invoice.tex.tt	2011/04/08 18:10:28	1.13
@@ -1,7 +1,8 @@
 [% USE Latex -%]
 [% FILTER latex("pdf") -%]
-% $AFresh1: invoice.tex.tt,v 1.8 2011/03/21 23:21:16 andrew Exp $
+% $AFresh1: invoice.tex.tt,v 1.12 2011/03/22 05:27:12 andrew Exp $
 \documentclass[oneside]{report}
+\usepackage{graphicx}
 \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry}
 \usepackage{multicol}
 \usepackage{fancyhdr}
@@ -9,31 +10,27 @@
 
 \pagestyle{fancy}
 
-\lhead{[% from.name | latex_encode %]}
+\lhead{[% organization | latex_encode %]}
 \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 %] }
+\parbox[t][1.625in]{\linewidth}{\large [% from | latex_encode(except = "\\{}") %] }
 
-\parbox[t][1.5in]{\linewidth}{\Large [% to | latex_encode %] }
+\parbox[t][1.5in]{\linewidth}{\Large [% to | latex_encode(except = "\\{}") %] }
 
 \columnbreak
 
 \begin{flushright}
 
-\begin{tabular}{ | p{3in} | }
-\hline
-LOGO \\
-\hline
-\end{tabular}
+\includegraphics{[% logo %]}
 
 \hfill
 \vfill
@@ -44,10 +41,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 -%]
@@ -57,8 +54,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}