[freeside-commits] freeside/conf invoice_latex,1.29,1.30

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv29345

Modified Files:
	invoice_latex 
Log Message:
better column widths and easier maintenance

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- invoice_latex	12 Oct 2008 21:22:30 -0000	1.29
+++ invoice_latex	12 Oct 2008 23:56:46 -0000	1.30
@@ -156,7 +156,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}} &
@@ -243,30 +258,10 @@
     $OUT .= '\caption*{ ';
     $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';
     $OUT .= '}\\\\';
-    $OUT .= '\hline';
-    $OUT .= '\rule{0pt}{2.5ex}';
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
-    $OUT .= '\hline';
+    $OUT .= '\FShead';
     $OUT .= '\endfirsthead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
-    $OUT .= '\hline';
-    $OUT .= '\rule{0pt}{2.5ex}';
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
-    $OUT .= '\hline';
+    $OUT .= '\FShead';
     $OUT .= '\endhead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
     $OUT .= '\endfoot';