diff options
| author | jeff <jeff> | 2008-04-23 02:59:15 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-04-23 02:59:15 +0000 |
| commit | 3ceca93e2a975c91cf4471cea68e32c12546d158 (patch) | |
| tree | f075daf3766de152478874fb57cef0629e1499b4 | |
| parent | 2992840a88b3b62ade1ad43882c8046c050c1822 (diff) | |
fixup return address fallback
| -rw-r--r-- | FS/FS/cust_bill.pm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index ea177be88..520bfe1f2 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1785,13 +1785,17 @@ sub print_generic { ); } elsif ( grep /\S/, $conf->config('company_address') ) { - $returnaddress = join( "\n", $conf->config('company_address') ); - - $returnaddress = - join( '\\*'."\n", map s/( {2,})/'~' x length($1)/eg, - $conf->config('company_address') - ) - if $format eq 'latex'; + my $convert_map = $convert_maps{$format}{'returnaddress'}; + $returnaddress = join( "\n", &$convert_map( + map { s/( {2,})/'~' x length($1)/eg; + s/$/\\\\\*/; + $_ + } + ( $conf->config('company_name'), + $conf->config('company_address'), + ) + ) + ); } else { |