=================================================================== RCS file: /cvs/RT/Invoicing/invoice.tex.tt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- RT/Invoicing/invoice.tex.tt 2011/03/21 05:25:44 1.6 +++ RT/Invoicing/invoice.tex.tt 2011/03/21 21:49:44 1.7 @@ -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.6 2011/03/21 04:25:44 andrew Exp $ \documentclass[oneside]{report} \usepackage[top=1in, bottom=1in, left=.75in, right=.75in]{geometry} \usepackage{multicol} @@ -102,28 +102,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}