WebshopApi: falsche sql update Abhängigkeit

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

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 4198a33..a7d93a4 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -27,7 +27,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # Translations and number/date formatting
@@ -95,7 +96,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 +395,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+$} ? ',' : '.';