===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RT/Invoicing/invoice.tex.tt	2011/03/22 00:21:16	1.8
+++ RT/Invoicing/invoice.tex.tt	2011/03/22 01:46:41	1.9
@@ -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.8 2011/03/21 23:21:16 andrew Exp $
 \documentclass[oneside]{report}
 \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry}
 \usepackage{multicol}
@@ -21,48 +21,9 @@
 \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 %] }
 
-[% 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 %]
-
-[% 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 -%]
-}
+\parbox[t][1.5in]{\linewidth}{\Large [% to | latex_encode %] }
 
 \columnbreak