working asterisk CDR CSV import (not just direct DB)

[freeside.git] / FS / FS / cust_bill.pm

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c599488..2ad28b8 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1843,7 +1843,7 @@ sub print_latex {
   }
 
   my %invoice_data = (
-    'company_name'    => $conf->config('company_name'),
+    'company_name'    => scalar( $conf->config('company_name') ),
     'company_address' => join("\n", $conf->config('company_address') ). "\n",
     'custnum'         => $self->custnum,
     'invnum'          => $self->invnum,
@@ -2244,7 +2244,7 @@ sub print_html {
     or die 'While compiling ' . $templatefile . ': ' . $Text::Template::ERROR;
 
   my %invoice_data = (
-    'company_name'    => $conf->config('company_name'),
+    'company_name'    => scalar( $conf->config('company_name') ),
     'company_address' => join("\n", $conf->config('company_address') ). "\n",
     'custnum'         => $self->custnum,
     'invnum'          => $self->invnum,
@@ -2431,6 +2431,11 @@ sub print_html {
     push @{$invoice_data{'total_items'}}, $total;
   }
 
+  warn "filling in HTML template for invoice ". $self->invnum. "\n"
+    if $DEBUG;
+  warn join("\n", map "  $_ => ".$invoice_data{$_}, keys %invoice_data ). "\n"
+    if $DEBUG > 1;
+
   $html_template->fill_in( HASH => \%invoice_data);
 }
 
@@ -2820,9 +2825,13 @@ specified in HASHREF.  Valid parameters are
 
 =over 4
 
-=item begin - epoch date (UNIX timestamp) setting a lower bound for _date values
+=item begin
+
+Epoch date (UNIX timestamp) setting a lower bound for _date values
+
+=item end
 
-=item end - epoch date (UNIX timestamp) setting an upper bound for _date values
+Epoch date (UNIX timestamp) setting an upper bound for _date values
 
 =item invnum_min