X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=15926308e2bd8a3f19afcd1f4f86a4323a33b833;hb=c7cc0522832d0e1c056f9bce46dd1b4b5551e612;hp=b47f4414f222fb90f547cf28c48ba7d2906c4461;hpb=950a94ad6ce36d842d788101a5330b009d44a95e;p=freeside.git

diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index b47f4414f..15926308e 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -103,13 +103,13 @@ Template:
     <& /elements/tr-td-label.html, 'label' => 'From:' &>
       <TD><& /elements/input-text.html,
               'field' => 'from_name',
-              'value' => $conf->config('company_name'), #?
+              'value' => $conf->config('company_name', $agent_virt_agentnum), #?
               'size'  => 20,
           &>&nbsp;&lt;\
           <& /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,
           &>&gt;</TD>
  
@@ -154,7 +154,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'))) };