X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FCustomVariable.pm;h=26ff748f782d735d7a8a24af443dc0565d6690d4;hb=117332fcc34457aadb85db18dbc42f48d32b732e;hp=e48c1d82971d955f97dd2b8d4e7d50a166af19bc;hpb=01a428f7cdd91d2352543cfb83750af1a24fda0f;p=kivitendo-erp.git

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index e48c1d829..26ff748f7 100644
--- 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;