[freeside-commits] branch FREESIDE_3_BRANCH updated. 994fb235ccacdda0db4d37320c9842d0cba149d4

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  994fb235ccacdda0db4d37320c9842d0cba149d4 (commit)
      from  363d2534c06c8c5640138af815ea1d8ac9ee621f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 994fb235ccacdda0db4d37320c9842d0cba149d4
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Jun 13 10:48:38 2013 -0700

    allow invalid locations to be disabled anyway, #23446

diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index a834859..b98ade1 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -257,12 +257,12 @@ and replace methods.
 
 =cut
 
-#some false laziness w/cust_main, but since it should eventually lose these
-#fields anyway...
 sub check {
   my $self = shift;
   my $conf = new FS::Conf;
 
+  return '' if $self->disabled; # so that disabling locations never fails
+
   my $error = 
     $self->ut_numbern('locationnum')
     || $self->ut_foreign_keyn('prospectnum', 'prospect_main', 'prospectnum')

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_location.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)