X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=d6f1a31764490899cc93657e76b4f85450020407;hb=8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f;hp=1ed1d4ace6aa56d6642c793b77fa31301524d767;hpb=92a327b2bc09344a7e0db93f40e34b71547bf075;p=freeside.git

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1ed1d4ace..d6f1a3176 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4327,10 +4327,7 @@ sub notify {
 
   return unless $conf->exists($template);
 
-  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)
+  my $from = $conf->invoice_from_full($self->agentnum)
     if $conf->exists('invoice_from', $self->agentnum);
   $from = $options{from} if exists($options{from});