CVar-Helper: Beim Parsen darauf achten, ob unparsed_value ein Objekt enthält.

[mfinanz.git] / SL / DB / CustomVariable.pm

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 03fd5cad59aeb7952e7e23fe236f74eb81e03831..26ff748f782d735d7a8a24af443dc0565d6690d4 100644 (file)
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -4,6 +4,9 @@
 package SL::DB::CustomVariable;
 
 use strict;
+
+use List::MoreUtils qw(any);
+
 use SL::DB::MetaSetup::CustomVariable;
 
 __PACKAGE__->meta->initialize;
@@ -35,12 +38,18 @@ sub parse_value {
 
   my $unparsed = delete $self->{__unparsed_value};
 
-  if ($type =~ m{^(?:customer|vendor|part|bool|number)}) {
-    return $self->number_value(defined($unparsed) ? $unparsed * 1 : undef);
+  if ($type =~ m{^(?:customer|vendor|part|number)}) {
+    return $self->number_value(!defined($unparsed) ? undef
+                               : (any { ref($unparsed) eq $_ } qw(SL::DB::Customer SL::DB::Vendor SL::DB::Part)) ? $unparsed->id * 1
+                               : $unparsed * 1);
+  }
+
+  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);
+    return $self->timestamp_value(!defined($unparsed) ? undef : ref($unparsed) eq 'DateTime' ? $unparsed->clone : DateTime->from_kivitendo($unparsed));
   }
 
   # text, textfield, select
@@ -54,11 +63,15 @@ sub value {
   if (scalar(@_) > 1) {
     $self->unparsed_value($_[1]);
     $self->parse_value;
+    @_ = ($self);
   }
 
   goto &bool_value      if $type eq 'bool';
   goto &timestamp_value if $type eq 'timestamp';
-  goto &number_value    if $type eq 'number';
+
+  if ($type eq 'number') {
+    return defined($self->number_value) ? $self->number_value * 1 : undef;
+  }
 
   if ( $type eq 'customer' ) {
     require SL::DB::Customer;
@@ -76,7 +89,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 +105,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});