From 2636820b4ddcd32319afb7830a760e82df4a42df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Tue, 9 Jan 2018 09:31:06 +0100 Subject: [PATCH] =?utf8?q?DATEV:=20Export-Periode=20Dezember=20ist=20h?= =?utf8?q?=C3=A4ufig=20im=20Vorjahreszeitraum?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/datev.pl | 3 +++ locale/de/all | 1 + templates/webpages/datev/export_bewegungsdaten.html | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index 8d18281ee..d83356209 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -199,6 +199,9 @@ sub _get_dates { if ($mode eq "monat") { $fromdate = DateTime->new(day => 1, month => $month, year => DateTime->today->year); + # december export is usually in january/february + $fromdate = $fromdate->subtract(years => 1) if ($month == 12); + $todate = $fromdate->clone->add(months => 1)->add(days => -1); } elsif ($mode eq "quartal") { die 'quarter out of of bounds' if $quarter < 1 || $quarter > 4; diff --git a/locale/de/all b/locale/de/all index 4a9ca5dae..e63cf75f0 100755 --- a/locale/de/all +++ b/locale/de/all @@ -900,6 +900,7 @@ $self->{texts} = { 'Debit/Credit Label' => 'Soll-/Haben-Kennzeichen', 'Dec' => 'Dez', 'December' => 'Dezember', + 'December last year period' => 'Dezember letzten Jahres', 'Decimalplaces' => 'Dezimalstellen', 'Decrease' => 'Verringern', 'Default (no language selected)' => 'Standard (keine Sprache ausgewählt)', diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html index be85405d8..d4557c16c 100644 --- a/templates/webpages/datev/export_bewegungsdaten.html +++ b/templates/webpages/datev/export_bewegungsdaten.html @@ -29,7 +29,7 @@ - + -- 2.20.1