diff options
Diffstat (limited to 'FS/FS/Conf.pm')
| -rw-r--r-- | FS/FS/Conf.pm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 07042e5fd..1fe11a0e3 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -9,6 +9,7 @@ use Carp; use IO::File; use File::Basename; use MIME::Base64; +use Email::Address; use FS::ConfItem; use FS::ConfDefaults; use FS::Conf_compat17; @@ -605,10 +606,12 @@ based on their current values. sub invoice_from_full { my ($self, $agentnum) = @_; - return $self->config('invoice_from_name', $agentnum ) ? - $self->config('invoice_from_name', $agentnum ) . ' <' . - $self->config('invoice_from', $agentnum ) . '>' : - $self->config('invoice_from', $agentnum ); + + my $name = $self->config('invoice_from_name', $agentnum) + || $self->config('company_name', $agentnum); + + Email::Address->new( $name => $self->config('invoice_from', $agentnum ) ) + ->format; } =back |