X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fupload.pm;h=691170af90c427b75f5bbac089e4f103a56b4d3c;hb=20f03d52cc6c930f610c0b4466eeeeda54fdbb40;hp=fa1762f51c66a90996f6cb2541a6aa54af66e172;hpb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8;p=freeside.git

diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm
index fa1762f51..691170af9 100644
--- a/FS/FS/Cron/upload.pm
+++ b/FS/FS/Cron/upload.pm
@@ -474,7 +474,7 @@ sub spool_upload {
 
 Retrieves the config value named CONFIG, parses it as a Text::Template,
 extracts "to" and "subject" headers, and returns a hash that can be passed
-to L<FS::Misc::send_email>.
+to L<FS::Misc/send_email>.
 
 PARAMS is a hashref to be passed to C<fill_in>.  It must contain 
 'agentnum' to look up the per-agent config.
@@ -508,10 +508,7 @@ sub prepare_report {
 
   (
     to      => $to,
-    from    => $conf->config('invoice_from_name', $agentnum) ?
-               $conf->config('invoice_from_name', $agentnum) . ' <' . 
-               $conf->config('invoice_from', $agentnum) . '>' :
-               $conf->config('invoice_from', $agentnum),
+    from    => $conf->invoice_from_full($agentnum),
     subject => $subject,
     body    => $body,
   );