projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d6ea7d
)
reverse usage_nozero default, #25394, from #19917
author
Mark Wells
<mark@freeside.biz>
Sat, 25 Jan 2014 01:00:32 +0000
(17:00 -0800)
committer
Mark Wells
<mark@freeside.biz>
Sat, 25 Jan 2014 01:00:32 +0000
(17:00 -0800)
FS/FS/part_pkg/voip_cdr.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
db0b9e7
..
a55832d
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-279,7
+279,7
@@
tie my %accountcode_tollfree_field, 'Tie::IxHash',
},
#eofalse
},
#eofalse
- 'usage_
nozero' => { 'name' => 'Omit
details for included / no-charge calls.',
+ 'usage_
showzero' => { 'name' => 'Show
details for included / no-charge calls.',
'type' => 'checkbox',
},
'type' => 'checkbox',
},
@@
-352,7
+352,7
@@
tie my %accountcode_tollfree_field, 'Tie::IxHash',
output_format
selfservice_format selfservice_inbound_format
usage_mandate usage_section summarize_usage
output_format
selfservice_format selfservice_inbound_format
usage_mandate usage_section summarize_usage
- usage_
no
zero bill_every_call bill_inactive_svcs
+ usage_
show
zero bill_every_call bill_inactive_svcs
count_available_phones suspend_bill
)
],
count_available_phones suspend_bill
)
],
@@
-416,7
+416,7
@@
sub calc_usage {
: 'default'
);
: 'default'
);
- my $usage_
nozero = $self->option('usage_no
zero', 1);
+ my $usage_
showzero = $self->option('usage_show
zero', 1);
my $formatter = FS::detail_format->new($output_format, buffer => $details);
my $formatter = FS::detail_format->new($output_format, buffer => $details);
@@
-508,7
+508,8
@@
sub calc_usage {
$error = $cdr->set_status('done');
}
die $error if $error;
$error = $cdr->set_status('done');
}
die $error if $error;
- $formatter->append($cdr) unless $usage_nozero && $cdr->rated_price == 0;
+ $formatter->append($cdr)
+ unless $cdr->rated_price == 0 and not $usage_showzero;
$cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated';
} #$cdr
$cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated';
} #$cdr