From a85d8ec992770a0c5d715a9186b1bbf1d536caec Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 13 Feb 2008 05:15:34 +0000 Subject: [PATCH] fix missing fill-in values on invoices resulting from skewed hash ($conf->config returning empty list in list context) --- FS/FS/cust_bill.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index c59948808..4dc15caba 100644 --- 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); } -- 2.11.0