[freeside-commits] branch FREESIDE_3_BRANCH updated. 2e915f90c35f3a2e567dfdcde95569ed9cf934e1

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  2e915f90c35f3a2e567dfdcde95569ed9cf934e1 (commit)
      from  16ad05fd89afe8edb0e1e66098595796cb646200 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2e915f90c35f3a2e567dfdcde95569ed9cf934e1
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Apr 8 15:50:41 2014 -0700

    adjust Amcom CDR format, #27946

diff --git a/FS/FS/cdr/amcom.pm b/FS/FS/cdr/amcom.pm
index 5967d7b..774d1e6 100644
--- a/FS/FS/cdr/amcom.pm
+++ b/FS/FS/cdr/amcom.pm
@@ -30,7 +30,7 @@ my ($tmp_mday, $tmp_mon, $tmp_year);
       my ($cdr, $date) = @_;
       $date =~ /^(\d{2})(\d{2})(\d{4})$/
         or die "unparseable date: $date";
-      ($tmp_mday, $tmp_mon, $tmp_year) = ($1, $2-1, $3);
+      ($tmp_mday, $tmp_mon, $tmp_year) = ($1, $2, $3);
     },
     sub {         # 7. Start Time (HHMMSS)
       my ($cdr, $time) = @_;
diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index aa1b394..7208c97 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -161,7 +161,11 @@ foreach my $filename ( @$ls ) {
 ###
 
 sub usage {
-  "Usage: \n  cdr.import user format servername\n";
+  "Usage:
+  cdr.sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ] 
+    [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
+    [ -a ] [ -g ] [ -s ] [ -c cdrtypenum ] user format [sftpuser@]servername
+  ";
 }
 
 use vars qw( $sftp $ftp );

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr/amcom.pm                  |    2 +-
 FS/bin/freeside-cdr-sftp_and_import |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)