package categories (meta package classes) and grouping invoices by them

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

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index adde898..614593d 100644 (file)
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -400,7 +400,8 @@ my %export_names = (
                        },
   'voxlinesystems2' => { 'name'           => 'VoxLineSystems with source',
                          'invoice_header' =>
-                           "Date,Time,Name,Destination,Called From,Duration,Price",
+                           #"Date,Time,Name,Called From,Destination,Duration,Price",
+                           "Date,Time,Called From,Destination,Duration,Price",
                        },
 );
 
@@ -422,7 +423,7 @@ my %export_formats = (
   ],
   'voxlinesystems' => [
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
-    sub { time2str('%T', shift->calldate_unix ) },   #TIME
+    sub { time2str('%r', shift->calldate_unix ) },   #TIME
     'userfield',                                     #USER
     'dst',                                           #NUMBER_DIALED
     sub { sprintf('%.2fm', shift->billsec / 60 ) },  #DURATION
@@ -430,8 +431,8 @@ my %export_formats = (
   ],
   'voxlinesystems2' => [
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
-    sub { time2str('%T', shift->calldate_unix ) },   #TIME
-    'userfield',                                     #USER
+    sub { time2str('%r', shift->calldate_unix ) },   #TIME
+    #'userfield',                                     #USER
     'dst',                                           #NUMBER_DIALED
     'src',                                           #called from
     sub { sprintf('%.2fm', shift->billsec / 60 ) },  #DURATION
@@ -729,9 +730,10 @@ my %import_formats = (
     'enddate',                            #End (also a timestamp!)
     sub { my($cdr, $field) = @_; },       #End date
     sub { my($cdr, $field) = @_; },       #End time
-    'accountcode',                        #Calling customer XXX map to agent_custid??
+    'accountcode',                        #Calling customer... map to agent_custid??
     sub { my($cdr, $field) = @_; },       #Calling type
-    sub { shift->src('30000'); }, #XXX FAKE XXX 'src',                                #Calling number
+    'src',
+    #sub { my($cdr, $field) = @_; },       #Calling number
     'userfield',                          #Calling name #?
     sub { my($cdr, $field) = @_; },       #Called type
     'dst',                                #Called number
@@ -740,6 +742,7 @@ my %import_formats = (
     sub { my($cdr, $field) = @_; },       #Destination Number
     sub { my($cdr, $field) = @_; },       #Inbound calling type
     sub { my($cdr, $field) = @_; },       #Inbound calling number
+    #'src',
     sub { my($cdr, $field) = @_; },       #Inbound called type
     sub { my($cdr, $field) = @_; },       #Inbound called number
     sub { my($cdr, $field) = @_; },       #Inbound destination type