diff options
author | Mark Wells <mark@freeside.biz> | 2015-02-20 14:40:16 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2015-02-20 14:40:21 -0800 |
commit | 1ac6983f11ce30a2196ef5e44c051a34c776831f (patch) | |
tree | d9581511f3e78adb366c10d647b1422321b16e8f /FS/FS/Report | |
parent | 4bbd2db7a016d9da19f1524895e3d04c3abf89a4 (diff) |
unbreak projected future revenue query, #33599, fallout from #32472
Diffstat (limited to 'FS/FS/Report')
-rw-r--r-- | FS/FS/Report/Table.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/Report/Table.pm b/FS/FS/Report/Table.pm index 69686df..4797473 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; |