X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=1ed1d4ace6aa56d6642c793b77fa31301524d767;hp=30dbc043c7f5a17a735ad955cd13e409fbce5ea3;hb=2e4fa975e054554beac71883436b143267d7aa12;hpb=f4b7701c4c1e574ebe29e05db694d131d2799b35

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 30dbc043c..1ed1d4ace 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4327,7 +4327,10 @@ sub notify {
 
   return unless $conf->exists($template);
 
-  my $from = $conf->config('invoice_from', $self->agentnum)
+  my $from = $conf->config('invoice_from_name', $self->agentnum) ?
+             $conf->config('invoice_from_name', $self->agentnum) . ' <' .
+             $conf->config('invoice_from', $self->agentnum) . '>' :
+             $conf->config('invoice_from', $self->agentnum)
     if $conf->exists('invoice_from', $self->agentnum);
   $from = $options{from} if exists($options{from});