From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 17 Feb 2015 12:38:25 +0000 (+0100)
Subject: SL::DB::CustomVariable: value_as_text() für Typ 'date' gefixt
X-Git-Tag: release-3.2.0~33
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2bb1c9616f0fe4c8c1d39574a99eff02a7ece42e;p=kivitendo-erp.git

SL::DB::CustomVariable: value_as_text() für Typ 'date' gefixt

Bisher wurde schlicht das falsche Feld zurückgegeben: text_value. Nun
wird das formatierte Datum aus timestamp_value zurückgegeben.
---

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 7f18f6a8d..3f1f7a2e3 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -91,7 +91,7 @@ sub value_as_text {
 
   if ($type eq 'bool') {
     return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No');
-  } elsif ($type eq 'timestamp') {
+  } elsif ($type =~ m{^(?:timestamp|date)}) {
     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});
@@ -115,7 +115,7 @@ sub value_as_text {
     return $part ? $part->description : '';
   }
 
-  goto &text_value; # text, textfield, date and select
+  goto &text_value; # text, textfield and select
 }
 
 sub is_valid {