delete fees, RT#81713

[freeside.git] / FS / bin / freeside-cdr-evariste-import

diff --git a/FS/bin/freeside-cdr-evariste-import b/FS/bin/freeside-cdr-evariste-import
index f61d9d5..d5e13f9 100755 (executable)
--- a/FS/bin/freeside-cdr-evariste-import
+++ b/FS/bin/freeside-cdr-evariste-import
@@ -98,14 +98,16 @@ while (my $row = $csth->fetchrow_hashref) {
   my $cdr = FS::cdr->new ({
     # from cdr table
     'cdrbatchnum'             => $cdr_batch->cdrbatchnum,
-    'uniqueid'                => $row->{'cdr_id'},
+    'uniqueid'                => $row->{'id'},
     'src'                     => $row->{'src'},
-    'dst'                     => $row->{'dest'},
-    'startdate'               => str2time($row->{'start_time'}),
-    'answerdate'              => str2time($row->{'answer_time'}),
-    'enddate'                 => str2time($row->{'end_time'}),
+    'dst'                     => $row->{'routing_target'} || $row->{'dest'}, # dest_orig? dest_trans?
+    'startdate'               => int(str2time($row->{'start_time'})),
+    'answerdate'              => int(str2time($row->{'answer_time'})),
+    'enddate'                 => int(str2time($row->{'end_time'})),
     'duration'                => $row->{'duration_sec'},
     'accountcode'             => $row->{'customer_id'},
+    'src_ip_addr'             => $row->{'src_ip'},
+    'dst_ip_addr'             => $row->{'dest_ip'},
     # from cdr_rate_postproc table
     'billsec'                 => $row->{'rate_bill_sec'},
     'upstream_price'          => $row->{'rate_cost_net'},