[freeside-commits] freeside/conf invoice_html, 1.6.2.2, 1.6.2.3 invoice_latex, 1.11.4.1, 1.11.4.2

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	invoice_html invoice_latex 
Log Message:
backport voip_cdr's upstream_simple, and the columnization features

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -u -d -r1.11.4.1 -r1.11.4.2
--- invoice_latex	20 Apr 2007 21:40:57 -0000	1.11.4.1
+++ invoice_latex	19 May 2008 04:07:44 -0000	1.11.4.2
@@ -229,10 +229,15 @@
     $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
             '{' . $line->{'amount'} . "}${rowbreak}\n";
 
-    foreach my $ext_desc (@$ext_description) {
-      $ext_desc = substr($ext_desc, 0, 80) . '...'
-        if (length($ext_desc) > 80);
-      $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${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) {
+        $ext_desc = substr($ext_desc, 0, 80) . '...'
+          if (length($ext_desc) > 80);
+        $OUT .= "$ext_desc \\\\${rowbreak}\n";
+      }
+      $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";
     }
 
   }

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- invoice_html	14 Oct 2007 23:15:08 -0000	1.6.2.2
+++ invoice_html	19 May 2008 04:07:43 -0000	1.6.2.3
@@ -86,13 +86,15 @@
             '<td align="right">'. $line->{'amount'}. '</td>'.
           '</tr>'
         ;
-        foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
-          $OUT .=
-            '<tr class="invoice_extdesc">'.
-              '<td></td>'.
-              '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
-              '<td></td>'.
-            '</tr>'
+        if ( @{$line->{'ext_description'} } ) {
+          $OUT .= '<tr class="invoice_extdesc"><td></td><td><table>';
+          foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
+            $OUT .=
+              '<tr class="invoice_extdesc">'.
+                '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
+              '</tr>'
+          }
+          $OUT .= '</table></td><td></td></tr>';
         }
       }