diff options
author | ivan <ivan> | 2011-08-05 23:20:03 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-08-05 23:20:03 +0000 |
commit | 0d2c8c61b8c5644c7dedcffcb28210f9a0cec55d (patch) | |
tree | c6bd27be4003f30130007c8747af1bda92bba315 /FS/FS/Cron | |
parent | 46004e1530dbc6c45e01c432f0e8d88fc65c2ee2 (diff) |
honor next-bill-ignore-time when searching for customers to bill also, RT#12570
Diffstat (limited to 'FS/FS/Cron')
-rw-r--r-- | FS/FS/Cron/bill.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm index 7388733d4..88fe69b77 100644 --- a/FS/FS/Cron/bill.pm +++ b/FS/FS/Cron/bill.pm @@ -7,6 +7,7 @@ use Date::Parse; use DBI 1.33; #The "clone" method was added in DBI 1.33. use FS::UID qw( dbh driver_name ); use FS::Record qw( qsearch qsearchs ); +use FS::Misc::DateTime qw( day_end ); use FS::queue; use FS::cust_main; use FS::part_event; @@ -184,6 +185,8 @@ sub bill_where { # generate where_pkg/where_event search clause ### + my $billtime = day_end($time); + # select * from cust_main where my $where_pkg = <<"END"; EXISTS( @@ -195,7 +198,7 @@ sub bill_where { OR ( start_date IS NOT NULL AND start_date <= $^T ) ) ) - OR bill IS NULL OR bill <= $time + OR bill IS NULL OR bill <= $billtime OR ( expire IS NOT NULL AND expire <= $^T ) OR ( adjourn IS NOT NULL AND adjourn <= $^T ) ) |