Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / Cron / agent_email.pm

diff --git a/FS/FS/Cron/agent_email.pm b/FS/FS/Cron/agent_email.pm
index f3fb945..623b920 100644 (file)
--- a/FS/FS/Cron/agent_email.pm
+++ b/FS/FS/Cron/agent_email.pm
@@ -12,7 +12,7 @@ use FS::Record qw(qsearch);# qsearchs);
 use FS::agent;
 
 @EXPORT_OK = qw ( agent_email );
-$DEBUG = 1;
+$DEBUG = 0;
 
 sub agent_email {
   my %opt = @_;
@@ -29,7 +29,10 @@ sub agent_email {
     RT::ConnectToDatabase();
   }
 
-  my $from = $conf->config('invoice_from');
+  my $from = $conf->config('invoice_from_name') ?
+             $conf->config('invoice_from_name') . ' <' . 
+             $conf->config('invoice_from') . '>' :
+             $conf->config('invoice_from');
 
   my $outbuf = '';;
   my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf);