projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #30613: Can't Send E-mail
[freeside.git]
/
FS
/
FS
/
Cron
/
upload.pm
diff --git
a/FS/FS/Cron/upload.pm
b/FS/FS/Cron/upload.pm
index
628c680
..
fa1762f
100644
(file)
--- a/
FS/FS/Cron/upload.pm
+++ b/
FS/FS/Cron/upload.pm
@@
-470,7
+470,7
@@
sub spool_upload {
}
}
-=item
send
_report CONFIG PARAMS
+=item
prepare
_report CONFIG PARAMS
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
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
@@
-508,7
+508,10
@@
sub prepare_report {
(
to => $to,
(
to => $to,
- from => $conf->config('invoice_from', $agentnum),
+ from => $conf->config('invoice_from_name', $agentnum) ?
+ $conf->config('invoice_from_name', $agentnum) . ' <' .
+ $conf->config('invoice_from', $agentnum) . '>' :
+ $conf->config('invoice_from', $agentnum),
subject => $subject,
body => $body,
);
subject => $subject,
body => $body,
);