X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg.pm;h=48cc187f2d1ae44baacf2012f4e5c5b358447605;hp=55fa7a9d2b993870db0a348564452d336d24047b;hb=46ca67d352957406bedb44680a9266e20f3cfd2c;hpb=7fe9f776655a9a7fc3b93b4f0e06c8b8193834b6

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 55fa7a9d2..48cc187f2 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -960,10 +960,7 @@ sub cancel {
     }
     else {
       $error = send_email(
-        '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),
+        'from'    => $conf->invoice_from_full( $self->cust_main->agentnum ),
         'to'      => \@invoicing_list,
         'subject' => ( $conf->config('cancelsubject') || 'Cancellation Notice' ),
         'body'    => [ map "$_\n", $conf->config('cancelmessage') ],