better column widths and easier maintenance

1 files changed, 18 insertions, 24 deletions

diff --git a/conf/invoice_latex b/conf/invoice_latex
index be20818c0..0abdd6dbd 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -154,7 +154,22 @@
 \renewcommand{\familydefault}{phv}

 

 

-% Commands for freeside description...

+% Commands for freeside table header...

+\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[1.6cm][r]{\textbf{Amount}} \\

+  \hline

+}

+

+% ...description...

 \newcommand{\FSdesc}[5]{

   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &

   \multicolumn{4}{l}{\textbf{#2}} &

@@ -227,31 +242,10 @@ Terms: [@-- $terms --@]\\
 %

 \section*{\textsc{Charges}}

 \begin{longtable}{cllllllr}

-\hline

-\rule{0pt}{2.5ex}

-\makebox[1.4cm]{\textbf{Ref}} & 

-\makebox[2.0cm][l]{\textbf{Description}}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&

-\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&

-\makebox[2.0cm][r]{\textbf{Amount}} \\

-%

-\hline

+\FShead

 \endfirsthead

 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\

-\hline

-\rule{0pt}{2.5ex}

-\makebox[1.4cm]{\textbf{Ref}} & 

-\makebox[2.0cm][l]{\textbf{Description}}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{}&

-\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&

-\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&

-\makebox[2.0cm][r]{\textbf{Amount}} \\

-\hline

+\FShead

 \endhead

 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\

 \endfoot