fix broken pagenation

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index a0a211b..091d344 100644 (file)
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -245,7 +245,8 @@ sub details {
 
   $format_sub = sub { my $detail = shift;
                       $csv->parse($detail) or return "can't parse $detail";
-                      join(' & ', map { &$escape_function($_) } $csv->fields );
+                      join(' & ', map { '\small{'. &$escape_function($_). '}' }
+                                  $csv->fields );
                     }
     if $format eq 'latex';
 

diff --git a/conf/invoice_latex b/conf/invoice_latex
index ba66d64..e3feeef 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -137,17 +137,18 @@
 % Commands for freeside description...\r
 \newcommand{\FSdesc}[3]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
-  \textbf{#2} &\r
+  \multicolumn{6}{l}{\textbf{#2}} &\r
   \multicolumn{1}{r}{\textbf{\dollar #3}}\\\r
 }\r
 % ...extended description...\r
 \newcommand{\FSextdesc}[1]{\r
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
-  \multicolumn{2}{l}{\small{~-~#1}}\\\r
+%%  \multicolumn{2}{l}{\small{~-~#1}}\\\r
+  ~-~#1\\\r
 }\r
 % ...and total line items.\r
 \newcommand{\FStotaldesc}[2]{\r
-  & \multicolumn{1}{l}{#1} & #2\\\r
+  & \multicolumn{6}{l}{#1} & #2\\\r
 }\r
 \r
 \r
@@ -188,23 +189,23 @@ Terms: [@-- $terms --@]\\
 \vspace{1.5cm}\r
 %\r
 \section*{\textsc{Charges}}\r
-\begin{longtable}{clr}\r
+\begin{longtable}{cllllllr}\r
 \hline\r
 \rule{0pt}{2.5ex}\r
 \makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[12.8cm][l]{\textbf{Description}} & \r
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & \r
 \makebox[2.5cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endfirsthead\r
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
 \hline\r
 \rule{0pt}{2.5ex}\r
 \makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[12.8cm][l]{\textbf{Description}} & \r
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & \r
 \makebox[2.5cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endhead\r
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
 \endfoot\r
 \hline\r
 [@--\r
@@ -229,15 +230,13 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .\r
             '{' . $line->{'amount'} . "}${rowbreak}\n";\r
 \r
-    if (@$ext_description) {\r
-      $OUT .= '\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &';\r
-      $OUT .= '\multicolumn{2}{l}{\small{\begin{tabular}{llllll}';#cheating at 6\r
-      foreach my $ext_desc (@$ext_description) {\r
+    foreach my $ext_desc (@$ext_description) {\r
+      if ( $ext_desc !~ /[^\\]&/ ) {   \r
         $ext_desc = substr($ext_desc, 0, 80) . '...'\r
           if (length($ext_desc) > 80);\r
-        $OUT .= "$ext_desc \\\\${rowbreak}\n";\r
+        $ext_desc = '\small{'. $ext_desc. '}';\r
       }\r
-      $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";\r
+      $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";\r
     }\r
 \r
   }\r