X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b996f6ca8984a5c0983fd9541f607ee7307e7182..a87694dc525b4eabff11029f1e5401621e2bd3bc:/SL/DB/CustomVariable.pm

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 03fd5cad5..08dd663c8 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -35,10 +35,14 @@ sub parse_value {
 
   my $unparsed = delete $self->{__unparsed_value};
 
-  if ($type =~ m{^(?:customer|vendor|part|bool|number)}) {
+  if ($type =~ m{^(?:customer|vendor|part|number)}) {
     return $self->number_value(defined($unparsed) ? $unparsed * 1 : undef);
   }
 
+  if ($type =~ m{^(?:bool)}) {
+    return $self->bool_value(defined($unparsed) ? !!$unparsed : undef);
+  }
+
   if ($type =~ m{^(?:date|timestamp)}) {
     return $self->timestamp_value(defined($unparsed) ? DateTime->from_kivitendo($unparsed) : undef);
   }
@@ -54,6 +58,7 @@ sub value {
   if (scalar(@_) > 1) {
     $self->unparsed_value($_[1]);
     $self->parse_value;
+    @_ = ($self);
   }
 
   goto &bool_value      if $type eq 'bool';
@@ -76,7 +81,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 +97,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});