X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch.pm;h=55e4d3f145030e845e983021b78b126adf98377b;hb=46ca67d352957406bedb44680a9266e20f3cfd2c;hp=2a048a115321e3c1c36a7738fb635e590e313d9a;hpb=54a357b171aa44f9399b4c146acd2afd3b686075;p=freeside.git

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 2a048a115..55e4d3f14 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -764,7 +764,7 @@ sub import_from_gateway {
       my $body = "Import from gateway ".$gateway->label."\n".$error_text;
       send_email(
         to      => $mail_on_error,
-        from    => $conf->config('invoice_from'),
+        from    => $conf->invoice_from_full(),
         subject => $subject,
         body    => $body,
       );
@@ -946,7 +946,7 @@ sub export_batch {
 
   my $info = $export_info{$format} or die "Format not found: '$format'\n";
 
-  &{$info->{'init'}}($conf) if exists($info->{'init'});
+  &{$info->{'init'}}($conf, $self->agentnum) if exists($info->{'init'});
 
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;