summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2016-06-27 22:40:44 -0500
committerJonathan Prykop <jonathan@freeside.biz>2016-06-28 06:58:36 -0500
commita3d005eab682ad0ff9bbb75d6794bd0279f123da (patch)
tree4efe88177c460e22f473ead1fdfd11a79cc4e72d /FS
parentba4c3441c41303528ad0a51efa23e916083bb3ee (diff)
RT#15006: Bug? Cancelled customers shown in reports?
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/cust_main.pm13
1 files changed, 4 insertions, 9 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 79e674d56..1b8e0330a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4972,15 +4972,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