backport voip_cdr's upstream_simple, and the columnization features

1 files changed, 9 insertions, 7 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index b13b08f46..ddede78ce 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -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>';
         }
       }