From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 17 Feb 2015 16:09:06 +0000 (+0100)
Subject: SL::DB::CustomVariable: value, value_as_text für Typ 'date/timestamp' und ungesetzt... 
X-Git-Tag: release-3.2.0~30
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=01a428f7cdd91d2352543cfb83750af1a24fda0f;p=kivitendo-erp.git

SL::DB::CustomVariable: value, value_as_text für Typ 'date/timestamp' und ungesetzt gefixt
---

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 03fd5cad5..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
@@ -92,6 +92,7 @@ sub value_as_text {
   if ($type eq 'bool') {
     return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No');
   } 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});