diff options
| author | Mark Wells <mark@freeside.biz> | 2012-02-24 08:45:46 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-02-24 09:30:12 -0800 |
| commit | 81a993ab0d0f15d896144f60cbf9477fdf693f76 (patch) | |
| tree | d165b9445ad92bf55f4b47299fda586225f4d742 /FS/FS/detail_format | |
| parent | 7cfa84ec05dd75cd550cbb2c1ddac4161518fd1e (diff) | |
CDR rewriting and included-calls feature, #16271
Diffstat (limited to 'FS/FS/detail_format')
| -rw-r--r-- | FS/FS/detail_format/sum_count.pm | 3 | ||||
| -rw-r--r-- | FS/FS/detail_format/sum_duration.pm | 3 | ||||
| -rw-r--r-- | FS/FS/detail_format/sum_duration_prefix.pm | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/FS/FS/detail_format/sum_count.pm b/FS/FS/detail_format/sum_count.pm index 5cf87c7..c40fcb8 100644 --- a/FS/FS/detail_format/sum_count.pm +++ b/FS/FS/detail_format/sum_count.pm @@ -31,7 +31,8 @@ sub append { my $subtotal = ($svcnums->{$svcnum} ||= { count => 0, duration => 0, amount => 0 }); $subtotal->{count}++; - $subtotal->{amount} += $object->rated_price; + $subtotal->{amount} += $object->rated_price + if $object->freesidestatus ne 'no-charge'; } } diff --git a/FS/FS/detail_format/sum_duration.pm b/FS/FS/detail_format/sum_duration.pm index 4af7f0a..1b967b4 100644 --- a/FS/FS/detail_format/sum_duration.pm +++ b/FS/FS/detail_format/sum_duration.pm @@ -32,7 +32,8 @@ sub append { { count => 0, duration => 0, amount => 0 }); $subtotal->{count}++; $subtotal->{duration} += $object->rated_seconds; - $subtotal->{amount} += $object->rated_price; + $subtotal->{amount} += $object->rated_price + if $object->freesidestatus ne 'no-charge'; } } diff --git a/FS/FS/detail_format/sum_duration_prefix.pm b/FS/FS/detail_format/sum_duration_prefix.pm index 19b6648..d70ad0e 100644 --- a/FS/FS/detail_format/sum_duration_prefix.pm +++ b/FS/FS/detail_format/sum_duration_prefix.pm @@ -47,7 +47,8 @@ sub append { # "' in CDR #".$cdr->acctid."\n"; $subtotal->{count}++; $subtotal->{duration} += $object->rated_seconds; - $subtotal->{amount} += $object->rated_price; + $subtotal->{amount} += $object->rated_price + if $object->freesidestatus ne 'no-charge'; } } |