From 1ac6983f11ce30a2196ef5e44c051a34c776831f Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Fri, 20 Feb 2015 14:40:16 -0800 Subject: [PATCH] unbreak projected future revenue query, #33599, fallout from #32472 --- FS/FS/Report/Table.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/FS/FS/Report/Table.pm b/FS/FS/Report/Table.pm index 69686df9b..479747307 100644 --- a/FS/FS/Report/Table.pm +++ b/FS/FS/Report/Table.pm @@ -495,12 +495,17 @@ sub _cust_bill_pkg_recurring { my @where = ( '(pkgnum != 0 OR feepart IS NOT NULL)', - $self->with_classnum($opt{'classnum'}, $opt{'use_override'}), $self->with_report_option(%opt), $self->with_refnum(%opt), $self->with_cust_classnum(%opt) ); + my $where_classnum = $self->with_classnum($opt{'classnum'}, $opt{'use_override'}); + if ($opt{'project'}) { + $where_classnum =~ s/\bcust_bill_pkg/v_cust_bill_pkg/g; + } + push @where, $where_classnum; + if ( $opt{'distribute'} ) { $where[0] = 'pkgnum != 0'; # specifically exclude fees push @where, "cust_main.agentnum = $agentnum" if $agentnum; -- 2.11.0