[freeside-commits] freeside/FS/FS cust_main.pm,1.532,1.533

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv940

Modified Files:
	cust_main.pm 
Log Message:
fix return address in welcome letters, RT#9497

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -w -d -r1.532 -r1.533
--- cust_main.pm	10 Aug 2010 06:28:39 -0000	1.532
+++ cust_main.pm	11 Aug 2010 00:08:41 -0000	1.533
@@ -8988,8 +8988,13 @@
       $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} = '~';