[freeside-commits] freeside/conf invoice_latex,1.11.4.2,1.11.4.3

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	invoice_latex 
Log Message:
fix broken pagenation

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.11.4.2
retrieving revision 1.11.4.3
diff -u -d -r1.11.4.2 -r1.11.4.3
--- invoice_latex	19 May 2008 04:07:44 -0000	1.11.4.2
+++ invoice_latex	19 May 2008 22:31:16 -0000	1.11.4.3
@@ -137,17 +137,18 @@
 % Commands for freeside description...
 \newcommand{\FSdesc}[3]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
-  \textbf{#2} &
+  \multicolumn{6}{l}{\textbf{#2}} &
   \multicolumn{1}{r}{\textbf{\dollar #3}}\\
 }
 % ...extended description...
 \newcommand{\FSextdesc}[1]{
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
-  \multicolumn{2}{l}{\small{~-~#1}}\\
+%%  \multicolumn{2}{l}{\small{~-~#1}}\\
+  ~-~#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
-  & \multicolumn{1}{l}{#1} & #2\\
+  & \multicolumn{6}{l}{#1} & #2\\
 }
 
 
@@ -188,23 +189,23 @@
 \vspace{1.5cm}
 %
 \section*{\textsc{Charges}}
-\begin{longtable}{clr}
+\begin{longtable}{cllllllr}
 \hline
 \rule{0pt}{2.5ex}
 \makebox[1.4cm]{\textbf{Ref}} & 
-\makebox[12.8cm][l]{\textbf{Description}} & 
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & 
 \makebox[2.5cm][r]{\textbf{Amount}} \\
 \hline
 \endfirsthead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
 \hline
 \rule{0pt}{2.5ex}
 \makebox[1.4cm]{\textbf{Ref}} & 
-\makebox[12.8cm][l]{\textbf{Description}} & 
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & 
 \makebox[2.5cm][r]{\textbf{Amount}} \\
 \hline
 \endhead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
 \endfoot
 \hline
 [@--
@@ -229,15 +230,13 @@
     $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
             '{' . $line->{'amount'} . "}${rowbreak}\n";
 
-    if (@$ext_description) {
-      $OUT .= '\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &';
-      $OUT .= '\multicolumn{2}{l}{\small{\begin{tabular}{llllll}';#cheating at 6
-      foreach my $ext_desc (@$ext_description) {
+    foreach my $ext_desc (@$ext_description) {
+      if ( $ext_desc !~ /[^\\]&/ ) {   
         $ext_desc = substr($ext_desc, 0, 80) . '...'
           if (length($ext_desc) > 80);
-        $OUT .= "$ext_desc \\\\${rowbreak}\n";
+        $ext_desc = '\small{'. $ext_desc. '}';
       }
-      $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";
+      $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
     }
 
   }