[freeside-commits] branch master updated. 1ac6983f11ce30a2196ef5e44c051a34c776831f

[Mark Wells]

The branch, master has been updated
       via  1ac6983f11ce30a2196ef5e44c051a34c776831f (commit)
      from  4bbd2db7a016d9da19f1524895e3d04c3abf89a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ac6983f11ce30a2196ef5e44c051a34c776831f
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Feb 20 14:40:16 2015 -0800

    unbreak projected future revenue query, #33599, fallout from #32472

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;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Report/Table.pm |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)