projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cdr
/
taqua.pm
diff --git
a/FS/FS/cdr/taqua.pm
b/FS/FS/cdr/taqua.pm
index
26c0bda
..
7ef6d76
100644
(file)
--- a/
FS/FS/cdr/taqua.pm
+++ b/
FS/FS/cdr/taqua.pm
@@
-7,7
+7,7
@@
use FS::cdr qw(_cdr_date_parser_maker);
@ISA = qw(FS::cdr);
%info = (
@ISA = qw(FS::cdr);
%info = (
- 'name' => 'Taqua',
+ 'name' => 'Taqua
v6.0
',
'weight' => 130,
'header' => 1,
'import_fields' => [ #some of these are kind arbitrary...
'weight' => 130,
'header' => 1,
'import_fields' => [ #some of these are kind arbitrary...
@@
-16,7
+16,9
@@
use FS::cdr qw(_cdr_date_parser_maker);
#RecordType
sub {
my($cdr, $field, $conf, $hashref) = @_;
#RecordType
sub {
my($cdr, $field, $conf, $hashref) = @_;
- $hashref->{skiprow} = 1 unless ($field == 0 && $cdr->disposition == 100);
+ $hashref->{skiprow} = 1
+ unless ($field == 0 && $cdr->disposition == 100 ) #regular CDR
+ || ($field == 1 && $cdr->lastapp eq 'acctcode'); #accountcode
$cdr->cdrtypenum($field);
},
$cdr->cdrtypenum($field);
},
@@
-26,7
+28,7
@@
use FS::cdr qw(_cdr_date_parser_maker);
sub { my($cdr, $field) = @_; }, #OrigCircuit
sub { my($cdr, $field) = @_; }, #OrigCircuitType
'uniqueid', #SequenceNumber
sub { my($cdr, $field) = @_; }, #OrigCircuit
sub { my($cdr, $field) = @_; }, #OrigCircuitType
'uniqueid', #SequenceNumber
- '
accountcode',
#SessionNumber
+ '
sessionnum',
#SessionNumber
'src', #CallingPartyNumber
#'dst', #CalledPartyNumber
#CalledPartyNumber
'src', #CallingPartyNumber
#'dst', #CalledPartyNumber
#CalledPartyNumber
@@
-48,7
+50,7
@@
use FS::cdr qw(_cdr_date_parser_maker);
'disposition',
# -1 => '',
# 0 => '',
'disposition',
# -1 => '',
# 0 => '',
- # 100 => '',
+ # 100 => '',
#regular cdr
# 101 => '',
# 102 => '',
# 103 => '',
# 101 => '',
# 102 => '',
# 103 => '',
@@
-101,7
+103,7
@@
use FS::cdr qw(_cdr_date_parser_maker);
}
},
}
},
-
sub { my($cdr, $field) = @_; },
#SubscriberNumber
+
'subscriber',
#SubscriberNumber
'lastapp', #ServiceName
sub { my($cdr, $field) = @_; }, #some weirdness #ChargeTime
'lastdata', #ServiceInformation
'lastapp', #ServiceName
sub { my($cdr, $field) = @_; }, #some weirdness #ChargeTime
'lastdata', #ServiceInformation