diff options
author | ivan <ivan> | 2010-08-11 00:08:41 +0000 |
---|---|---|
committer | ivan <ivan> | 2010-08-11 00:08:41 +0000 |
commit | ff8aa9f859273dd5fbbed2ee80ebc63caa27ea32 (patch) | |
tree | 013e9607a8851016140ac4fd0b3b69735ca8f6cf | |
parent | 197b6a447eb3a09973c2e2e45c4d4e2be8297b17 (diff) |
fix return address in welcome letters, RT#9497
-rw-r--r-- | FS/FS/cust_main.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index e107e6c91..3bfccfc66 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -8988,8 +8988,13 @@ sub generate_letter { $letter_data{returnaddress} = $retadd; } elsif ( grep /\S/, $conf->config('company_address', $self->agentnum) ) { $letter_data{returnaddress} = - join( '\\*'."\n", map s/( {2,})/'~' x length($1)/eg, - $conf->config('company_address', $self->agentnum) + join( "\n", map { s/( {2,})/'~' x length($1)/eg; + s/$/\\\\\*/; + $_; + } + ( $conf->config('company_name', $self->agentnum), + $conf->config('company_address', $self->agentnum), + ) ); } else { $letter_data{returnaddress} = '~'; |