X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FCustomVariable.pm;h=144acef00395cb83a325f77e0bc9c20e75568b32;hb=eed2ea364f31c49d86ee4570759a987dc242483f;hp=c90e03800b935487d079dc2c5c32aa71c9bb0394;hpb=55c51cd5afd63451058373729bd689d7d726d147;p=kivitendo-erp.git

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index c90e03800..144acef00 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -4,10 +4,7 @@
 package SL::DB::CustomVariable;
 
 use strict;
-
 use SL::DB::MetaSetup::CustomVariable;
-use SL::DB::CustomVariableValidity;
-use SL::DB::Customer;
 
 __PACKAGE__->meta->initialize;
 
@@ -21,22 +18,38 @@ sub value {
   goto &bool_value      if $type eq 'boolean';
   goto &timestamp_value if $type eq 'timestamp';
   goto &number_value    if $type eq 'number';
+
+  if ( $_[1] && ($type eq 'customer' || $type eq 'vendor' || $type eq 'part') ) {
+    $self->number_value($_[1]);
+  }
+
   if ( $type eq 'customer' ) {
-    if ( defined($_[1]) && $_[1] ) {
-      goto &number_value;
-    }
-    else {
-      my $id = int($self->number_value);
-      return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
-    }
+    require SL::DB::Customer;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
+  } elsif ( $type eq 'vendor' ) {
+    require SL::DB::Vendor;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+  } elsif ( $type eq 'part' ) {
+    require SL::DB::Part;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Part->new(id => $id)->load() : 0;
   }
-  goto &text_value; # text and select
+
+  goto &text_value; # text, textfield, date and select
 }
 
 sub is_valid {
   my ($self) = @_;
 
-  return SL::DB::Manager::CustomVariableValidity->get_all_count(config_id => $self->config_id, trans_id => $self->trans_id) == 0;
+  require SL::DB::CustomVariableValidity;
+
+  my $query = [config_id => $self->config_id, trans_id => $self->trans_id];
+  return SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0;
 }
 
 1;