X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fqual.pm;h=07878e9c25ad2d41c58374861a7b03a201f1fe94;hp=d0b3fbdfe8624c79ff4219d4ea1111339bea2026;hb=395cc72629d31c8dcd138acf423e66d2d73d89d2;hpb=528e7e1cb1a6d05f87847bf9fd9b7e0e9fc33f6f

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index d0b3fbdfe..07878e9c2 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -185,28 +185,34 @@ sub part_export {
     '';
 }
 
+sub cust_location {
+  my $self = shift;
+  return '' unless $self->locationnum;
+  qsearchs('cust_location', { 'locationnum' => $self->locationnum } );
+}
+
+sub cust_main {
+  my $self = shift;
+  return '' unless $self->custnum;
+  qsearchs('cust_main', { 'custnum' => $self->custnum } );
+}
+
 sub location_hash {
-    my $self = shift;
-    if ( $self->locationnum ) {
-	my $l = qsearchs( 'cust_location', 
-		    { 'locationnum' => $self->locationnum });
-	if ( $l ) {
-	    my %loc_hash = $l->location_hash;
-	    $loc_hash{locationnum} = $self->locationnum;
-	    return %loc_hash;
-	}
-    }
-    if ( $self->custnum ) {
-	my $c = qsearchs( 'cust_main', { 'custnum' => $self->custnum });
-	
-	if($c) {
-	    # always override location_kind as it would never be known in the 
-	    # case of cust_main "default service address"
-	    my %loc_hash = $c->location_hash;
-	    $loc_hash{location_kind} = $c->company ? 'B' : 'R';
-	    return %loc_hash;
-	}
-    }
+  my $self = shift;
+
+  if ( my $l = $self->cust_location ) {
+    my %loc_hash = $l->location_hash;
+    $loc_hash{locationnum} = $self->locationnum;
+    return %loc_hash;
+  }
+
+  if ( my $c = $self->cust_main ) {
+    # always override location_kind as it would never be known in the 
+    # case of cust_main "default service address"
+    my %loc_hash = $c->location_hash;
+    $loc_hash{location_kind} = $c->company ? 'B' : 'R';
+    return %loc_hash;
+  }
 
   warn "prospectnum does not imply any particular address! must specify locationnum";
   return ();
@@ -226,6 +232,7 @@ sub cust_or_prospect {
 	if $self->custnum;
     return qsearchs('prospect_main', { 'prospectnum' => $self->prospectnum })
 	if $self->prospectnum;
+    '';
 }
 
 sub status_long {