thank you IE8

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index e6735b6..7facc19 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 \r
 \documentclass[letterpaper]{article}\r
 \r
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}\r
+\usepackage{fancyhdr,lastpage,ifthen,fslongtable,afterpage,caption,multirow,bigstrut}\r
 \usepackage{graphicx}                  % required for logo graphic\r
 \r
 \addtolength{\voffset}{-0.0cm}         % top margin to top of header\r
@@ -157,16 +157,21 @@
 \r
 \r
 % Commands for freeside table header...\r
+\r
+\newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }\r
+\newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }\r
+\newcommand{\FSunitcolumns}{ [@-- $unitprices ? '\makebox[2.5cm][l]{\textbf{~~Unit Price}}&\makebox[1.4cm]{\textbf{~Quantity}}&' : '' --@] }\r
+\r
 \newcommand{\FShead}{\r
   \hline\r
   \rule{0pt}{2.5ex}\r
   \makebox[1.4cm]{\textbf{Ref}} &\r
-  \makebox[2.9cm][l]{\textbf{Description}}&\r
-  \makebox[1.4cm][l]{}&\r
-  \makebox[1.4cm][l]{}&\r
-  \makebox[2.5cm][l]{}&\r
-  \makebox[2.5cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
-  \makebox[1.4cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
+%  \makebox[2.9cm][l]{\textbf{Description}}&\r
+%  \makebox[1.4cm][l]{}&\r
+%  \makebox[1.4cm][l]{}&\r
+%  \makebox[2.5cm][l]{}&\r
+  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{Description}}}&\r
+  \FSunitcolumns\r
   \makebox[1.6cm][r]{\textbf{Amount}} \\\r
   \hline\r
 }\r
@@ -192,19 +197,7 @@
 \r
 \r
 \begin{document}\r
-%\r
-%%     Headers and footers defined for the first page\r
-%\r
-%%     The LH Heading comprising logo\r
-%%     UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo\r
-%\r
-%%     The Heading comprising isue date, customer ref & INVOICE name\r
-%\r
-%%     Header & footer changes for subsequent pages\r
-%\r
-%\r
-%\r
-[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
+%      Headers and footers defined for the first page\r
 \addressinset \rule{0.5cm}{0cm} \r
 \makebox{\r
 \begin{minipage}[t]{7.0cm}\r
@@ -325,5 +318,8 @@ Terms: [@-- $terms --@]\\
 \r
 --@]\r
 \vfill\r
-[@-- $notes --@]\r
+\begin{minipage}[t]{\textwidth}\r
+  [@-- $notes --@]\r
+  [@-- $coupon ? '\ifthenelse{\equal{\thepage}{1}}{\rule{0pt}{\extracouponspace}}{}' : '' --@]\r
+\end{minipage}\r
 \end{document}\r