ut_foreign_key still requires a value in v4 though, RT#13971
authorIvan Kohler <ivan@freeside.biz>
Thu, 8 Jan 2015 17:05:55 +0000 (09:05 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 8 Jan 2015 17:05:55 +0000 (09:05 -0800)
FS/FS/Record.pm
FS/FS/prospect_main.pm

index 765880e..781230f 100644 (file)
@@ -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";
index 79b3f67..f30508d 100644 (file)
@@ -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;