[freeside-commits] freeside/FS/FS cust_main.pm,1.430,1.431

[Ivan,,,]

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

Modified Files:
	cust_main.pm 
Log Message:
AND helps alot, RT#5572 for real

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- cust_main.pm	19 Jun 2009 07:14:42 -0000	1.430
+++ cust_main.pm	19 Jun 2009 07:46:29 -0000	1.431
@@ -2263,7 +2263,7 @@
   my ( $self, $time ) = @_;
 
   my @cancel_pkgs = $self->ncancelled_pkgs( { 
-    'extra_sql' => " expire IS NOT NULL AND expire > 0 AND expire <= $time ",
+    'extra_sql' => " AND expire IS NOT NULL AND expire > 0 AND expire <= $time "
   } );
 
   foreach my $cust_pkg ( @cancel_pkgs ) {
@@ -2285,10 +2285,10 @@
 
   my @susp_pkgs = $self->ncancelled_pkgs( {
     'extra_sql' =>
-      " ( susp IS NULL OR susp = 0 )
-         AND (    ( bill    IS NOT NULL AND bill    != 0 AND bill    <  $time )
-               OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
-             )
+      " AND ( susp IS NULL OR susp = 0 )
+        AND (    ( bill    IS NOT NULL AND bill    != 0 AND bill    <  $time )
+              OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
+            )
       ",
   } );