===================================================================
RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -r1.3 -r1.6
--- RT/Invoicing/invoice.tex.tt	2011/03/20 06:20:11	1.3
+++ RT/Invoicing/invoice.tex.tt	2011/03/21 05:25:44	1.6
@@ -1,6 +1,6 @@
 [% USE Latex -%]
 [% FILTER latex("pdf") -%]
-% $AFresh1: invoice.tex.tt,v 1.1.1.1 2011/03/19 22:27:16 andrew Exp $
+% $AFresh1: invoice.tex.tt,v 1.3 2011/03/20 05:20:11 andrew Exp $
 \documentclass[oneside]{report}
 \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry}
 \usepackage{multicol}
@@ -13,16 +13,15 @@
 \chead{Invoice \#\textbf{[% id | format('%06d') | latex_encode %]}}
 \rhead{Page {\thepage}}
 
-\lfoot{[% info1 | latex_encode %]}
+\lfoot{[% info.0 | latex_encode %]}
 \cfoot{}
-\rfoot{[% info2 | latex_encode %]}
+\rfoot{[% info.1 | latex_encode %]}
 
 \begin{document}
 \thispagestyle{empty}
-
+\vspace*{-.75in}
 \begin{multicols}{2}
-
-{\large
+\parbox[t][1.625in]{\linewidth}{\large
 [% from.name | latex_encode %]
 
 [% IF from.attn -%]
@@ -35,12 +34,16 @@
     [% from.addr2 | latex_encode %]
 
 [% END -%]
-[% from.city | latex_encode %], [% from.state | latex_encode %] \ [% from.zip | latex_encode %]
-}
+[% from.city | latex_encode %], 
+[% from.state | latex_encode %] \ [% from.zip | latex_encode %]
 
-\vspace{.75in}
+[% IF from.email -%]
+    [% from.email| latex_encode %]
 
-{\Large
+[% END -%]
+}
+
+\parbox[t][1.5in]{\linewidth}{\Large
 [% to.name | latex_encode %]
 
 [% IF to.attn -%]
@@ -53,7 +56,8 @@
     [% to.addr2 | latex_encode %]
 
 [% END -%]
-[% to.city | latex_encode %], [% to.state | latex_encode %] \ [% to.zip | latex_encode %]
+[% to.city | latex_encode %], 
+[% to.state | latex_encode %] \ [% to.zip | latex_encode %]
 }
 
 \columnbreak
@@ -72,7 +76,14 @@
 \begin{tabular}{ | r l | }
 \hline
 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 %] \\
@@ -80,10 +91,9 @@
 [%- IF total_due -%]
   Total Due   & [% total_due | format('%.2f') | latex_encode %] \\
 [%- END %]
-Page          & {\thepage} \\
 \hline
-\multicolumn{2}{|c|}{[% info1 | latex_encode %]} \\
-\multicolumn{2}{|c|}{[% info2 | latex_encode %]} \\
+\multicolumn{2}{|c|}{[% info.0 | latex_encode %]} \\
+\multicolumn{2}{|c|}{[% info.1 | latex_encode %]} \\
 \hline
 \end{tabular}