X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=0cd48125bbb00e071cf0f22c4acae2b5bf22487b;hb=12ec6818dfd015042f516821c35ac68846b6baa0;hp=e6735b6ecb00f27b0d42bf184d3c4ae140243912;hpb=cfca164f37b2510f5eee4ba862324c3080a4fb46;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index e6735b6ec..0cd48125b 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}
+\usepackage{fancyhdr,lastpage,ifthen,fslongtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
@@ -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}