X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FCustomVariable.pm;h=e48c1d82971d955f97dd2b8d4e7d50a166af19bc;hb=075499b035a29c2144f8fa066d65575b4bde755c;hp=fb990b0ce586ec0e2286d7dbe3f24eeb8330d869;hpb=6634ba45debbd7371b8740592d9821ba5e58ff5d;p=kivitendo-erp.git

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index fb990b0ce..e48c1d829 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -76,7 +76,7 @@ sub value {
     my $id = int($self->number_value);
     return $id ? SL::DB::Part->new(id => $id)->load() : undef;
   } elsif ( $type eq 'date' ) {
-    return $self->timestamp_value->clone->truncate(to => 'day');
+    return $self->timestamp_value ? $self->timestamp_value->clone->truncate(to => 'day') : undef;
   }
 
   goto &text_value; # text, textfield and select
@@ -89,33 +89,21 @@ sub value_as_text {
 
   die 'not an accessor' if @_ > 1;
 
-  if ($type eq 'boolean') {
+  if ($type eq 'bool') {
     return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No');
-  } elsif ($type eq 'timestamp') {
+  } elsif ($type =~ m{^(?:timestamp|date)}) {
+    return '' if !$self->timestamp_value;
     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, $cfg->processed_options->{PRECISION});
-  } elsif ( $type eq 'customer' ) {
-    require SL::DB::Customer;
-
-    my $id = int($self->number_value);
-    my $customer =  $id ? SL::DB::Customer->new(id => $id)->load() : 0;
-    return $customer ? $customer->name : '';
-  } elsif ( $type eq 'vendor' ) {
-    require SL::DB::Vendor;
-
-    my $id = int($self->number_value);
-    my $vendor =  $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
-    return $vendor ? $vendor->name : '';
-  } elsif ( $type eq 'part' ) {
-    require SL::DB::Part;
-
-    my $id = int($self->number_value);
-    my $part = $id ? SL::DB::Part->new(id => $id)->load() : 0;
-    return $part ? $part->description : '';
+  } elsif ( $type =~ m{^(?:customer|vendor|part)$}) {
+    my $class = "SL::DB::" . ucfirst($type);
+    eval "require $class";
+    my $object =  $class->_get_manager_class->find_by(id => int($self->number_value));
+    return $object ? $object->displayable_name : '';
   }
 
-  goto &text_value; # text, textfield, date and select
+  goto &text_value; # text, textfield and select
 }
 
 sub is_valid {