X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-sftp_and_import;h=7f2693fcb65d84c728df152d479eb655a7caaf61;hb=eb9148f0ab9aac5e4f89824b7fab6bb9d648e688;hp=48b6f697f5135d2e722e62b849702abb787f7dbc;hpb=92a35b862c2b519f8b4daca402777d6dd76eadae;p=freeside.git

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 48b6f697f..7f2693fcb 100755
--- 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);
@@ -105,10 +105,12 @@ foreach my $filename ( @$ls ) {
       }
   }
 
+  my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time);
+
   my $import_options = {
     'file'            => "$cachedir/$ungziped",
     'format'          => $format,
-    'batch_namevalue' => $filename.'-'.str2time('%Y-%m-%d'),
+    'batch_namevalue' => $file_timestamp,
     'empty_ok'        => 1,
   };
   $import_options->{'cdrtypenum'} = $opt_c if $opt_c;
@@ -123,7 +125,7 @@ foreach my $filename ( @$ls ) {
   if ( $opt_d ) {
     if($opt_m eq 'ftp') {
       my $ftp = ftp();
-      $ftp->rename($filename, "$opt_d/$filename")
+      $ftp->rename($filename, "$opt_d/$file_timestamp")
         or do {
           unlink "$cachedir/$filename";
           unlink "$cachedir/$ungziped" if $opt_g;
@@ -132,7 +134,7 @@ foreach my $filename ( @$ls ) {
     }
     else {
       my $sftp = sftp();
-      $sftp->rename($filename, "$opt_d/$filename")
+      $sftp->rename($filename, "$opt_d/$file_timestamp")
         or do {
           unlink "$cachedir/$filename";
           unlink "$cachedir/$ungziped" if $opt_g;