X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fprospect_main.pm;h=67e91cf994fc2b674bdd968736ca075496eb1882;hp=f600b23e9ccc78372460c626fc6483b9ec3e4b1b;hb=e0b6fe25cca1e2ff566cc0765f6c9fa24ed66ba8;hpb=229373d8ab3b19351e14f345eb42344b8ed72d35 diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm index f600b23e9..67e91cf99 100644 --- a/FS/FS/prospect_main.pm +++ b/FS/FS/prospect_main.pm @@ -270,8 +270,11 @@ sub name { my $self = shift; return $self->company if $self->company; - my $contact = ($self->prospect_contact)[0]->contact; #first contact? good enough for now - return $contact->line if $contact; + my $prospect_contact = ($self->prospect_contact)[0]; #first contact? good enough for now + my $contact = $prospect_contact->contact if $prospect_contact; + return $contact->line if $prospect_contact && $contact; + + #address? 'Prospect #'. $self->prospectnum; } @@ -352,9 +355,6 @@ sub convert_cust_main { my @contact = map $_->contact, $self->prospect_contact; - #XXX define one contact type as "billing", then we could pick just that one - my @invoicing_list = map $_->emailaddress, map $_->contact_email, @contact; - #XXX i'm not compatible with cust_main-require_phone (which is kind of a # pre-contact thing anyway) @@ -379,7 +379,7 @@ sub convert_cust_main { #$cust_main->payby('BILL'); #$cust_main->paydate('12/2037'); - $cust_main->insert( {}, \@invoicing_list, + $cust_main->insert( {}, 'prospectnum' => $self->prospectnum, ) or $cust_main;