projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #32903 A2Billing : SIMULTANEOUS ACCESS
[freeside.git]
/
FS
/
FS
/
part_pkg
/
voip_cdr.pm
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
7e21b0f
..
8278afe
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-10,9
+10,6
@@
use FS::Conf;
use FS::Record qw(qsearchs qsearch);
use FS::cdr;
use FS::detail_format;
use FS::Record qw(qsearchs qsearch);
use FS::cdr;
use FS::detail_format;
-#use FS::rate;
-#use FS::rate_prefix;
-#use FS::rate_detail;
$DEBUG = 0;
$DEBUG = 0;
@@
-108,19
+105,13
@@
tie my %accountcode_tollfree_field, 'Tie::IxHash',
},
'ratenum' => { 'name' => 'Rate plan',
},
'ratenum' => { 'name' => 'Rate plan',
- 'type' => 'select',
- 'select_table' => 'rate',
- 'select_key' => 'ratenum',
- 'select_label' => 'ratename',
+ 'type' => 'select-rate',
},
'intrastate_ratenum' => { 'name' => 'Optional alternate intrastate rate plan',
},
'intrastate_ratenum' => { 'name' => 'Optional alternate intrastate rate plan',
- 'type' => 'select',
- 'select_table' => 'rate',
- 'select_key' => 'ratenum',
- 'select_label' => 'ratename',
+ 'type' => 'select-rate',
'disable_empty' => 0,
'disable_empty' => 0,
- 'empty_label' => '',
+ 'empty_label' => '
',
},
'calls_included' => { 'name' => 'Number of calls included at no usage charge', },
},
'calls_included' => { 'name' => 'Number of calls included at no usage charge', },
@@
-471,6
+462,15
@@
sub calc_usage {
#my @invoice_details_sort;
#my @invoice_details_sort;
+ # for tagging invoice details
+ my $phonenum;
+ if ( $svc_table eq 'svc_phone' ) {
+ $phonenum = $svc_x->phonenum;
+ } elsif ( $svc_table eq 'svc_pbx' ) {
+ $phonenum = $svc_x->title;
+ }
+ $formatter->phonenum($phonenum);
+
#first rate any outstanding CDRs not yet rated
# XXX eventually use an FS::Cursor for this
my $cdr_search = $svc_x->psearch_cdrs(%options);
#first rate any outstanding CDRs not yet rated
# XXX eventually use an FS::Cursor for this
my $cdr_search = $svc_x->psearch_cdrs(%options);