Lieferanten im Autocomplete von Pickern korrekt behandeln

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

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 3adbab2..560a2de 100644 (file)
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -20,9 +20,11 @@ sub unparsed_value {
 sub _ensure_config {
   my ($self) = @_;
 
-  return $self->config if  $self->config;
+  return $self->config if  defined $self->{config};
   return undef         if !defined $self->config_id;
-  $self->config( SL::DB::CustomVariableConfig->new(id => $self->config_id)->load );
+
+  no warnings 'once';
+  return $::request->cache('config_by_id')->{$self->config_id} //= SL::DB::CustomVariableConfig->new(id => $self->config_id)->load;
 }
 
 sub parse_value {
@@ -38,7 +40,7 @@ sub parse_value {
   }
 
   if ($type =~ m{^(?:date|timestamp)}) {
-    return $self->timestamp_value(defined($unparsed) ? DateTime->from_kivi($unparsed) : undef);
+    return $self->timestamp_value(defined($unparsed) ? DateTime->from_kivitendo($unparsed) : undef);
   }
 
   # text, textfield, select
@@ -62,17 +64,17 @@ sub value {
     require SL::DB::Customer;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Customer->new(id => $id)->load() : undef;
   } elsif ( $type eq 'vendor' ) {
     require SL::DB::Vendor;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Vendor->new(id => $id)->load() : undef;
   } elsif ( $type eq 'part' ) {
     require SL::DB::Part;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Part->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Part->new(id => $id)->load() : undef;
   }
 
   goto &text_value; # text, textfield, date and select
@@ -80,7 +82,8 @@ sub value {
 
 sub value_as_text {
   my $self = $_[0];
-  my $type = $self->config->type;
+  my $cfg  = $self->_ensure_config;
+  my $type = $cfg->type;
 
   die 'not an accessor' if @_ > 1;
 
@@ -89,7 +92,7 @@ sub value_as_text {
   } elsif ($type eq 'timestamp') {
     return $::locale->reformat_date( { dateformat => 'yy-mm-dd' }, $self->timestamp_value->ymd, $::myconfig{dateformat});
   } elsif ($type eq 'number') {
-    return $::form->format_amount(\%::myconfig, $self->number_value, $self->config->processed_options->{PRECISION});
+    return $::form->format_amount(\%::myconfig, $self->number_value, $cfg->processed_options->{PRECISION});
   } elsif ( $type eq 'customer' ) {
     require SL::DB::Customer;
 
@@ -100,7 +103,8 @@ sub value_as_text {
     require SL::DB::Vendor;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+    my $vendor =  $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+    return $vendor ? $vendor->name : '';
   } elsif ( $type eq 'part' ) {
     require SL::DB::Part;
 
@@ -118,7 +122,7 @@ sub is_valid {
   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;
+  return (SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0) ? 1 : 0;
 }
 
 1;