add datestamp to batch name derived from filename, remove temp files for all errors...

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 48b6f69..039941c 100755 (executable)
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -2,7 +2,7 @@
 
 use strict;
 use Getopt::Std;
-use Date::Format qw(str2time);
+use Date::Format;
 use Net::SFTP::Foreign::Compat;
 use Net::FTP;
 use FS::UID qw(adminsuidsetup datasrc);
@@ -108,7 +108,7 @@ foreach my $filename ( @$ls ) {
   my $import_options = {
     'file'            => "$cachedir/$ungziped",
     'format'          => $format,
-    'batch_namevalue' => $filename.'-'.str2time('%Y-%m-%d'),
+    'batch_namevalue' => $filename.'-'.time2str('%Y-%m-%d', time),
     'empty_ok'        => 1,
   };
   $import_options->{'cdrtypenum'} = $opt_c if $opt_c;