X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=c74c15b1eaaff4dd8c79ffd2642f69435a274991;hb=73d97ad71884ce66b435f0e8d85e5bf99cda3712;hp=b47f4414f222fb90f547cf28c48ba7d2906c4461;hpb=950a94ad6ce36d842d788101a5330b009d44a95e;p=freeside.git
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index b47f4414f..c74c15b1e 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -103,13 +103,14 @@ Template:
<& /elements/tr-td-label.html, 'label' => 'From:' &>
<& /elements/input-text.html,
'field' => 'from_name',
- 'value' => $conf->config('company_name'), #?
+ 'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) ||
+ $conf->config('company_name', $agent_virt_agentnum), #?
'size' => 20,
&> <\
<& /elements/input-text.html,
'field' => 'from_addr',
'type' => 'email', # HTML5, woot
- 'value' => $conf->config('invoice_from'),
+ 'value' => $conf->config('invoice_from', $agent_virt_agentnum),
'size' => 20,
&>> |
@@ -154,7 +155,10 @@ die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices');
my $conf = FS::Conf->new;
+
my $table = $cgi->param('table') or die "'table' required";
+my $agent_virt_agentnum = $cgi->param('agent_virt_agentnum') || '';
+
my %search;
if ( $cgi->param('search') ) {
%search = %{ thaw(decode_base64($cgi->param('search'))) };