[freeside-commits] freeside/FS/FS cust_main.pm, 1.464.2.40, 1.464.2.41

Ivan,,, ivan at wavetail.420.am
Tue Aug 10 17:08:52 PDT 2010


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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	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.464.2.40
retrieving revision 1.464.2.41
diff -u -w -d -r1.464.2.40 -r1.464.2.41
--- cust_main.pm	10 Aug 2010 06:28:41 -0000	1.464.2.40
+++ cust_main.pm	11 Aug 2010 00:08:50 -0000	1.464.2.41
@@ -9578,8 +9578,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} = '~';



More information about the freeside-commits mailing list