projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#30613: Can't Send E-mail
[freeside.git]
/
FS
/
FS
/
msg_template.pm
diff --git
a/FS/FS/msg_template.pm
b/FS/FS/msg_template.pm
index
bc2b382
..
2826086
100644
(file)
--- a/
FS/FS/msg_template.pm
+++ b/
FS/FS/msg_template.pm
@@
-397,8
+397,7
@@
sub prepare {
$from_addr = scalar( $conf->config($opt{'from_config'},
$cust_main->agentnum) );
}
$from_addr = scalar( $conf->config($opt{'from_config'},
$cust_main->agentnum) );
}
- $from_addr ||= scalar( $conf->config('invoice_from',
- $cust_main->agentnum) );
+ $from_addr ||= $conf->invoice_from_full($cust_main->agentnum);
}
# my @cust_msg = ();
# if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) {
}
# my @cust_msg = ();
# if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) {
@@
-595,6
+594,9
@@
sub substitutions {
'cust_bill' => [qw(
invnum
_date
'cust_bill' => [qw(
invnum
_date
+ _date_pretty
+ due_date
+ due_date2str
)],
#XXX not really thinking about cust_bill substitutions quite yet
)],
#XXX not really thinking about cust_bill substitutions quite yet