qualification search improvements, RT#7111

diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index bace1f0..78e865a 100644 (file)
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -210,6 +210,15 @@ sub check {
   $self->SUPER::check;
 }
 
+=item name
+
+=cut
+
+sub name {
+  my $self = shift;
+  $self->company; #at least until this is nullable
+}
+
 =item contact
 
 Returns the contacts (see L<FS::contact>) associated with this prospect.

diff --git a/httemplate/search/qual.cgi b/httemplate/search/qual.cgi
index cf4f3d1..1803ab8 100755 (executable)
--- a/httemplate/search/qual.cgi
+++ b/httemplate/search/qual.cgi
@@ -21,19 +21,11 @@
                                        my $self = shift;
                                        $self->status_long;
                                      },
-                                     sub {
-                                         my $self = shift;
-                                         my $cust_or_prospect = $self->cust_or_prospect;
-                                         return $cust_or_prospect->name 
-                                           if $cust_or_prospect->get('custnum');
-                                         return "Prospect #".$cust_or_prospect->prospectnum
-                                           if $cust_or_prospect->get('prospectnum');
-                                         '';
-                                     },
+                                     sub { shift->cust_or_prospect->name },
                                      'phonenum',
                                      sub {
                                        my $self = shift;
-                                       my %location_hash = $self->location;
+                                       my %location_hash= $self->location_hash;
                                        # ugh...
                                        if ( %location_hash ) {
                                            my $loc = new FS::cust_location(\%location_hash);