- $invoice_data{'returnaddress'} = $conf->exists('invoice_htmlreturnaddress')
- ? join("\n", $conf->config('invoice_htmlreturnaddress') )
- : join("\n", map {
- s/~/ /g;
- s/\\\\\*?\s*$/<BR>/;
- s/\\hyphenation\{[\w\s\-]+\}//;
- $_;
- }
- $conf->config('invoice_latexreturnaddress')
- );
+ $invoice_data{'returnaddress'} =
+ length( $conf->config_orbase('invoice_htmlreturnaddress', $template) )
+ ? join("\n", $conf->config('invoice_htmlreturnaddress', $template) )
+ : join("\n", map {
+ s/~/ /g;
+ s/\\\\\*?\s*$/<BR>/;
+ s/\\hyphenation\{[\w\s\-]+\}//;
+ $_;
+ }
+ $conf->config_orbase('invoice_latexreturnaddress', $template)
+ );