X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Ftaqua.pm;h=390152a042215d9560d867ab1134cd43393987a0;hb=1d9d7d96b80ed08749a44501161a26a82f3cddb6;hp=3e9840074ab5f330add2d3d32e361a07f29e93fe;hpb=aea149aa0ee7d7cae6e0c701ac6d105d615bb4e6;p=freeside.git

diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 3e9840074..390152a04 100644
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -16,7 +16,9 @@ use FS::cdr qw(_cdr_date_parser_maker);
     #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);
     },
 
@@ -26,7 +28,7 @@ use FS::cdr qw(_cdr_date_parser_maker);
     sub { my($cdr, $field) = @_; },       #OrigCircuit
     sub { my($cdr, $field) = @_; },       #OrigCircuitType
     'uniqueid',                           #SequenceNumber
-    'accountcode',                        #SessionNumber
+    'sessionnum',                         #SessionNumber
     'src',                                #CallingPartyNumber
     #'dst',                                #CalledPartyNumber
     #CalledPartyNumber
@@ -48,7 +50,7 @@ use FS::cdr qw(_cdr_date_parser_maker);
     'disposition',
                                           #  -1 => '',
                                           #   0 => '',
-                                          # 100 => '',
+                                          # 100 => '', #regular cdr
                                           # 101 => '',
                                           # 102 => '',
                                           # 103 => '',
@@ -94,10 +96,14 @@ use FS::cdr qw(_cdr_date_parser_maker);
           return;
         }
       }
-      '';
+      if ( $cdr->is_tollfree ) {        # thankfully this is already available
+        $cdr->charged_party($cdr->dst); # and this
+      } else {
+        $cdr->charged_party($field);
+      }
     },
 
-    sub { my($cdr, $field) = @_; },       #SubscriberNumber
+    'subscriber',                         #SubscriberNumber
     'lastapp',                            #ServiceName
     sub { my($cdr, $field) = @_; },       #some weirdness #ChargeTime
     'lastdata',                           #ServiceInformation