diff options
| author | Mark Wells <mark@freeside.biz> | 2014-06-11 15:18:59 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2014-06-11 15:18:59 -0700 |
| commit | 6b28d0bd4b422d0fff32b559d0785665b1c46b27 (patch) | |
| tree | d24d5bf2f2ab9560a0690b5550a58da0deab51f8 /FS/FS/cust_main/Billing.pm | |
| parent | c16ef0145a0049c3f20377e2c5076087e999cde0 (diff) | |
always pass the "time" parameter to join_conditions_sql, related to #28978
Diffstat (limited to 'FS/FS/cust_main/Billing.pm')
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index 2878276..545243c 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1784,7 +1784,8 @@ sub retry_realtime { #a little false laziness w/due_cust_event (not too bad, really) - my $join = FS::part_event_condition->join_conditions_sql; + # I guess this is always as of now? + my $join = FS::part_event_condition->join_conditions_sql('', 'time' => time); my $order = FS::part_event_condition->order_conditions_sql; my $mine = '( ' @@ -2097,7 +2098,8 @@ sub due_cust_event { #some false laziness w/Cron::bill bill_where - my $join = FS::part_event_condition->join_conditions_sql( $eventtable); + my $join = FS::part_event_condition->join_conditions_sql( $eventtable, + 'time' => $opt{'time'}); my $where = FS::part_event_condition->where_conditions_sql($eventtable, 'time'=>$opt{'time'}, ); @@ -2136,7 +2138,8 @@ sub due_cust_event { my $pkey = $object->primary_key; $cross_where = "$eventtable.$pkey = ". $object->$pkey(); - my $join = FS::part_event_condition->join_conditions_sql( $eventtable ); + my $join = FS::part_event_condition->join_conditions_sql( $eventtable, + 'time' => $opt{'time'}); my $extra_sql = FS::part_event_condition->where_conditions_sql( $eventtable, 'time'=>$opt{'time'} |