diff options
Diffstat (limited to 'FS/FS/quotation.pm')
| -rw-r--r-- | FS/FS/quotation.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm index 75a592d..774495a 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, |