better column widths and easier maintenance

diff --git a/conf/invoice_latex b/conf/invoice_latex
index fa47111..d819160 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -156,7 +156,22 @@
 \renewcommand{\familydefault}{phv}\r
 \r
 \r
-% Commands for freeside description...\r
+% Commands for freeside table header...\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[1.6cm][r]{\textbf{Amount}} \\\r
+  \hline\r
+}\r
+\r
+% ...description...\r
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
   \multicolumn{4}{l}{\textbf{#2}} &\r
@@ -243,30 +258,10 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\caption*{ ';\r
     $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';\r
     $OUT .= '}\\\\';\r
-    $OUT .= '\hline';\r
-    $OUT .= '\rule{0pt}{2.5ex}';\r
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
-    $OUT .= '\hline';\r
+    $OUT .= '\FShead';\r
     $OUT .= '\endfirsthead';\r
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';\r
-    $OUT .= '\hline';\r
-    $OUT .= '\rule{0pt}{2.5ex}';\r
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
-    $OUT .= '\hline';\r
+    $OUT .= '\FShead';\r
     $OUT .= '\endhead';\r
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';\r
     $OUT .= '\endfoot';\r