projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't display a non-sensical duration for open sessions, RT#34966
[freeside.git]
/
FS
/
FS
/
part_event.pm
diff --git
a/FS/FS/part_event.pm
b/FS/FS/part_event.pm
index
b7371c9
..
69725b0
100644
(file)
--- a/
FS/FS/part_event.pm
+++ b/
FS/FS/part_event.pm
@@
-285,7
+285,9
@@
sub targets {
}
# this is the 'event' side
}
# this is the 'event' side
- my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
+ my $join = FS::part_event_condition->join_conditions_sql( $eventtable,
+ 'time' => $time
+ );
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time' => $time
);
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time' => $time
);
@@
-583,6
+585,7
@@
sub actions {
(
map { $_ => $actions{$_} }
sort { $actions{$a}->{'default_weight'}<=>$actions{$b}->{'default_weight'} }
(
map { $_ => $actions{$_} }
sort { $actions{$a}->{'default_weight'}<=>$actions{$b}->{'default_weight'} }
+ # || $actions{$a}->{'description'} cmp $actions{$b}->{'description'} }
$class->all_actions( $eventtable )
);
$class->all_actions( $eventtable )
);