X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_latex;h=7facc19da8480dffb2f1f28f4ecd4ebf97287af4;hp=90ff0ea6b1ea84a59d9d97b54a85155c4dc1ee13;hb=f14d53ff0e570cc24395b9d7953ea427ac468de3;hpb=1bbefca3f6dd3f392a99068e1e0e0aeb52efda63

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