Performance improvement on count location data.

Conflicts:
	FS/FS/Schema.pm

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 849dc3e..86acbbf 100644 (file)
--- 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 8412a39..2e0871d 100644 (file)
--- 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)