X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=cca078b6640ccdfa79abb540de79eab007396897;hb=e2f0105f947c01d3d45be41833f3a7e39eef2f7b;hp=28043e17461e01fdd90d548238126e4b9cf1adc2;hpb=254ef1b288fe55a17d10468ba776b43661594269;p=kivitendo-erp.git diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index 28043e174..cca078b66 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -106,7 +106,7 @@ sub export3 { my %data = ( exporttype => $::form->{exporttype} ? DATEV_ET_STAMM : DATEV_ET_BUCHUNGEN, - format => $::form->{kne} ? DATEV_FORMAT_KNE : $::form->{csv} ? DATEV_FORMAT_CSV : die "unknown format", + format => $::form->{exportformat} eq 'kne' ? DATEV_FORMAT_KNE : DATEV_FORMAT_CSV, ); if ($::form->{exporttype} == DATEV_ET_STAMM) { @@ -118,6 +118,7 @@ sub export3 { $::form->{transdatefrom}, $::form->{transdateto}, ); $data{use_pk} = $::form->{use_pk}; + $data{locked} = $::form->{locked}; } else { die 'invalid exporttype'; } @@ -199,6 +200,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;