From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 6 Jun 2014 20:48:03 +0000 (-0700)
Subject: fix dated one-time charges with freeside-daily -d, RT#29339
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=290c3c20dfc9827efe4ead0373468ef2de5379a1

fix dated one-time charges with freeside-daily -d, RT#29339
---

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 807d5cfec..d3f1eb42b 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -210,6 +210,8 @@ sub bill_where {
   my $conf = new FS::Conf;
   my $billtime = $conf->exists('next-bill-ignore-time') ? day_end($time) : $time;
 
+  # corresponds to perl checks in FS::cust_main::Billing sub bill
+  #  ("bill setup" and "bill recurring fee")
   # select * from cust_main where
   my $where_pkg = <<"END";
     EXISTS(
@@ -218,7 +220,7 @@ sub bill_where {
           AND ( cancel IS NULL OR cancel = 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 ( start_date IS NOT NULL AND start_date <= $billtime )
                          )
                    )
                 OR ( freq != '0' AND ( bill IS NULL OR bill  <= $billtime ) )