From 0e256e7b9dcc00dedacf499b92bd1c945248a3b9 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 4 Jan 2012 21:11:01 +0000 Subject: [PATCH] hide zero-charge summary lines, #15535 --- FS/FS/detail_format/sum_count.pm | 5 +++-- FS/FS/detail_format/sum_duration.pm | 5 +++-- FS/FS/detail_format/sum_duration_prefix.pm | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/FS/FS/detail_format/sum_count.pm b/FS/FS/detail_format/sum_count.pm index 8c395e82a..5597de2b2 100644 --- a/FS/FS/detail_format/sum_count.pm +++ b/FS/FS/detail_format/sum_count.pm @@ -41,13 +41,14 @@ sub finish { my $buffer = $self->{buffer}; foreach my $svcnum (keys %$svcnums) { + my $subtotal = $svcnums->{$svcnum}; + next if $subtotal->{amount} < 0.01; + my $cust_svc = qsearchs('cust_svc', { svcnum => $svcnum }) or die "svcnum #$svcnum not found"; my $phonenum = $cust_svc->svc_x->label; warn "processing $phonenum\n" if $DEBUG; - my $subtotal = $svcnums->{$svcnum}; - $self->csv->combine( $phonenum, $subtotal->{count}, diff --git a/FS/FS/detail_format/sum_duration.pm b/FS/FS/detail_format/sum_duration.pm index 0b4cedc4a..16c1de53a 100644 --- a/FS/FS/detail_format/sum_duration.pm +++ b/FS/FS/detail_format/sum_duration.pm @@ -42,13 +42,14 @@ sub finish { my $buffer = $self->{buffer}; foreach my $svcnum (keys %$svcnums) { + my $subtotal = $svcnums->{$svcnum}; + next if $subtotal->{amount} < 0.01; + my $cust_svc = qsearchs('cust_svc', { svcnum => $svcnum }) or die "svcnum #$svcnum not found"; my $phonenum = $cust_svc->svc_x->label; warn "processing $phonenum\n" if $DEBUG; - my $subtotal = $svcnums->{$svcnum}; - $self->csv->combine( $phonenum, $subtotal->{count}, diff --git a/FS/FS/detail_format/sum_duration_prefix.pm b/FS/FS/detail_format/sum_duration_prefix.pm index 275aa57a5..0db62b2b1 100644 --- a/FS/FS/detail_format/sum_duration_prefix.pm +++ b/FS/FS/detail_format/sum_duration_prefix.pm @@ -62,11 +62,13 @@ sub finish { my $total_duration = sum( map { $_->{'duration'} } @subtotals ); $prefix =~ s/(...)(...)/$1 - $2/; + next if $total_amount < 0.01; + $self->csv->combine( $prefix, map({ - ($_->{count} || ''), - ($_->{duration} ? int($_->{duration}/60) . ' min' : '') + $_->{count}, + (int($_->{duration}/60) . ' min'), } @subtotals ), $self->money_char . sprintf('%.02f',$total_amount), ); -- 2.11.0