X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fquotation.pm;h=774495a978fb6821da4623e6b858a6c835a5e449;hb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8;hp=75a592d702a0accc257435c1061e865b31e43933;hpb=412bc43b866761bbdf5db3833960ebe6db1cac18;p=freeside.git

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