diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-01-28 02:26:52 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-01-28 02:26:52 -0800 |
| commit | 2e4fa975e054554beac71883436b143267d7aa12 (patch) | |
| tree | 246c066d8497d8db3f47a809caddfbd2e67d2264 /FS/FS/cust_main.pm | |
| parent | f4b7701c4c1e574ebe29e05db694d131d2799b35 (diff) | |
| parent | e43f8075d053e3f1d969d8f762ab510a2de126de (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'FS/FS/cust_main.pm')
| -rw-r--r-- | FS/FS/cust_main.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 30dbc04..1ed1d4a 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -4327,7 +4327,10 @@ sub notify { return unless $conf->exists($template); - my $from = $conf->config('invoice_from', $self->agentnum) + my $from = $conf->config('invoice_from_name', $self->agentnum) ? + $conf->config('invoice_from_name', $self->agentnum) . ' <' . + $conf->config('invoice_from', $self->agentnum) . '>' : + $conf->config('invoice_from', $self->agentnum) if $conf->exists('invoice_from', $self->agentnum); $from = $options{from} if exists($options{from}); |