allow tex to do more column sizing

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 90ff0ea..aaec6be 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -157,16 +157,21 @@
 \r
 \r
 % Commands for freeside table header...\r
 \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
 \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
   \makebox[1.6cm][r]{\textbf{Amount}} \\\r
   \hline\r
 }\r