projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e1bf013
)
fix dated one-time charges with freeside-daily -d, RT#29339
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 6 Jun 2014 20:48:01 +0000
(13:48 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 6 Jun 2014 20:48:01 +0000
(13:48 -0700)
FS/FS/Cron/bill.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
807d5cf
..
d3f1eb4
100644
(file)
--- 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;
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(
# 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
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 ) )
)
)
OR ( freq != '0' AND ( bill IS NULL OR bill <= $billtime ) )