X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fqual.pm;h=8f58389730dea4cfe574018526e5e8c90563e989;hb=88d8ee93b964e9c291be6e35e0c81c71e454d72a;hp=23a82722441631c8a73242b6bb0855f70a7398a9;hpb=19f2731dbceb444c5dd45f57fb0a785dcaf9aa65;p=freeside.git

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 23a827224..8f5838973 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -141,11 +141,22 @@ sub location {
     if ( $self->locationnum ) {
 	my $l = qsearchs( 'cust_location', 
 		    { 'locationnum' => $self->locationnum });
-	return $l->location_hash if $l;
+	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 });
-	return $c->location_hash if $c;
+	
+	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;
+	}
     }
   # prospectnum does not imply any particular address! must specify locationnum