From: ivan Date: Tue, 21 Sep 2010 03:56:02 +0000 (+0000) Subject: skip_max_callers meaning was reversed. doh! RT#9907 X-Git-Tag: TORRUS_1_0_9~288 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fef4b45b04c7c0ad5e32dc93a904983a4383fbb7 skip_max_callers meaning was reversed. doh! RT#9907 --- diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm index 41c0888d3..321be2ac3 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -95,6 +95,10 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'select_label' => 'ratename', }, + 'min_included' => { 'name' => 'Minutes included when using "single price per minute" rating method', + }, + + 'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method', }, @@ -185,7 +189,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); 'skip_lastapp' => { 'name' => 'Do not charge for CDRs where the lastapp matches this value: ', }, - 'skip_max_callers' => { 'name' => 'Do not charge for CDRs where max_callers is greater than this value: ', + 'skip_max_callers' => { 'name' => 'Do not charge for CDRs where max_callers is less than or equal to this value: ', }, 'use_duration' => { 'name' => 'Calculate usage based on the duration field instead of the billsec field', @@ -908,10 +912,10 @@ sub check_chargable { } - return "max_callers > $opt{skip_max_callers}" + return "max_callers <= $opt{skip_max_callers}" if length($opt{'skip_max_callers'}) and length($cdr->max_callers) - and $cdr->max_callers > $opt{'skip_max_callers'}; + and $cdr->max_callers <= $opt{'skip_max_callers'}; #all right then, rate it '';