X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fquotation.pm;h=5c941508d4d1b73e9c365516f48988f0629ea3fd;hb=8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f;hp=774495a978fb6821da4623e6b858a6c835a5e449;hpb=2e4fa975e054554beac71883436b143267d7aa12;p=freeside.git

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 774495a97..5c941508d 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -183,10 +183,7 @@ sub email {
 
   # this is where we set the From: address
   $from ||= $conf->config('quotation_from', $self->cust_or_prospect->agentnum )
-        || ($conf->config('invoice_from_name', $self->cust_or_prospect->agentnum ) ?
-            $conf->config('invoice_from_name', $self->cust_or_prospect->agentnum ) . ' <' .
-            $conf->config('invoice_from', $self->cust_or_prospect->agentnum ) . '>' :
-            $conf->config('invoice_from', $self->cust_or_prospect->agentnum ));
+        ||  $conf->invoice_from_full( $self->cust_or_prospect->agentnum );
   $self->SUPER::email( {
     'from' => $from,
     %$opt,