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

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 90ff0ea6b..aaec6be21 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
 }