Merge branch 'patch-19' of https://github.com/gjones2/Freeside

[freeside.git] / FS / FS / Cron / bill.pm

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 6e110e8..98ce8fa 100644 (file)
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -201,7 +201,8 @@ sub bill_where {
   # generate where_pkg/where_event search clause
   ###
 
-  my $billtime = day_end($time);
+  my $conf = new FS::Conf;
+  my $billtime = $conf->exists('next-bill-ignore-time') ? day_end($time) : $time;
 
   # select * from cust_main where
   my $where_pkg = <<"END";