X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FCustomVariable.pm;h=0971e6466c946c33708774b400fe611d6cacb35d;hb=4247547d2a925ddad7006cae89e5f9f1fda7d469;hp=e48c1d82971d955f97dd2b8d4e7d50a166af19bc;hpb=01a428f7cdd91d2352543cfb83750af1a24fda0f;p=kivitendo-erp.git diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm index e48c1d829..0971e6466 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,11 +58,15 @@ sub value { if (scalar(@_) > 1) { $self->unparsed_value($_[1]); $self->parse_value; + @_ = ($self); } goto &bool_value if $type eq 'bool'; goto ×tamp_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;