X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_location.pm;h=309ab0631e7cac56aaf73533af06ed05c6d4f24d;hb=5f8111de04a4a914c72a1642722476db4728339c;hp=70ccbfd7ecede9231c91a9ca8c7f3e1f379dc736;hpb=496842b7db855bd616844c7667e5d70de42535fd;p=freeside.git

diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index 70ccbfd7e..309ab0631 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -438,8 +438,8 @@ sub disable_if_unused {
 
   my $self = shift;
   my $locationnum = $self->locationnum;
-  return '' if FS::cust_main->count('bill_locationnum = '.$locationnum)
-            or FS::cust_main->count('ship_locationnum = '.$locationnum)
+  return '' if FS::cust_main->count('bill_locationnum = '.$locationnum.' OR
+                                     ship_locationnum = '.$locationnum)
             or FS::contact->count(      'locationnum  = '.$locationnum)
             or FS::cust_pkg->count('cancel IS NULL AND 
                                          locationnum  = '.$locationnum)