X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fqual.pm;h=07878e9c25ad2d41c58374861a7b03a201f1fe94;hb=dafdfc24616b04a5ff594da31e2cdd03f58634b6;hp=e7483825f51f4f099d7d244144f15683d818f27f;hpb=4e76632c66f001a4f4d97aadc308038172eaeaa7;p=freeside.git

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index e7483825f..07878e9c2 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -91,7 +91,8 @@ sub insert {
 
   if ( $options{'cust_location'} ) {
     my $cust_location = $options{'cust_location'};
-    my $error = $cust_location->insert;
+    my $method = $cust_location->locationnum ? 'replace' : 'insert';
+    my $error = $cust_location->$method();
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -184,31 +185,37 @@ sub part_export {
     '';
 }
 
-sub location {
-    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;
-	}
-    }
-  # prospectnum does not imply any particular address! must specify locationnum
+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 ( 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 ();
 }
 
 sub cust_or_prospect {
@@ -225,6 +232,7 @@ sub cust_or_prospect {
 	if $self->custnum;
     return qsearchs('prospect_main', { 'prospectnum' => $self->prospectnum })
 	if $self->prospectnum;
+    '';
 }
 
 sub status_long {