summaryrefslogtreecommitdiff
path: root/FS/FS/quotation.pm
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2015-01-29 18:00:36 -0600
committerJonathan Prykop <jonathan@freeside.biz>2015-01-29 18:00:36 -0600
commit8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f (patch)
tree94f06b305ea4387bc9c8b454452d143c0d2a00de /FS/FS/quotation.pm
parentfbdaf36fb33a44a453e23bc2dc8d18637b40dae9 (diff)
RT#30613: Can't Send E-mail
Diffstat (limited to 'FS/FS/quotation.pm')
-rw-r--r--FS/FS/quotation.pm5
1 files changed, 1 insertions, 4 deletions
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,