[freeside-commits] freeside/FS/FS/Cron bill.pm,1.26,1.27

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/Cron
In directory wavetail.420.am:/tmp/cvs-serv8501/FS/FS/Cron

Modified Files:
	bill.pm 
Log Message:
Emailing statements of accounts, RT#4860

Index: bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Cron/bill.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- bill.pm	17 Jul 2009 22:26:38 -0000	1.26
+++ bill.pm	20 Aug 2009 04:03:35 -0000	1.27
@@ -194,13 +194,14 @@
     my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
                                                                 'time'=>$time,
                                                               );
+    my $where = "AND $where" if $where;
 
     my $are_part_event = 
       "EXISTS ( SELECT 1 FROM part_event $join
                   WHERE check_freq = '$check_freq'
                     AND eventtable = '$eventtable'
                     AND ( disabled = '' OR disabled IS NULL )
-                    AND $where
+                    $where
               )
       ";