[freeside-commits] branch master updated. e4c1781de43835fea0f2997c35de2395d06f220f

[Christopher Burger]

The branch, master has been updated
       via  e4c1781de43835fea0f2997c35de2395d06f220f (commit)
      from  8736115c9857c7779baf5d4f54a06a72d6f5ed06 (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 e4c1781de43835fea0f2997c35de2395d06f220f
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Nov 12 10:09:26 2018 -0500

    RT# 81594 - fix package churn report to properly get future revenue value of changed packages

diff --git a/FS/FS/Report/Table.pm b/FS/FS/Report/Table.pm
index 7c4f97309..d7b100df6 100644
--- a/FS/FS/Report/Table.pm
+++ b/FS/FS/Report/Table.pm
@@ -973,12 +973,15 @@ sub revenue_pkg {
 
   my $sql;
 
+## if package has changed and has not reached next due date it will not be in h_cust_bill.
+## this causes problems with future months, needed to use change_pkgnum instead.
+
   if ($status eq "active") {
     $sql = "SELECT DISTINCT ON (revenue.pkgnum) revenue.pkgnum AS pkgnum, revenue.recur AS revenue
       FROM $from
       JOIN part_pkg ON (cust_pkg.pkgpart = part_pkg.pkgpart)
       JOIN cust_main ON (cust_pkg.custnum = cust_main.custnum)
-      JOIN h_cust_bill_pkg AS revenue ON (cust_pkg.pkgnum = revenue.pkgnum AND cust_pkg.history_date < $speriod )
+      JOIN h_cust_bill_pkg AS revenue ON ((cust_pkg.pkgnum = revenue.pkgnum OR cust_pkg.change_pkgnum = revenue.pkgnum) AND cust_pkg.history_date < $speriod )
     ";
   }
   elsif ($status eq "setup") {

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

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