diff options
author | Jason Terry <jterry@jterry-mac.local> | 2014-05-01 14:41:02 -0600 |
---|---|---|
committer | Jason Terry <jterry@jterry-mac.local> | 2014-05-01 14:41:02 -0600 |
commit | 53ac9ee9aff3755c4206f800a5d5a4dd8fc4242b (patch) | |
tree | cb93795f9fc2a45ad0c1572f2a34c6404603d9fb /FS | |
parent | 719e8f45844d5ebc81f14c25258b4c0b0448910e (diff) |
Performance improvement on count location data.
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/Schema.pm | 2 | ||||
-rw-r--r-- | 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 ae43b60..94d7f36 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1617,6 +1617,8 @@ sub tables_hashref { [ 'referral_custnum' ], [ 'payby' ], [ 'paydate' ], [ 'archived' ], + [ 'ship_locationnum' ], + [ 'bill_locationnum' ], ], 'foreign_keys' => [ { columns => [ 'agentnum' ], diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index 70ccbfd..309ab06 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) |