Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x

diff --git a/FS/FS/cdr/FS/FS/cdr/vvs.pm b/FS/FS/cdr/FS/FS/cdr/vvs.pm
index 63a647e..db7e72a 100644 (file)
--- a/FS/FS/cdr/FS/FS/cdr/vvs.pm
+++ b/FS/FS/cdr/FS/FS/cdr/vvs.pm
@@ -18,12 +18,11 @@ use FS::cdr qw(_cdr_date_parser_maker);
         'src',          # caller
         'dst',          # called
         skip(2),        # reason
-                       # call id
+                        # call id
         _cdr_date_parser_maker('startdate'),       # time
         'billsec',      # duration
-        skip(3),        # ringtime
-                        # status
-                        # resller_charge
+        skip(2),        # ringtime
+                        # reseller_charge
        'upstream_price',# customer_charge
   ],
 );

diff --git a/FS/FS/cdr/vss.pm b/FS/FS/cdr/vss.pm
deleted file mode 100644 (file)
index a550303..0000000
--- a/FS/FS/cdr/vss.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FS::cdr::vss;
-
-use strict;
-use vars qw( @ISA %info $tmp_mon $tmp_mday $tmp_year );
-use Time::Local;
-use FS::cdr qw(_cdr_date_parser_maker);
-
-@ISA = qw(FS::cdr);
-
-%info = (
-  'name'          => 'VSS',
-  'weight'        => 120,
-  'header'        => 1,
-  'import_fields' => [
-
-        skip(1),        # i_customer
-        'accountcode',  # account_id
-        'src',          # caller
-        'dst',          # called
-        skip(2),        # reason
-                       # call id
-        _cdr_date_parser_maker('startdate'),       # time
-        'billsec',      # duration
-        skip(3),        # ringtime
-                        # status
-                        # resller_charge
-       'upstream_price',# customer_charge
-  ],
-);
-
-sub skip { map {''} (1..$_[0]) }
-
-1;