projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include batch payment and statement events in reports, RT#80156
[freeside.git]
/
FS
/
FS
/
cdr
/
orcon.pm
diff --git
a/FS/FS/cdr/orcon.pm
b/FS/FS/cdr/orcon.pm
index
444b595
..
66b045f
100644
(file)
--- a/
FS/FS/cdr/orcon.pm
+++ b/
FS/FS/cdr/orcon.pm
@@
-13,20
+13,26
@@
use Date::Parse;
'header' => 1,
'import_fields' => [
'header' => 1,
'import_fields' => [
-
skip(2),
#id
-
#billing period
+
skip(1) ,
#id
+
skip(1) ,
#billing period
'accountcode', #account number
skip(2), #username
#service id
'accountcode', #account number
skip(2), #username
#service id
- sub { my ($cdr, $calldate) = @_;
+ sub { my ($cdr, $calldate, $param) = @_;
+
$cdr->set('calldate', $calldate);
$cdr->set('calldate', $calldate);
- $calldate =~ /^(\d{4})-(\d{2})-(\d{2})\s*(\d{2}):(\d{2}):(\d{2})$/
- or die "unparseable date: $calldate";
+ if ($calldate =~ /^(\d{4})-(\d{2})-(\d{2})\s*(\d{2}):(\d{2}):(\d{2})$/){
+
my $tmp_date = "$2/$3/$1 $4:$5:$6";
$tmp_date = str2time($tmp_date);
$cdr->set('startdate', $tmp_date);
my $tmp_date = "$2/$3/$1 $4:$5:$6";
$tmp_date = str2time($tmp_date);
$cdr->set('startdate', $tmp_date);
+
+ } else {
+
+ $param->{skiprow} = 1
+ }
}, #date
skip(1), #tariff region
'src', #originating number
}, #date
skip(1), #tariff region
'src', #originating number