X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg.pm;h=0f0983b638955c4c08167d2b8ddca2cbaa67e70f;hb=8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f;hp=ccf63db23e25dff2ebb6992f748b77fb0f18c179;hpb=0b07929c5a6f2654d91db7f7ba8951e3c2a46093;p=freeside.git

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index ccf63db23..0f0983b63 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -947,10 +947,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') ],