Bugfixes zum Rechnungstemplate

[mfinanz.git] / SL / DATEV.pm

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index d600b20ff6e439c323bb3983486918aacad6e037..1a455f3ec36a7b1ededaaa8feb8e23b7de1acce8 100644 (file)
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -26,13 +26,18 @@
 
 package DATEV;
 
 
 package DATEV;
 

+use List::Util qw(max);
+

 use SL::DBUtils;
 use SL::DATEV::KNEFile;
 use SL::DBUtils;
 use SL::DATEV::KNEFile;

+use SL::Taxkeys;

 
 use Data::Dumper;
 use File::Path;
 use Time::HiRes qw(gettimeofday);
 
 
 use Data::Dumper;
 use File::Path;
 use Time::HiRes qw(gettimeofday);
 

+use strict;
+

 sub _get_export_path {
   $main::lxdebug->enter_sub();
 
 sub _get_export_path {
   $main::lxdebug->enter_sub();
 


@@ -122,11 +127,11 @@ sub get_datev_stamm {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  $query = qq|SELECT * FROM datev|;
-  $sth   = $dbh->prepare($query);
+  my $query = qq|SELECT * FROM datev|;
+  my $sth   = $dbh->prepare($query);

   $sth->execute || $form->dberror($query);
 
   $sth->execute || $form->dberror($query);
 

-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");

 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 


@@ -143,7 +148,7 @@ sub save_datev_stamm {
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 

-  $query = qq|DELETE FROM datev|;
+  my $query = qq|DELETE FROM datev|;

   $dbh->do($query) || $form->dberror($query);
 
   $query = qq|INSERT INTO datev
   $dbh->do($query) || $form->dberror($query);
 
   $query = qq|INSERT INTO datev


@@ -156,7 +161,7 @@ sub save_datev_stamm {
     . $dbh->quote($form->{mandantennr}) . qq|,|
     . $dbh->quote($form->{datentraegernr}) . qq|,|
     . $dbh->quote($form->{abrechnungsnr}) . qq|)|;
     . $dbh->quote($form->{mandantennr}) . qq|,|
     . $dbh->quote($form->{datentraegernr}) . qq|,|
     . $dbh->quote($form->{abrechnungsnr}) . qq|)|;

-  $sth = $dbh->prepare($query);
+  my $sth = $dbh->prepare($query);

   $sth->execute || $form->dberror($query);
   $sth->finish;
 
   $sth->execute || $form->dberror($query);
   $sth->finish;
 


@@ -198,6 +203,9 @@ sub get_dates {
   $main::lxdebug->enter_sub();
 
   my ($zeitraum, $monat, $quartal, $transdatefrom, $transdateto) = @_;
   $main::lxdebug->enter_sub();
 
   my ($zeitraum, $monat, $quartal, $transdatefrom, $transdateto) = @_;

+  my ($fromto, $jahr, $leap);
+
+  my $form = $main::form;

 
   $fromto = "transdate >= ";
 
 
   $fromto = "transdate >= ";
 


@@ -301,6 +309,14 @@ sub get_dates {
   return ($fromto, $jahr);
 }
 
   return ($fromto, $jahr);
 }
 

+sub _sign {
+  my $value = shift;
+
+  return $value < 0 ? -1
+    :    $value > 0 ?  1
+    :                  0;
+}
+

 sub _get_transactions {
   $main::lxdebug->enter_sub();
 
 sub _get_transactions {
   $main::lxdebug->enter_sub();
 


@@ -311,60 +327,65 @@ sub _get_transactions {
 
   my $dbh      =  $form->get_standard_dbh($myconfig);
 
 
   my $dbh      =  $form->get_standard_dbh($myconfig);
 

+  my ($notsplitindex);

   my @errors   = ();
 
   $fromto      =~ s/transdate/ac\.transdate/g;
 
   my @errors   = ();
 
   $fromto      =~ s/transdate/ac\.transdate/g;
 

-  my %taxes    =  selectall_as_map($form, $dbh, qq|SELECT id, rate FROM tax|, 'id', 'rate');
+  my $taxkeys  = Taxkeys->new();
+  my $filter   = '';            # Useful for debugging purposes
+
+  my %all_taxchart_ids = selectall_as_map($form, $dbh, qq|SELECT DISTINCT chart_id, TRUE AS is_set FROM tax|, 'chart_id', 'is_set');

 
   my $query    =
 
   my $query    =

-    qq|SELECT ac.oid, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey,
+    qq|SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey,

          ar.invnumber, ar.duedate, ar.amount as umsatz,
          ct.name,
          ar.invnumber, ar.duedate, ar.amount as umsatz,
          ct.name,

-         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id,
-         t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
-       FROM acc_trans ac,ar ar, customer ct, chart c
-       LEFT JOIN tax t ON (t.chart_id = c.id)
-       WHERE $fromto
-         AND (ac.trans_id = ar.id)
-         AND (ac.trans_id = ar.id)
-         AND (ar.customer_id = ct.id)
-         AND (ac.chart_id = c.id)
+         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link,
+         ar.invoice
+       FROM acc_trans ac
+       LEFT JOIN ar          ON (ac.trans_id    = ar.id)
+       LEFT JOIN customer ct ON (ar.customer_id = ct.id)
+       LEFT JOIN chart c     ON (ac.chart_id    = c.id)
+       WHERE (ar.id IS NOT NULL)
+         AND $fromto
+         $filter

 
        UNION ALL
 
 
        UNION ALL
 

-       SELECT ac.oid, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey,
+       SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey,

          ap.invnumber, ap.duedate, ap.amount as umsatz,
          ct.name,
          ap.invnumber, ap.duedate, ap.amount as umsatz,
          ct.name,

-         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id,
-         t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
-       FROM acc_trans ac, ap ap, vendor ct, chart c
-       LEFT JOIN tax t ON (t.chart_id = c.id)
-       WHERE $fromto
-         AND (ac.trans_id = ap.id)
-         AND (ap.vendor_id = ct.id)
-         AND (ac.chart_id = c.id)
+         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link,
+         ap.invoice
+       FROM acc_trans ac
+       LEFT JOIN ap        ON (ac.trans_id  = ap.id)
+       LEFT JOIN vendor ct ON (ap.vendor_id = ct.id)
+       LEFT JOIN chart c   ON (ac.chart_id  = c.id)
+       WHERE (ap.id IS NOT NULL)
+         AND $fromto
+         $filter

 
        UNION ALL
 
 
        UNION ALL
 

-       SELECT ac.oid, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey,
+       SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey,

          gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz,
          gl.description AS name,
          gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz,
          gl.description AS name,

-         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id,
-         t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
-       FROM acc_trans ac, gl gl, chart c
-       LEFT JOIN tax t ON (t.chart_id = c.id)
-       WHERE $fromto
-         AND (ac.trans_id = gl.id)
-         AND (ac.chart_id = c.id)
+         c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link,
+         FALSE AS invoice
+       FROM acc_trans ac
+       LEFT JOIN gl      ON (ac.trans_id  = gl.id)
+       LEFT JOIN chart c ON (ac.chart_id  = c.id)
+       WHERE (gl.id IS NOT NULL)
+         AND $fromto
+         $filter

 
 

-       ORDER BY trans_id, oid|;
+       ORDER BY trans_id, acc_trans_id|;

 
 

-  my $sth     = prepare_execute_query($form, $dbh, $query);
+  my $sth = prepare_execute_query($form, $dbh, $query);

 
 

-  my @splits;

   my $counter = 0;
   my $counter = 0;

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {

     $counter++;
     if (($counter % 500) == 0) {
       print("$counter ");
     $counter++;
     if (($counter % 500) == 0) {
       print("$counter ");


@@ -376,15 +397,38 @@ sub _get_transactions {
     my $firstrun = 1;
 
     while (abs($count) > 0.01 || $firstrun) {
     my $firstrun = 1;
 
     while (abs($count) > 0.01 || $firstrun) {

-      my $ref2 = $sth->fetchrow_hashref(NAME_lc);
+      my $ref2 = $sth->fetchrow_hashref("NAME_lc");

       last unless ($ref2);
 
       last unless ($ref2);
 

+      if ($ref2->{trans_id} != $trans->[0]->{trans_id}) {
+        $form->error("Unbalanced ledger! old trans_id " . $trans->[0]->{trans_id} . " new trans_id " . $ref2->{trans_id} . " count $count");
+        exit 1;
+      }
+

       push @{ $trans }, $ref2;
 
       $count    += $ref2->{amount};
       $firstrun  = 0;
     }
 
       push @{ $trans }, $ref2;
 
       $count    += $ref2->{amount};
       $firstrun  = 0;
     }
 

+    foreach my $i (0 .. scalar(@{ $trans }) - 1) {
+      my $ref        = $trans->[$i];
+      my $prev_ref   = 0 < $i ? $trans->[$i - 1] : undef;
+      if (   $all_taxchart_ids{$ref->{id}}
+          && ($ref->{link} =~ m/(?:AP_tax|AR_tax)/)
+          && (   ($prev_ref && $prev_ref->{taxkey} && (_sign($ref->{amount}) == _sign($prev_ref->{amount})))
+              || $ref->{invoice})) {
+        $ref->{is_tax} = 1;
+      }
+
+      if (   !$ref->{invoice}
+          &&  $ref->{is_tax}
+          && !($prev_ref->{is_tax})
+          &&  (_sign($ref->{amount}) == _sign($prev_ref->{amount}))) {
+        $trans->[$i - 1]->{tax_amount} = $ref->{amount};
+      }
+    }
+

     my %taxid_taxkeys = ();
     my $absumsatz     = 0;
     if (scalar(@{$trans}) <= 2) {
     my %taxid_taxkeys = ();
     my $absumsatz     = 0;
     if (scalar(@{$trans}) <= 2) {


@@ -397,15 +441,14 @@ sub _get_transactions {
         $absumsatz     = $trans->[$j]->{'amount'};
         $notsplitindex = $j;
       }
         $absumsatz     = $trans->[$j]->{'amount'};
         $notsplitindex = $j;
       }

-      if (($trans->[$j]->{'taxtaxkey'}) && ($trans->[$j]->{'taxid'})) {
-        $taxid_taxkeys{$trans->[$j]->{'taxtaxkey'}}     = $trans->[$j]->{'taxid'};
-      }

     }
 
     }
 

-    my $ml = ($trans->[0]->{'umsatz'} > 0) ? 1 : -1;
+    my $ml             = ($trans->[0]->{'umsatz'} > 0) ? 1 : -1;
+    my $rounding_error = 0;
+

     for my $j (0 .. (scalar(@{$trans}) - 1)) {
       if (   ($j != $notsplitindex)
     for my $j (0 .. (scalar(@{$trans}) - 1)) {
       if (   ($j != $notsplitindex)

-          && ($trans->[$j]->{'chart_id'}  eq "")
+          && !$trans->[$j]->{is_tax}

           && (   $trans->[$j]->{'taxkey'} eq ""
               || $trans->[$j]->{'taxkey'} eq "0"
               || $trans->[$j]->{'taxkey'} eq "1"
           && (   $trans->[$j]->{'taxkey'} eq ""
               || $trans->[$j]->{'taxkey'} eq "0"
               || $trans->[$j]->{'taxkey'} eq "1"


@@ -419,27 +462,79 @@ sub _get_transactions {
         $new_trans{'umsatz'}      = abs($trans->[$j]->{'amount'}) * $ml;
         $trans->[$j]->{'umsatz'}  = abs($trans->[$j]->{'amount'}) * $ml;
 
         $new_trans{'umsatz'}      = abs($trans->[$j]->{'amount'}) * $ml;
         $trans->[$j]->{'umsatz'}  = abs($trans->[$j]->{'amount'}) * $ml;
 

-        push @splits, [ \%new_trans, $trans->[$j] ];
-        push @{ $form->{DATEV} }, $splits[-1];
+        push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];

 
 

-      } elsif (($j != $notsplitindex) && ($trans->[$j]->{'chart_id'} eq "")) {
-        $absumsatz += ($trans->[$j]->{'amount'} * (1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} }));
+      } elsif (($j != $notsplitindex) && !$trans->[$j]->{is_tax}) {
+        my %tax_info = $taxkeys->get_full_tax_info('transdate' => $trans->[$j]->{transdate});

 
         my %new_trans = ();
         map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };
 
 
         my %new_trans = ();
         map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };
 

-        my $tax_rate             = 1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} };
-        $new_trans{'amount'}     = $form->round_amount(($trans->[$j]->{'amount'} * $tax_rate * -1), 2);
-        $new_trans{'umsatz'}     = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;
-        $trans->[$j]->{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;
+        my $tax_rate              = $tax_info{taxkeys}->{ $trans->[$j]->{'taxkey'} }->{taxrate};
+        $new_trans{'net_amount'}  = $trans->[$j]->{'amount'} * -1;
+        $new_trans{'tax_rate'}    = 1 + $tax_rate;
+
+        if (!$trans->[$j]->{'invoice'}) {
+          $new_trans{'amount'}      = $form->round_amount(-1 * ($trans->[$j]->{amount} + $trans->[$j]->{tax_amount}), 2);
+          $new_trans{'umsatz'}      = abs($new_trans{'amount'}) * $ml;
+          $trans->[$j]->{'umsatz'}  = $new_trans{'umsatz'};
+          $absumsatz               += -1 * $new_trans{'amount'};

 
 

-        push @splits, [ \%new_trans, $trans->[$j] ];
-        push @{ $form->{DATEV} }, $splits[-1];
+        } else {
+          my $unrounded             = $trans->[$j]->{'amount'} * (1 + $tax_rate) * -1; # + $rounding_error;
+          my $rounded               = $form->round_amount($unrounded, 2);
+          $rounding_error          += $unrounded - $rounded;
+          $new_trans{'amount'}      = $rounded;
+          $new_trans{'umsatz'}      = abs($form->round_amount(($trans->[$j]->{'amount'} * (1 + $tax_rate)), 2)) * $ml;
+          $trans->[$j]->{'umsatz'}  = abs($form->round_amount(($trans->[$j]->{'amount'} * (1 + $tax_rate)), 2)) * $ml;
+          $absumsatz               += $form->round_amount($trans->[$j]->{'amount'} + $trans->[$j]->{'amount'} * $tax_rate, 2);
+        }
+
+        push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];

       }
     }
 
       }
     }
 

-    if (abs($absumsatz) > 0.01) {
-      push @errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)\n";
+    my $idx        = 0;
+    my $correction = 0;
+    our @taxed;          # most likely defunct
+    while (abs($absumsatz) >= 0.01) {
+      if ($idx >= scalar @taxed) {
+        last if (!$correction);
+
+        $correction = 0;
+        $idx        = 0;
+      }
+
+      my $transaction = $taxed[$idx]->[0];
+
+      my $old_amount     = $transaction->{amount};
+      my $old_correction = $correction;
+      my @possible_diffs;
+
+      if (!$transaction->{diff}) {
+        @possible_diffs = (0.01, -0.01);
+      } else {
+        @possible_diffs = ($transaction->{diff});
+      }
+
+      foreach my $diff (@possible_diffs) {
+        my $net_amount = $form->round_amount(($transaction->{amount} + $diff) / $transaction->{tax_rate}, 2);
+        next if ($net_amount != $transaction->{net_amount});
+
+        $transaction->{diff}    = $diff;
+        $transaction->{amount} += $diff;
+        $transaction->{umsatz} += $diff;
+        $absumsatz             -= $diff;
+        $correction             = 1;
+
+        last;
+      }
+
+      $idx++;
+    }
+
+    if (abs($absumsatz) >= 0.01) {
+      push @errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz, Rundungsfehler $rounding_error)\n";

     }
   }
 
     }
   }
 


@@ -454,6 +549,7 @@ sub make_kne_data_header {
   $main::lxdebug->enter_sub();
 
   my ($myconfig, $form, $fromto, $start_jahr) = @_;
   $main::lxdebug->enter_sub();
 
   my ($myconfig, $form, $fromto, $start_jahr) = @_;

+  my ($primanota);

 
   my $jahr = $start_jahr;
   if (!$jahr) {
 
   my $jahr = $start_jahr;
   if (!$jahr) {


@@ -463,7 +559,7 @@ sub make_kne_data_header {
 
   #Header
   my $header  = "\x1D\x181";
 
   #Header
   my $header  = "\x1D\x181";

-  $header    .= _fill($form->{datentraegernr}, 3, '0');
+  $header    .= _fill($form->{datentraegernr}, 3, ' ', 'left');

   $header    .= ($fromto) ? "11" : "13"; # Anwendungsnummer
   $header    .= _fill($form->{dfvkz}, 2, '0');
   $header    .= _fill($form->{beraternr}, 7, '0');
   $header    .= ($fromto) ? "11" : "13"; # Anwendungsnummer
   $header    .= _fill($form->{dfvkz}, 2, '0');
   $header    .= _fill($form->{beraternr}, 7, '0');


@@ -538,7 +634,7 @@ sub datetofour {
 
   my ($date, $six) = @_;
 
 
   my ($date, $six) = @_;
 

-  ($day, $month, $year) = split(/\./, $date);
+  my ($day, $month, $year) = split(/\./, $date);

 
   if ($day =~ /^0/) {
     $day = substr($day, 1, 1);
 
   if ($day =~ /^0/) {
     $day = substr($day, 1, 1);


@@ -580,7 +676,7 @@ sub make_ed_versionset {
   if ($fromto ne "") {
     $versionset .= "0000" . substr($header, 28, 19);
   } else {
   if ($fromto ne "") {
     $versionset .= "0000" . substr($header, 28, 19);
   } else {

-    $datum = " " x 16;
+    my $datum = " " x 16;

     $versionset .= $datum . "001" . substr($header, 28, 4);
   }
 
     $versionset .= $datum . "001" . substr($header, 28, 4);
   }
 


@@ -623,7 +719,7 @@ sub kne_buchungsexport {
   my $export_path = _get_export_path() . "/";
   my $filename    = "ED00000";
   my $evfile      = "EV01";
   my $export_path = _get_export_path() . "/";
   my $filename    = "ED00000";
   my $evfile      = "EV01";

-  my @ed_versionsets;
+  my @ed_versionset;

   my $fileno = 0;
 
   $form->header;
   my $fileno = 0;
 
   $form->header;


@@ -633,7 +729,7 @@ sub kne_buchungsexport {
   Buchungss&auml;tze verarbeitet:
 |;
 
   Buchungss&auml;tze verarbeitet:
 |;
 

-  ($fromto, $start_jahr) =
+  my ($fromto, $start_jahr) =

     &get_dates($form->{zeitraum}, $form->{monat},
                $form->{quartal},  $form->{transdatefrom},
                $form->{transdateto});
     &get_dates($form->{zeitraum}, $form->{monat},
                $form->{quartal},  $form->{transdatefrom},
                $form->{transdateto});


@@ -645,14 +741,14 @@ sub kne_buchungsexport {
     $filename++;
     my $ed_filename = $export_path . $filename;
     push(@filenames, $filename);
     $filename++;
     my $ed_filename = $export_path . $filename;
     push(@filenames, $filename);

-    $header = &make_kne_data_header($myconfig, $form, $fromto, $start_jahr);
+    my $header = &make_kne_data_header($myconfig, $form, $fromto, $start_jahr);

 
     my $kne_file = SL::DATEV::KNEFile->new();
     $kne_file->add_block($header);
 
     while (scalar(@{ $form->{DATEV} }) > 0) {
 
     my $kne_file = SL::DATEV::KNEFile->new();
     $kne_file->add_block($header);
 
     while (scalar(@{ $form->{DATEV} }) > 0) {

-      $transaction = shift @{ $form->{DATEV} };
-      $trans_lines = scalar(@{$transaction});
+      my $transaction = shift @{ $form->{DATEV} };
+      my $trans_lines = scalar(@{$transaction});

       $counter++;
       if (($counter % 500) == 0) {
         print("$counter ");
       $counter++;
       if (($counter % 500) == 0) {
         print("$counter ");


@@ -669,13 +765,15 @@ sub kne_buchungsexport {
       my $datevautomatik = 0;
       my $taxkey         = 0;
       my $charttax       = 0;
       my $datevautomatik = 0;
       my $taxkey         = 0;
       my $charttax       = 0;

-      my %umlaute = ('ä' => 'ae',
-                     'ö' => 'oe',
-                     'ü' => 'ue',
-                     'Ä' => 'Ae',
-                     'Ö' => 'Oe',
-                     'Ü' => 'Ue',
-                     'ß' => 'sz');
+      my ($haben, $soll);
+      my $iconv          = $main::locale->{iconv_iso8859};
+      my %umlaute = ($iconv->convert('ä') => 'ae',
+                     $iconv->convert('ö') => 'oe',
+                     $iconv->convert('ü') => 'ue',
+                     $iconv->convert('Ä') => 'Ae',
+                     $iconv->convert('Ö') => 'Oe',
+                     $iconv->convert('Ü') => 'Ue',
+                     $iconv->convert('ß') => 'sz');

       for (my $i = 0; $i < $trans_lines; $i++) {
         if ($trans_lines == 2) {
           if (abs($transaction->[$i]->{'amount'}) > abs($umsatz)) {
       for (my $i = 0; $i < $trans_lines; $i++) {
         if ($trans_lines == 2) {
           if (abs($transaction->[$i]->{'amount'}) > abs($umsatz)) {


@@ -695,10 +793,7 @@ sub kne_buchungsexport {
         if ($transaction->[$i]->{'charttax'}) {
           $charttax = $transaction->[$i]->{'charttax'};
         }
         if ($transaction->[$i]->{'charttax'}) {
           $charttax = $transaction->[$i]->{'charttax'};
         }

-        if (   ($transaction->[$i]->{'id'} eq $transaction->[$i]->{'chart_id'})
-            && ($trans_lines > 2)) {
-          undef($transaction->[$i]);
-        } elsif ($transaction->[$i]->{'amount'} > 0) {
+        if ($transaction->[$i]->{'amount'} > 0) {

           $haben = $i;
         } else {
           $soll = $i;
           $haben = $i;
         } else {
           $soll = $i;


@@ -706,7 +801,7 @@ sub kne_buchungsexport {
       }
 
       # Umwandlung von Umlauten und Sonderzeichen in erlaubte Zeichen bei Textfeldern
       }
 
       # Umwandlung von Umlauten und Sonderzeichen in erlaubte Zeichen bei Textfeldern

-      foreach $umlaut (keys(%umlaute)) {
+      foreach my $umlaut (keys(%umlaute)) {

         $transaction->[$haben]->{'invnumber'} =~ s/${umlaut}/${umlaute{$umlaut}}/g;
         $transaction->[$haben]->{'name'}      =~ s/${umlaut}/${umlaute{$umlaut}}/g;
       }
         $transaction->[$haben]->{'invnumber'} =~ s/${umlaut}/${umlaute{$umlaut}}/g;
         $transaction->[$haben]->{'name'}      =~ s/${umlaut}/${umlaute{$umlaut}}/g;
       }


@@ -743,7 +838,8 @@ sub kne_buchungsexport {
 
       if (   ( $datevautomatik || $taxkey)
           && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) {
 
       if (   ( $datevautomatik || $taxkey)
           && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) {

-        $kne_file->add_block("\x6C" . (!$datevautomatik ? $taxkey : "4"));
+#         $kne_file->add_block("\x6C" . (!$datevautomatik ? $taxkey : "4"));
+        $kne_file->add_block("\x6C${taxkey}");

       }
 
       $kne_file->add_block($gegenkonto);
       }
 
       $kne_file->add_block($gegenkonto);


@@ -769,13 +865,13 @@ sub kne_buchungsexport {
   }
 
   #Make EV Verwaltungsdatei
   }
 
   #Make EV Verwaltungsdatei

-  $ev_header = &make_ev_header($form, $fileno);
-  $ev_filename = $export_path . $evfile;
+  my $ev_header = &make_ev_header($form, $fileno);
+  my $ev_filename = $export_path . $evfile;

   push(@filenames, $evfile);
   open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
   print(EV $ev_header);
 
   push(@filenames, $evfile);
   open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
   print(EV $ev_header);
 

-  foreach $file (@ed_versionset) {
+  foreach my $file (@ed_versionset) {

     print(EV $ed_versionset[$file]);
   }
   close(EV);
     print(EV $ed_versionset[$file]);
   }
   close(EV);


@@ -804,7 +900,7 @@ sub kne_stammdatenexport {
   my $export_path = _get_export_path() . "/";
   my $filename    = "ED00000";
   my $evfile      = "EV01";
   my $export_path = _get_export_path() . "/";
   my $filename    = "ED00000";
   my $evfile      = "EV01";

-  my @ed_versionsets;
+  my @ed_versionset;

   my $fileno          = 1;
   my $i               = 0;
   my $blockcount      = 1;
   my $fileno          = 1;
   my $i               = 0;
   my $blockcount      = 1;


@@ -815,9 +911,12 @@ sub kne_stammdatenexport {
   my $ed_filename = $export_path . $filename;
   push(@filenames, $filename);
   open(ED, "> $ed_filename") or die "can't open outputfile: $!\n";
   my $ed_filename = $export_path . $filename;
   push(@filenames, $filename);
   open(ED, "> $ed_filename") or die "can't open outputfile: $!\n";

-  $header = &make_kne_data_header($myconfig, $form, "");
+  my $header = &make_kne_data_header($myconfig, $form, "");

   $remaining_bytes -= length($header);
 
   $remaining_bytes -= length($header);
 

+  my $fuellzeichen;
+  our $fromto;
+

   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 


@@ -841,7 +940,7 @@ sub kne_stammdatenexport {
   my $sth = $dbh->prepare($query);
   $sth->execute(@values) || $form->dberror($query);
 
   my $sth = $dbh->prepare($query);
   $sth->execute(@values) || $form->dberror($query);
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {

     if (($remaining_bytes - length("t" . $ref->{'accno'})) <= 6) {
       $fuellzeichen = ($blockcount * 256 - length($buchungssatz . $header));
       $buchungssatz .= "\x00" x $fuellzeichen;
     if (($remaining_bytes - length("t" . $ref->{'accno'})) <= 6) {
       $fuellzeichen = ($blockcount * 256 - length($buchungssatz . $header));
       $buchungssatz .= "\x00" x $fuellzeichen;


@@ -871,7 +970,7 @@ sub kne_stammdatenexport {
   print(ED $header);
   print(ED $buchungssatz);
   $fuellzeichen = 256 - (length($header . $buchungssatz . "z") % 256);
   print(ED $header);
   print(ED $buchungssatz);
   $fuellzeichen = 256 - (length($header . $buchungssatz . "z") % 256);

-  $dateiende = "\x00" x $fuellzeichen;
+  my $dateiende = "\x00" x $fuellzeichen;

   print(ED "z");
   print(ED $dateiende);
   close(ED);
   print(ED "z");
   print(ED $dateiende);
   close(ED);


@@ -880,13 +979,13 @@ sub kne_stammdatenexport {
   $ed_versionset[0] =
     &make_ed_versionset($header, $filename, $blockcount, $fromto);
 
   $ed_versionset[0] =
     &make_ed_versionset($header, $filename, $blockcount, $fromto);
 

-  $ev_header = &make_ev_header($form, $fileno);
-  $ev_filename = $export_path . $evfile;
+  my $ev_header = &make_ev_header($form, $fileno);
+  my $ev_filename = $export_path . $evfile;

   push(@filenames, $evfile);
   open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
   print(EV $ev_header);
 
   push(@filenames, $evfile);
   open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
   print(EV $ev_header);
 

-  foreach $file (@ed_versionset) {
+  foreach my $file (@ed_versionset) {

     print(EV $ed_versionset[$file]);
   }
   close(EV);
     print(EV $ed_versionset[$file]);
   }
   close(EV);