projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PBXware CDRs: strip trailing non-numeric stuff from src/dst numbers, #34575
[freeside.git]
/
FS
/
FS
/
msg_template.pm
diff --git
a/FS/FS/msg_template.pm
b/FS/FS/msg_template.pm
index
ef30946
..
cb13696
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'} ) {
@@
-463,9
+462,11
@@
sub render {
# Graphics/stylesheets should probably go in /var/www on the Freeside
# machine.
# Graphics/stylesheets should probably go in /var/www on the Freeside
# machine.
+ my $script_path = `/usr/bin/which freeside-wkhtmltopdf`;
+ chomp $script_path;
my $kit = PDF::WebKit->new(\$html); #%options
# hack to use our wrapper script
my $kit = PDF::WebKit->new(\$html); #%options
# hack to use our wrapper script
- $kit->configure(sub { shift->wkhtmltopdf(
'freeside-wkhtmltopdf'
) });
+ $kit->configure(sub { shift->wkhtmltopdf(
$script_path
) });
$kit->to_pdf;
}
$kit->to_pdf;
}
@@
-597,8
+598,9
@@
sub substitutions {
_date
_date_pretty
due_date
_date
_date_pretty
due_date
- due_date2str
- )],
+ ),
+ [ due_date2str => sub { shift->due_date2str('short') } ],
+ ],
#XXX not really thinking about cust_bill substitutions quite yet
# for welcome and limit warning messages
#XXX not really thinking about cust_bill substitutions quite yet
# for welcome and limit warning messages