[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 3d15558284480e5c0cd9dc713de880e6099bf5fd

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  3d15558284480e5c0cd9dc713de880e6099bf5fd (commit)
      from  977bf74053199c902011851d72260c44694a2793 (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 3d15558284480e5c0cd9dc713de880e6099bf5fd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 21 22:14:14 2012 -0700

    freeside-daily optimization

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index cb617a0..bdf7e78 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -191,15 +191,15 @@ sub bill_where {
   # select * from cust_main where
   my $where_pkg = <<"END";
     EXISTS(
-      SELECT 1 FROM cust_pkg
+      SELECT 1 FROM cust_pkg LEFT JOIN part_pkg USING ( pkgpart )
         WHERE cust_main.custnum = cust_pkg.custnum
           AND ( cancel IS NULL OR cancel = 0 )
-          AND (    ( ( setup IS NULL OR setup =  0 )
+          AND (    ( ( cust_pkg.setup IS NULL OR cust_pkg.setup =  0 )
                      AND ( start_date IS NULL OR start_date = 0
                            OR ( start_date IS NOT NULL AND start_date <= $^T )
                          )
                    )
-                OR bill  IS NULL OR bill  <= $billtime 
+                OR ( freq != '0' AND ( bill IS NULL OR bill  <= $billtime ) )
                 OR ( expire  IS NOT NULL AND expire  <= $^T )
                 OR ( adjourn IS NOT NULL AND adjourn <= $^T )
                 OR ( resume  IS NOT NULL AND resume  <= $^T )

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

Summary of changes:
 FS/FS/Cron/bill.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)