From 1178e0ec7d2789819e42966181f36bba1e6e0f4c Mon Sep 17 00:00:00 2001
From: Jason Terry <jterry@jterry-mac.local>
Date: Thu, 1 May 2014 14:41:02 -0600
Subject: [PATCH] Performance improvement on count location data.

Conflicts:
	FS/FS/Schema.pm
---
 FS/FS/Schema.pm        | 2 ++
 FS/FS/cust_location.pm | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 849dc3e83..86acbbf55 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1186,6 +1186,8 @@ sub tables_hashref {
                    [ 'referral_custnum' ],
                    [ 'payby' ], [ 'paydate' ],
                    [ 'archived' ],
+                   [ 'ship_locationnum' ],
+                   [ 'bill_locationnum' ],
                  ],
     },
 
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index 8412a39e1..2e0871ddb 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)
-- 
2.20.1