X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_credit.pm;h=6f4f720c2c2b1f407e0c7e0eba215be92425f0d5;hp=df2a6cc19d56e82bcda2ea858e2032f38af7702b;hb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8;hpb=412bc43b866761bbdf5db3833960ebe6db1cac18

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index df2a6cc19..6f4f720c2 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -282,7 +282,10 @@ sub delete {
     my $cust_main = $self->cust_main;
 
     my $error = send_email(
-      'from'    => $conf->config('invoice_from', $self->cust_main->agentnum),
+      'from'    => $conf->config('invoice_from_name', $self->cust_main->agentnum) ?
+                   $conf->config('invoice_from_name', $self->cust_main->agentnum) . ' <' .
+                   $conf->config('invoice_from', $self->cust_main->agentnum) . '>' :
+                   $conf->config('invoice_from', $self->cust_main->agentnum),
                                  #invoice_from??? well as good as any
       'to'      => $conf->config('deletecredits'),
       'subject' => 'FREESIDE NOTIFICATION: Credit deleted',