X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fqual.pm;h=8f58389730dea4cfe574018526e5e8c90563e989;hb=ee7237176092487cd7e6919fcd5941dda5791239;hp=553de136a8e6e8e9912d57821db9dbde270a0e34;hpb=ad17d8651adb39fdef45f509490a6b2c6eac8301;p=freeside.git

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 553de136a..8f5838973 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -127,24 +127,67 @@ sub check {
   $self->SUPER::check;
 }
 
+sub part_export {
+    my $self = shift;
+    if ( $self->exportnum ) {
+	return qsearchs('part_export', { exportnum => $self->exportnum } )
+		or die 'invalid exportnum';
+    }
+    '';
+}
+
 sub location {
     my $self = shift;
     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
 
     '';
 }
 
+sub cust_or_prospect {
+    my $self = shift;
+    if ( $self->locationnum ) {
+	my $l = qsearchs( 'cust_location', 
+		    { 'locationnum' => $self->locationnum });
+	return qsearchs('cust_main',{ 'custnum' => $l->custnum })
+	    if $l->custnum;
+	return qsearchs('prospect_main',{ 'prospectnum' => $l->prospectnum })
+	    if $l->prospectnum;
+    }
+    return qsearchs('cust_main', { 'custnum' => $self->custnum }) 
+	if $self->custnum;
+    return qsearchs('prospect_main', { 'prospectnum' => $self->prospectnum })
+	if $self->prospectnum;
+}
+
 sub status_long {
-    
+    my $self = shift;
+    my $s = {
+	'Q' => 'Qualified',
+	'D' => 'Does not Qualify',
+	'N' => 'New',
+    };
+    return $s->{$self->status} if defined $s->{$self->status};
+    return 'Unknown';
 }
 
 =back