X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=3fb0a87fb54869a464f900fb87af75ef8f4f7b1e;hp=ecd30702f622c7a47d24e4dab15a7433e11f5e07;hb=735f73aec092f56df6289e0fe4f655d57c11f93f;hpb=6fbdc0d20421de8e0d93eb9d332a0683efb994cc

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ecd30702f..3fb0a87fb 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4769,15 +4769,10 @@ Returns an SQL expression identifying un-cancelled cust_main records.
 =cut
 
 sub uncancelled_sql { uncancel_sql(@_); }
-sub uncancel_sql { "
-  ( 0 < ( $select_count_pkgs
-                   AND ( cust_pkg.cancel IS NULL
-                         OR cust_pkg.cancel = 0
-                       )
-        )
-    OR 0 = ( $select_count_pkgs )
-  )
-"; }
+sub uncancel_sql {
+  my $self = shift;
+  "( NOT (".$self->cancelled_sql.") )"; #sensitive to cust_main-status_module
+}
 
 =item balance_sql