projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc_hardware: better error messages for bad hw_addr when not validating as a MAC...
[freeside.git]
/
FS
/
FS
/
Cron
/
upload.pm
diff --git
a/FS/FS/Cron/upload.pm
b/FS/FS/Cron/upload.pm
index
fa1762f
..
691170a
100644
(file)
--- 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
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.
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,
(
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,
);
subject => $subject,
body => $body,
);