X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fupload_target.pm;h=73d2a04c3ab14a52a88f7bab54599ee0ad80c2f8;hb=0b07929c5a6f2654d91db7f7ba8951e3c2a46093;hp=33088cbd2d993366ee61962175b01fa98f9d069e;hpb=fa978560e3b0473728ebf2fb32625765465c230a;p=freeside.git

diff --git a/FS/FS/upload_target.pm b/FS/FS/upload_target.pm
index 33088cbd2..73d2a04c3 100644
--- a/FS/FS/upload_target.pm
+++ b/FS/FS/upload_target.pm
@@ -163,7 +163,10 @@ sub put {
     # (maybe use only the raw content, so that we don't have to supply a 
     # customer for substitutions? ewww.)
     my %message = (
-      'from'          => $conf->config('invoice_from'),
+      'from'          => $conf->config('invoice_from_name') ?
+                         $conf->config('invoice_from_name') . ' <' .
+                         $conf->config('invoice_from') . '>' :
+                         $conf->config('invoice_from'),
       'to'            => $to,
       'subject'       => $self->subject,
       'nobody'        => 1,