featured form-objects visible/unvisible

[kivitendo-erp.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 4198a33..8dc95e7 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -95,7 +95,7 @@ sub _init {
       for my $file (@files) {
         if (open my $in, "<", "locale/$country/more/$file") {
           local $/ = undef;
-          my $code = <$file>;
+          my $code = <$in>;
           eval($code);
           close($in);
           $self->{texts}{$_} = $self->{more_texts}{$_} for keys %{ $self->{more_texts} };
@@ -394,6 +394,9 @@ sub parse_date_to_object {
 
   return undef if !defined $string;
 
+  return DateTime->today_local                      if lc($string) eq 'today';
+  return DateTime->today_local->subtract(days => 1) if lc($string) eq 'yesterday';
+
   $params{dateformat}        ||= $::myconfig{dateformat}   || 'yy-mm-dd';
   $params{numberformat}      ||= $::myconfig{numberformat} || '1,000.00';
   my $num_separator            = $params{numberformat} =~ m{,\d+$} ? ',' : '.';