Enswitch CDR changes

[freeside.git] / FS / FS / cdr / enswitch.pm

diff --git a/FS/FS/cdr/enswitch.pm b/FS/FS/cdr/enswitch.pm
index a19b166..c1966b4 100644 (file)
--- a/FS/FS/cdr/enswitch.pm
+++ b/FS/FS/cdr/enswitch.pm
@@ -16,20 +16,18 @@ use FS::cdr_type;
     'startdate',    #Start, already a unix timestamp
     skip(2),        #Start date, Start time
     'enddate',      #End
-    skip(4),        #End date, End time
+    skip(6),        #End date, End time
                     #Calling customer, Calling type
-    'src',          #Calling number
-    'clid',         #Calling name
+    'src',          #Calling number     
     skip(1),        #Called type
     'dst',          #Called number
-    skip(5),        #Destination customer, Destination type
+    skip(26),       #Destination customer, Destination type
                     #Destination number
                     #Destination group ID, Destination group name,
-    \&in_calling_type,  #Inbound calling type,
-    \&in_calling_num,   #Inbound calling number,
-    '',                 #Inbound called type,
-    \&in_called_num,    #Inbound called number,
-    skip(14),
+                   #Inbound calling type,
+                   #Inbound calling number,
+                    #Inbound called type,
+                   #Inbound called number,
                     #Inbound destination type, Inbound destination number,
                     #Outbound calling type, Outbound calling number,
                     #Outbound called type, Outbound called number,
@@ -41,6 +39,7 @@ use FS::cdr_type;
     skip(1),        #Ring seconds
     'billsec',      #Billable seconds
     'upstream_price', #Cost
+    skip(1),        #Cost including taxes
     'accountcode',  #Billing customer
     skip(3),        #Billing customer name, Billing type, Billing reference
   ],
@@ -67,14 +66,4 @@ sub in_calling_type {
 
 }
 
-sub in_calling_num {
-  my ($record, $data) = @_;
-  $record->src($data) if ( ($record->in_calling_type || '') eq 'external' );
-}
-
-sub in_called_num {
-  my ($record, $data) = @_;
-  $record->dst($data) if ( ($record->in_calling_type || '') eq 'external' );
-}
-
 1;