diff options
| author | Mark Wells <mark@freeside.biz> | 2016-05-10 13:11:10 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2016-05-10 13:11:10 -0700 |
| commit | 5000d886f3c9d7b57e6dd36431223a1ba1e200a0 (patch) | |
| tree | 91c93faf978e213f9468b227d3828597fa05b32b /FS | |
| parent | 1d37922a192f776936d9aeb654064df3eb9b1c2c (diff) | |
| parent | 29511cc57e60f40a231aa8e1dc3239869ea14410 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cdr/FS/FS/cdr/vvs.pm | 7 | ||||
| -rw-r--r-- | FS/FS/cdr/vss.pm | 33 |
2 files changed, 3 insertions, 37 deletions
diff --git a/FS/FS/cdr/FS/FS/cdr/vvs.pm b/FS/FS/cdr/FS/FS/cdr/vvs.pm index 63a647ee8..db7e72ac6 100644 --- 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 index a550303df..000000000 --- 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; |