From ad53c8a887998e8054f0b26eea5878e6c9520685 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 8 Jan 2015 09:05:55 -0800 Subject: [PATCH] ut_foreign_key still requires a value in v4 though, RT#13971 --- FS/FS/Record.pm | 2 +- FS/FS/prospect_main.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 765880e5e..781230fad 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -3093,7 +3093,7 @@ on the column first. sub ut_foreign_key { my( $self, $field, $table, $foreign ) = @_; - return '' if $no_check_foreign; + return $self->ut_number($field) if $no_check_foreign; qsearchs($table, { $foreign => $self->getfield($field) }) or return "Can't find ". $self->table. ".$field ". $self->getfield($field). " in $table.$foreign"; diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm index 79b3f6748..f30508d34 100644 --- a/FS/FS/prospect_main.pm +++ b/FS/FS/prospect_main.pm @@ -243,8 +243,8 @@ sub check { my $error = $self->ut_numbern('prospectnum') - || $self->ut_foreign_key( 'agentnum', 'agent', 'agentnum' ) - || $self->ut_foreign_key( 'refnum', 'part_referral', 'refnum' ) + || $self->ut_foreign_key( 'agentnum', 'agent', 'agentnum' ) + || $self->ut_foreign_keyn( 'refnum', 'part_referral', 'refnum' ) || $self->ut_textn('company') ; return $error if $error; -- 2.11.0