X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=2c25c6ff2de1fde9d23387517ea1f0d0a4ea6542;hb=e96a3fd1c8ee8c711a7e119c0937da6866bbd4f0;hp=73177862d6087c9af4da563d62a89cdddbf6141f;hpb=167f7cf57da2558db8e1b17ea16694374693e2c0;p=freeside.git diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 73177862d..2c25c6ff2 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1308,14 +1308,14 @@ sub print_latex { $invoice_data{'country'} = _latex_escape(code2country($cust_main->country)); } + $invoice_data{'notes'} = + join("\n", # #do variable substitutions in notes -# $invoice_data{'notes'} = -# join("\n", # map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } -# $conf->config_orbase('invoice_latexnotes', $template) -# ); -# warn "invoice notes: ". $invoice_data{'notes'}. "\n" -# if $DEBUG; + $conf->config_orbase('invoice_latexnotes', $template) + ); + warn "invoice notes: ". $invoice_data{'notes'}. "\n" + if $DEBUG; $invoice_data{'footer'} =~ s/\n+$//; $invoice_data{'smallfooter'} =~ s/\n+$//; @@ -1702,7 +1702,7 @@ sub print_html { : join("\n", map { s/~/ /g; s/\\\\\*?\s*$/
/; - s/\\hypenation\{[\w\s\-]+\}//; + s/\\hyphenation\{[\w\s\-]+\}//; $_; } $conf->config('invoice_latexreturnaddress')