Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / SL / DB / CustomVariable.pm

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index edc595c..144acef 100644 (file)
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -18,18 +18,29 @@ 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 {
-      require SL::DB::Customer;
-
-      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 {
@@ -37,7 +48,8 @@ sub is_valid {
 
   require SL::DB::CustomVariableValidity;
 
-  return SL::DB::Manager::CustomVariableValidity->get_all_count(config_id => $self->config_id, trans_id => $self->trans_id) == 0;
+  my $query = [config_id => $self->config_id, trans_id => $self->trans_id];
+  return SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0;
 }
 
 1;