X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fqual.pm;h=c11b4608ee932f5e65cc31fcb04361da37776b63;hp=98e137c6bd42f6b946061b212d34329eb31c5734;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hpb=1888d732dcc9f50b7f88ebc684d1c05b534cbd92

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 98e137c6b..c11b4608e 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -1,8 +1,8 @@
 package FS::qual;
+use base qw( FS::option_Common );
 
 use strict;
-use base qw( FS::option_Common );
-use FS::Record qw( qsearch qsearchs dbh );
+use FS::Record qw(dbh);
 
 =head1 NAME
 
@@ -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;
@@ -101,7 +102,7 @@ sub insert {
 
   my @qual_option = ();
   if ( $self->exportnum ) {
-    my $export = qsearchs( 'part_export', { 'exportnum' => $self->exportnum } )
+    my $export = $self->part_export
       or die 'Invalid exportnum';
 
     my $qres = $export->qual($self);
@@ -175,38 +176,22 @@ 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_hash {
-    my $self = shift;
-    use Data::Dumper; warn Dumper($self);
-    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 ();
@@ -215,17 +200,13 @@ sub location_hash {
 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;
+	my $l = $self->cust_location;
+	return $l->cust_main     if $l->custnum;
+	return $l->prospect_main if $l->prospectnum;
     }
-    return qsearchs('cust_main', { 'custnum' => $self->custnum }) 
-	if $self->custnum;
-    return qsearchs('prospect_main', { 'prospectnum' => $self->prospectnum })
-	if $self->prospectnum;
+    return $self->cust_main     if $self->custnum;
+    return $self->cust_prospect if $self->prospectnum;
+    '';
 }
 
 sub status_long {