X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_event.pm;h=69725b07e36bb171c6250f711279d290f08b0eb2;hb=4e25bd8f9404fa4ff28d3d75e6a0a7453678407c;hp=b7371c9ab993b7cb1f2dc4e2f4f745005d2741c4;hpb=0af38652da3b3be7da2d35b048285ef6f2194e1a;p=freeside.git

diff --git a/FS/FS/part_event.pm b/FS/FS/part_event.pm
index b7371c9ab..69725b07e 100644
--- a/FS/FS/part_event.pm
+++ b/FS/FS/part_event.pm
@@ -285,7 +285,9 @@ sub targets {
   }
 
   # 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
   );
@@ -583,6 +585,7 @@ sub actions {
   (
     map  { $_ => $actions{$_} }
     sort { $actions{$a}->{'default_weight'}<=>$actions{$b}->{'default_weight'} }
+       # || $actions{$a}->{'description'} cmp $actions{$b}->{'description'} }
     $class->all_actions( $eventtable )
   );