X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch.pm;h=f41b3e38b21da552de74139c5a6cd3146631902b;hb=771e64b732c69902be5552d53d4a7a1199d5fca3;hp=3079db10fa865ce47a9ac0666a7f4085b839a95e;hpb=f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8;p=freeside.git

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 3079db10f..f41b3e38b 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -220,6 +220,36 @@ I<format> - an L<FS::pay_batch> module
 I<gateway> - an L<FS::payment_gateway> object for a batch gateway.  This 
 takes precedence over I<format>.
 
+Supported format keys (defined in the specified FS::pay_batch module) are:
+
+I<filetype> - CSV, fixed, variable, XML
+
+I<fields> - list of field names for each row/line
+
+I<formatre> - regular expression for fixed filetype
+
+I<parse> - for variable filetype
+
+I<xmlkeys> - for XML filetype
+
+I<xmlrow> - for XML filetype
+
+I<begin_condition> - sub, ignore all lines before this returns true
+
+I<end_condition> - sub, stop processing lines when this returns true
+
+I<end_hook> - sub, runs immediately after end_condition returns true
+
+I<skip_condition> - sub, skip lines when this returns true
+
+I<hook> - sub, runs before approved/declined conditions are checked
+
+I<approved> - sub, returns true when approved
+
+I<declined> - sub, returns true when declined
+
+I<close_condition> - sub, decide whether or not to close the batch
+
 =cut
 
 sub import_results {
@@ -749,10 +779,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_name') ?
-                   $conf->config('invoice_from_name') . ' <' .
-                   $conf->config('invoice_from') . '>' :
-                   $conf->config('invoice_from'),
+        from    => $conf->invoice_from_full(),
         subject => $subject,
         body    => $body,
       );