X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=49e824b5023a17a3efe32252db9750efc87e4223;hb=a35013886c936227e97cc868b77be1e584ad4272;hp=fb3ec74d22ce6fbad2e53c258b1e0008f32109f2;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index fb3ec74d2..49e824b50 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -26,7 +26,98 @@
 
 package DATEV;
 
+use List::Util qw(max);
+
+use SL::DBUtils;
+use SL::DATEV::KNEFile;
+use SL::Taxkeys;
+
 use Data::Dumper;
+use File::Path;
+use Time::HiRes qw(gettimeofday);
+
+use strict;
+
+sub _get_export_path {
+  $main::lxdebug->enter_sub();
+
+  my ($a, $b) = gettimeofday();
+  my $path    = get_path_for_download_token("${a}-${b}-${$}");
+
+  mkpath($path) unless (-d $path);
+
+  $main::lxdebug->leave_sub();
+
+  return $path;
+}
+
+sub get_path_for_download_token {
+  $main::lxdebug->enter_sub();
+
+  my $token = shift;
+  my $path;
+
+  if ($token =~ m|^(\d+)-(\d+)-(\d+)$|) {
+    $path = "${main::userspath}/datev-export-${1}-${2}-${3}";
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $path;
+}
+
+sub get_download_token_for_path {
+  $main::lxdebug->enter_sub();
+
+  my $path = shift;
+  my $token;
+
+  if ($path =~ m|.*datev-export-(\d+)-(\d+)-(\d+)/?$|) {
+    $token = "${1}-${2}-${3}";
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $token;
+}
+
+sub clean_temporary_directories {
+  $main::lxdebug->enter_sub();
+
+  foreach my $path (glob "${main::userspath}/datev-export-*") {
+    next unless (-d $path);
+
+    my $mtime = (stat($path))[9];
+    next if ((time() - $mtime) < 8 * 60 * 60);
+
+    rmtree $path;
+  }
+
+  $main::lxdebug->leave_sub();
+}
+
+sub _fill {
+  $main::lxdebug->enter_sub();
+
+  my $text      = shift;
+  my $field_len = shift;
+  my $fill_char = shift;
+  my $alignment = shift || 'right';
+
+  my $text_len  = length $text;
+
+  if ($field_len < $text_len) {
+    $text = substr $text, 0, $field_len;
+
+  } elsif ($field_len > $text_len) {
+    my $filler = ($fill_char) x ($field_len - $text_len);
+    $text      = $alignment eq 'right' ? $filler . $text : $text . $filler;
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $text;
+}
 
 sub get_datev_stamm {
   $main::lxdebug->enter_sub();
@@ -36,20 +127,19 @@ sub get_datev_stamm {
   # 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);
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  
+
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_datev_stamm {
   $main::lxdebug->enter_sub();
 
@@ -58,47 +148,52 @@ sub save_datev_stamm {
   # 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
               (beraternr, beratername, dfvkz, mandantennr, datentraegernr, abrechnungsnr) VALUES
-              (|.$dbh->quote($form->{beraternr}).qq|,|.$dbh->quote($form->{beratername}).qq|,|.$dbh->quote($form->{dfvkz}).qq|,
-              |.$dbh->quote($form->{mandantennr}).qq|,|.$dbh->quote($form->{datentraegernr}).qq|,|.$dbh->quote($form->{abrechnungsnr}).qq|)|;
-  $sth = $dbh->prepare($query);
+              (|
+    . $dbh->quote($form->{beraternr}) . qq|,|
+    . $dbh->quote($form->{beratername}) . qq|,|
+    . $dbh->quote($form->{dfvkz}) . qq|,
+              |
+    . $dbh->quote($form->{mandantennr}) . qq|,|
+    . $dbh->quote($form->{datentraegernr}) . qq|,|
+    . $dbh->quote($form->{abrechnungsnr}) . qq|)|;
+  my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   $sth->finish;
-  
+
   $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
 }
-    
+
 sub kne_export {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  my $rc;
+  my $result;
 
-  if ($form->{exporttype}==0) {
-    $rc = &kne_buchungsexport($myconfig, $form);
+  if ($form->{exporttype} == 0) {
+    $result = kne_buchungsexport($myconfig, $form);
   } else {
-    $rc = &kne_stammdatenexport($myconfig, $form);
+    $result = kne_stammdatenexport($myconfig, $form);
   }
 
   $main::lxdebug->leave_sub();
 
-  return $rc;
+  return $result;
 }
 
-
 sub obe_export {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig); 
+  my $dbh = $form->dbconnect_noauto($myconfig);
   $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
@@ -108,329 +203,436 @@ sub get_dates {
   $main::lxdebug->enter_sub();
 
   my ($zeitraum, $monat, $quartal, $transdatefrom, $transdateto) = @_;
-  
-  $fromto="transdate >= ";
-  
-  my @a = localtime; $a[5] += 1900;
-  $jahr=$a[5];
+  my ($fromto, $jahr, $leap);
+
+  my $form = $main::form;
+
+  $fromto = "transdate >= ";
+
+  my @a = localtime;
+  $a[5] += 1900;
+  $jahr = $a[5];
   if ($zeitraum eq "monat") {
-     SWITCH: {
-    	$monat eq "1" && do {
-      					$form->{fromdate}="1.1.$jahr";
-				      	$form->{todate}="31.1.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "2" && do {
-      					$form->{fromdate}="1.2.$jahr";
-					#this works from 1901 to 2099, 1900 and 2100 fail.
-					$leap=($jahr % 4 == 0) ? "29" : "28";
-				      	$form->{todate}="$leap.2.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "3" && do {
-      					$form->{fromdate}="1.3.$jahr";
-				      	$form->{todate}="31.3.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "4" && do {
-      					$form->{fromdate}="1.4.$jahr";
-				      	$form->{todate}="30.4.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "5" && do {
-      					$form->{fromdate}="1.5.$jahr";
-				      	$form->{todate}="31.5.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "6" && do {
-      					$form->{fromdate}="1.6.$jahr";
-				      	$form->{todate}="30.6.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "7" && do {
-      					$form->{fromdate}="1.7.$jahr";
-				      	$form->{todate}="31.7.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "8" && do {
-      					$form->{fromdate}="1.8.$jahr";
-				      	$form->{todate}="31.8.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "9" && do {
-      					$form->{fromdate}="1.9.$jahr";
-				      	$form->{todate}="30.9.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "10" && do {
-      					$form->{fromdate}="1.10.$jahr";
-				      	$form->{todate}="31.10.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "11" && do {
-      					$form->{fromdate}="1.11.$jahr";
-				      	$form->{todate}="30.11.$jahr";
-					last SWITCH;
-    					};
-    	$monat eq "12" && do {
-      					$form->{fromdate}="1.12.$jahr";
-				      	$form->{todate}="31.12.$jahr";
-					last SWITCH;
-    					};
-        }
-    $fromto .= "'".$form->{fromdate}."' and transdate <= '".$form->{todate}."'";
+  SWITCH: {
+      $monat eq "1" && do {
+        $form->{fromdate} = "1.1.$jahr";
+        $form->{todate}   = "31.1.$jahr";
+        last SWITCH;
+      };
+      $monat eq "2" && do {
+        $form->{fromdate} = "1.2.$jahr";
+
+        #this works from 1901 to 2099, 1900 and 2100 fail.
+        $leap = ($jahr % 4 == 0) ? "29" : "28";
+        $form->{todate} = "$leap.2.$jahr";
+        last SWITCH;
+      };
+      $monat eq "3" && do {
+        $form->{fromdate} = "1.3.$jahr";
+        $form->{todate}   = "31.3.$jahr";
+        last SWITCH;
+      };
+      $monat eq "4" && do {
+        $form->{fromdate} = "1.4.$jahr";
+        $form->{todate}   = "30.4.$jahr";
+        last SWITCH;
+      };
+      $monat eq "5" && do {
+        $form->{fromdate} = "1.5.$jahr";
+        $form->{todate}   = "31.5.$jahr";
+        last SWITCH;
+      };
+      $monat eq "6" && do {
+        $form->{fromdate} = "1.6.$jahr";
+        $form->{todate}   = "30.6.$jahr";
+        last SWITCH;
+      };
+      $monat eq "7" && do {
+        $form->{fromdate} = "1.7.$jahr";
+        $form->{todate}   = "31.7.$jahr";
+        last SWITCH;
+      };
+      $monat eq "8" && do {
+        $form->{fromdate} = "1.8.$jahr";
+        $form->{todate}   = "31.8.$jahr";
+        last SWITCH;
+      };
+      $monat eq "9" && do {
+        $form->{fromdate} = "1.9.$jahr";
+        $form->{todate}   = "30.9.$jahr";
+        last SWITCH;
+      };
+      $monat eq "10" && do {
+        $form->{fromdate} = "1.10.$jahr";
+        $form->{todate}   = "31.10.$jahr";
+        last SWITCH;
+      };
+      $monat eq "11" && do {
+        $form->{fromdate} = "1.11.$jahr";
+        $form->{todate}   = "30.11.$jahr";
+        last SWITCH;
+      };
+      $monat eq "12" && do {
+        $form->{fromdate} = "1.12.$jahr";
+        $form->{todate}   = "31.12.$jahr";
+        last SWITCH;
+      };
+    }
+    $fromto .=
+      "'" . $form->{fromdate} . "' and transdate <= '" . $form->{todate} . "'";
   }
-  
+
   elsif ($zeitraum eq "quartal") {
-    if ($quartal==1) {
-    $fromto .= "'01.01.".$jahr."' and transdate <= '31.03.".$jahr."'";
-    }
-    elsif ($quartal==2) {
-    $fromto .= "'01.04.".$jahr."' and transdate <= '30.06.".$jahr."'";
-    }
-    elsif ($quartal==3) {
-    $fromto .= "'01.07.".$jahr."' and transdate <= '30.09.".$jahr."'";
-    }
-    elsif ($quartal==4) {
-    $fromto .= "'01.10.".$jahr."' and transdate <= '31.12.".$jahr."'";
+    if ($quartal == 1) {
+      $fromto .=
+        "'01.01." . $jahr . "' and transdate <= '31.03." . $jahr . "'";
+    } elsif ($quartal == 2) {
+      $fromto .=
+        "'01.04." . $jahr . "' and transdate <= '30.06." . $jahr . "'";
+    } elsif ($quartal == 3) {
+      $fromto .=
+        "'01.07." . $jahr . "' and transdate <= '30.09." . $jahr . "'";
+    } elsif ($quartal == 4) {
+      $fromto .=
+        "'01.10." . $jahr . "' and transdate <= '31.12." . $jahr . "'";
     }
   }
-  
+
   elsif ($zeitraum eq "zeit") {
-    $fromto .= "'".$transdatefrom."' and transdate <= '".$transdateto."'";
+    $fromto            .= "'" . $transdatefrom . "' and transdate <= '" . $transdateto . "'";
+    my ($yy, $mm, $dd)  = $main::locale->parse_date(\%main::myconfig, $transdatefrom);
+    $jahr               = $yy;
   }
 
   $main::lxdebug->leave_sub();
 
-  return $fromto;
+  return ($fromto, $jahr);
 }
 
-sub get_transactions {
+sub _sign {
+  my $value = shift;
+
+  return $value < 0 ? -1
+    :    $value > 0 ?  1
+    :                  0;
+}
+
+sub _get_transactions {
   $main::lxdebug->enter_sub();
 
-  my ($myconfig, $form, $fromto) = @_;
+  my $fromto   =  shift;
+
+  my $myconfig =  \%main::myconfig;
+  my $form     =  $main::form;
+
+  my $dbh      =  $form->get_standard_dbh($myconfig);
+
+  my ($notsplitindex);
+  my @errors   = ();
+
+  $form->{net_gross_differences}     = [];
+  $form->{sum_net_gross_differences} = 0;
+
+  $fromto      =~ s/transdate/ac\.transdate/g;
+
+  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    =
+    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,
+         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
+
+       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,
+         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
+
+       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,
+         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, acc_trans_id|;
+
+  my $sth = prepare_execute_query($form, $dbh, $query);
+
+  my $counter = 0;
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    $counter++;
+    if (($counter % 500) == 0) {
+      print("$counter ");
+    }
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-  
-  $fromto =~ s/transdate/ac\.transdate/g;
-  
-  $query = qq|SELECT taxkey, rate FROM tax|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $taxes{$ref->{taxkey}} = $ref->{rate};
-  }  
-  
-  $sth->finish();  
-  
-  $query = qq|SELECT ac.oid, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey, 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 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
-              UNION ALL
-              SELECT ac.oid, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey, 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 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
-              UNION ALL
-              SELECT ac.oid, 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, c.accno,  c.taxkey_id as charttax, c.datevautomatik, c.id, t.chart_id, t.rate 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
-              ORDER BY trans_id, oid|;
- 
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  $i=0;
-  $g=0;
-  @splits;
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $count=0;
-    $firstrun = 1;
-    $count += $ref->{amount};
-    push @{ $i}, $ref;
-    while (abs($count)> 0.01 || $firstrun) {
-      $ref2 = $sth->fetchrow_hashref(NAME_lc);
+    my $trans    = [ $ref ];
+
+    my $count    = $ref->{amount};
+    my $firstrun = 1;
+
+    while (abs($count) > 0.01 || $firstrun) {
+      my $ref2 = $sth->fetchrow_hashref("NAME_lc");
       last unless ($ref2);
-      $count += $ref2->{amount};
-      push @{ $i}, $ref2;
-      $firstrun = 0;
+
+      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;
     }
-    $absumsatz = 0;
-    if (scalar(@ {$i}) >2) {
-      for my $j (0 .. (scalar(@ {$i}) -1)) {
-        if (abs($i->[$j]->{'amount'}) > abs($absumsatz)) {
-          $absumsatz = $i->[$j]->{'amount'};
-          $notsplitindex = $j;
-        }
+
+    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) {
+      push @{ $form->{DATEV} }, $trans;
+      next;
+    }
+
+    for my $j (0 .. (scalar(@{$trans}) - 1)) {
+      if (abs($trans->[$j]->{'amount'}) > abs($absumsatz)) {
+        $absumsatz     = $trans->[$j]->{'amount'};
+        $notsplitindex = $j;
       }
-      $ml = ($i->[0]->{'umsatz'} > 0) ? 1 : -1;
-      for my $j (0 .. (scalar(@ {$i}) -1)) {
-        if (($j != $notsplitindex) && ($i->[$j]->{'chart_id'} eq "") && ($i->[$j]->{'taxkey'} eq "" || $i->[$j]->{'taxkey'} eq "0" || $i->[$j]->{'taxkey'} eq "1" || $i->[$j]->{'taxkey'} eq "10" || $i->[$j]->{'taxkey'} eq "11")) {
-          my %blubb = {};
-          map({ $blubb{$_} = $i->[$notsplitindex]->{$_}; } keys(%{ $i->[$notsplitindex] }));
-          $absumsatz += $i->[$j]->{'amount'};
-          $blubb{'amount'} = $i->[$j]->{'amount'} * (-1);
-          $blubb{'umsatz'} = abs($i->[$j]->{'amount'}) * $ml;
-          $i->[$j]->{'umsatz'} = abs($i->[$j]->{'amount'}) * $ml;
-          push @{$splits[$g]}, \%blubb; #$i->[$notsplitindex];
-          push @{$splits[$g]}, $i->[$j];
-          push @{ $form->{DATEV} }, \@{$splits[$g]};
-          $g++;
-        } elsif (($j != $notsplitindex) && ($i->[$j]->{'chart_id'} eq "")) {
-          $absumsatz += ($i->[$j]->{'amount'} * (1 + $taxes{$i->[$j]->{'taxkey'}}));
-          my %blubb = {};
-          map({ $blubb{$_} = $i->[$notsplitindex]->{$_}; } keys(%{ $i->[$notsplitindex] }));
-          $test = 1+ $taxes{$i->[$j]->{'taxkey'}};          
-          $blubb{'amount'} = $form->round_amount(($i->[$j]->{'amount'} * $test * -1),2);
-          
-          #print(STDERR $test, " Taxrate\n\n");
-          $blubb{'umsatz'} = abs($form->round_amount(($i->[$j]->{'amount'} * $test),2)) *$ml;
-          
-          $i->[$j]->{'umsatz'} = abs($form->round_amount(($i->[$j]->{'amount'} * $test),2)) *$ml;
-          
-          #print(STDERR $i->[$j]->{'umsatz'}, " Steuer Umsatz\n");
-          #print(STDERR $i->[$j]->{'amount'}, " Steuer Betrag\n");
-          #print(STDERR $blubb{'umsatz'}, " Umsatz NOTSPLIT\n");
-          push @{$splits[$g]}, \%blubb;
-          push @{$splits[$g]}, $i->[$j];
-          push @{ $form->{DATEV} }, \@{$splits[$g]};
-          $g++;
+    }
+
+    my $ml             = ($trans->[0]->{'umsatz'} > 0) ? 1 : -1;
+    my $rounding_error = 0;
+    my @taxed;
+
+    for my $j (0 .. (scalar(@{$trans}) - 1)) {
+      if (   ($j != $notsplitindex)
+          && !$trans->[$j]->{is_tax}
+          && (   $trans->[$j]->{'taxkey'} eq ""
+              || $trans->[$j]->{'taxkey'} eq "0"
+              || $trans->[$j]->{'taxkey'} eq "1"
+              || $trans->[$j]->{'taxkey'} eq "10"
+              || $trans->[$j]->{'taxkey'} eq "11")) {
+        my %new_trans = ();
+        map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };
+
+        $absumsatz               += $trans->[$j]->{'amount'};
+        $new_trans{'amount'}      = $trans->[$j]->{'amount'} * (-1);
+        $new_trans{'umsatz'}      = abs($trans->[$j]->{'amount'}) * $ml;
+        $trans->[$j]->{'umsatz'}  = abs($trans->[$j]->{'amount'}) * $ml;
+
+        push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+
+      } 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 $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'};
+
         } else {
-          next;
+          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($rounded) * $ml;
+          $trans->[$j]->{'umsatz'}  = $new_trans{umsatz};
+          $absumsatz               -= $rounded;
         }
+
+        push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+        push @taxed, $form->{DATEV}->[-1];
       }
-      if (abs($absumsatz) > 0.01) {
-        print(STDERR $absumsatz, "ABSAUMSATZ\n");
-        $form->error("Datev-Export fehlgeschlagen!");
-      }
-    } else {
-      push @{ $form->{DATEV} }, \@{ $i};          
     }
-    $i++;
-  }
-  $sth->finish;
-  $dbh->disconnect;
-  
-  $main::lxdebug->leave_sub();
-}
 
-sub make_kne_data_header {
-  $main::lxdebug->enter_sub();
+    my $idx        = 0;
+    my $correction = 0;
+    while ((abs($absumsatz) >= 0.01) && (abs($absumsatz) < 1.00)) {
+      if ($idx >= scalar @taxed) {
+        last if (!$correction);
 
-  my ($myconfig, $form, $fromto) = @_;
-  
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+        $correction = 0;
+        $idx        = 0;
+      }
 
-  my @a = localtime;
-  $jahr=$a[5];    
+      my $transaction = $taxed[$idx]->[0];
 
-  #Header
-  $anwendungsnr = ($fromto) ? "\x31\x31" : "\x31\x33" ;
-  while (length($form->{datentraegernr})<3) {
-    $form->{datentraegernr}= "\x30".$form->{datentraegernr};
-  }
-  
-  $header="\x1D\x18\x31".$form->{datentraegernr}.$anwendungsnr;
+      my $old_amount     = $transaction->{amount};
+      my $old_correction = $correction;
+      my @possible_diffs;
 
-  $dfvkz=$form->{dfvkz};
-  while (length($dfvkz)<2) {
-     $dfvkz = "\x30".$dfvkz;
-  }
-  $header .= $dfvkz;
+      if (!$transaction->{diff}) {
+        @possible_diffs = (0.01, -0.01);
+      } else {
+        @possible_diffs = ($transaction->{diff});
+      }
 
-  $beraternr=$form->{beraternr};
-  while (length($beraternr)<7) {
-    $beraternr = "\x30".$beraternr;
-  }
-  $header .= $beraternr;
+      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++;
+    }
 
-  $mandantennr=$form->{mandantennr};
-  while (length($mandantennr)<5) {
-    $mandantennr = "\x30".$mandantennr;
+    $absumsatz = $form->round_amount($absumsatz, 2);
+    if (abs($absumsatz) >= (0.01 * (1 + scalar @taxed))) {
+      push @errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)\n";
+
+    } elsif (abs($absumsatz) >= 0.01) {
+      push @{ $form->{net_gross_differences} }, $absumsatz;
+      $form->{sum_net_gross_differences} += $absumsatz;
+    }
   }
-  $header .= $mandantennr;
 
-  $abrechnungsnr=$form->{abrechnungsnr}.$jahr;
-  while (length($abrechnungsnr)<6) {
-    $abrechnungsnr = "\x30".$abrechnungsnr;
+  $sth->finish();
+
+  $form->error(join("<br>\n", @errors)) if (@errors);
+
+  $main::lxdebug->leave_sub();
+}
+
+sub make_kne_data_header {
+  $main::lxdebug->enter_sub();
+
+  my ($myconfig, $form, $fromto, $start_jahr) = @_;
+  my ($primanota);
+
+  my $jahr = $start_jahr;
+  if (!$jahr) {
+    my @a = localtime;
+    $jahr = $a[5];
   }
-  $header .= $abrechnungsnr;
 
-  $fromto =~ s/transdate|>=|and|\'|<=//g;
-  my ($from, $to) = split /   /, $fromto;
-  $from =~ s/ //g;
-  $to =~ s/ //g;
+  #Header
+  my $header  = "\x1D\x181";
+  $header    .= _fill($form->{datentraegernr}, 3, ' ', 'left');
+  $header    .= ($fromto) ? "11" : "13"; # Anwendungsnummer
+  $header    .= _fill($form->{dfvkz}, 2, '0');
+  $header    .= _fill($form->{beraternr}, 7, '0');
+  $header    .= _fill($form->{mandantennr}, 5, '0');
+  $header    .= _fill($form->{abrechnungsnr} . $jahr, 6, '0');
+
+  $fromto         =~ s/transdate|>=|and|\'|<=//g;
+  my ($from, $to) =  split /   /, $fromto;
+  $from           =~ s/ //g;
+  $to             =~ s/ //g;
 
   if ($from ne "") {
-    my ($fday, $fmonth, $fyear) = split /\./, $from;
+    my ($fday, $fmonth, $fyear) = split(/\./, $from);
     if (length($fmonth) < 2) {
-      $fmonth = "0".$fmonth;
+      $fmonth = "0" . $fmonth;
     }
     if (length($fday) < 2) {
-      $fday = "0".$fday;
+      $fday = "0" . $fday;
     }
-    $from = $fday.$fmonth.substr($fyear, -2, 2);
-  } else {$from="";}
+    $from = $fday . $fmonth . substr($fyear, -2, 2);
+  } else {
+    $from = "";
+  }
 
   $header .= $from;
 
   if ($to ne "") {
-    my ($tday, $tmonth, $tyear) = split /\./, $to;
-    if (length($tmonth) <2) {
-      $tmonth = "0".$tmonth;
+    my ($tday, $tmonth, $tyear) = split(/\./, $to);
+    if (length($tmonth) < 2) {
+      $tmonth = "0" . $tmonth;
     }
-    if (length($tday) <2) {
-      $tday = "0".$tday;
+    if (length($tday) < 2) {
+      $tday = "0" . $tday;
     }
-    $to = $tday.$tmonth.substr($tyear, -2, 2);
-  } else {$to="";}
+    $to = $tday . $tmonth . substr($tyear, -2, 2);
+  } else {
+    $to = "";
+  }
   $header .= $to;
+
   if ($fromto ne "") {
-    $primanota = "\x30\x30\x31";
+    $primanota = "001";
     $header .= $primanota;
   }
 
-  $passwort=$form->{passwort};
-  while (length($passwort)<4) {
-    $passwort = "\x30".$passwort;
-  }
-  $header .= $passwort;  
-
-  $anwendungsinfo = "\x20" x 16;
-  $header .= $anwendungsinfo;
-  $inputinfo = "\x20" x 16;
-  $header .= $inputinfo;
-  
+  $header .= _fill($form->{passwort}, 4, '0');
+  $header .= " " x 16;       # Anwendungsinfo
+  $header .= " " x 16;       # Inputinfo
   $header .= "\x79";
-  
+
   #Versionssatz
-  if ($form->{exporttype}==0) {
-    $versionssatz= "\xB5"."1,";
-  } else {
-    $versionssatz= "\xB6"."1,";}
-    
-    
-  $query = qq| select accno from chart limit 1|;
-  $sth=$dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
-  $accnolength = $ref->{accno};
-  $sth->finish;
-  
-  $versionssatz .= length($accnolength);
-  $versionssatz .= ",";
-  $versionssatz .= length($accnolength);
-  $versionssatz .= ",SELF"."\x1C\x79";
-    
-  $dbh->disconnect;
+  my $versionssatz  = $form->{exporttype} == 0 ? "\xB5" . "1," : "\xB6" . "1,";
 
-  $header .= $versionssatz;
+  my $dbh           = $form->get_standard_dbh($myconfig);
+  my $query         = qq|SELECT accno FROM chart LIMIT 1|;
+  my $ref           = selectfirst_hashref_query($form, $dbh, $query);
+
+  $versionssatz    .= length $ref->{accno};
+  $versionssatz    .= ",";
+  $versionssatz    .= length $ref->{accno};
+  $versionssatz    .= ",SELF" . "\x1C\x79";
+
+  $header          .= $versionssatz;
 
   $main::lxdebug->leave_sub();
 
@@ -441,23 +643,23 @@ sub datetofour {
   $main::lxdebug->enter_sub();
 
   my ($date, $six) = @_;
-  
-  ($day, $month, $year) = split /\./, $date;
+
+  my ($day, $month, $year) = split(/\./, $date);
 
   if ($day =~ /^0/) {
-    $day = substr($day,1,1);
+    $day = substr($day, 1, 1);
   }
-  if (length($month) <2) {
-    $month = "0".$month;
-  }  
-  if (length($year) >2) {
+  if (length($month) < 2) {
+    $month = "0" . $month;
+  }
+  if (length($year) > 2) {
     $year = substr($year, -2, 2);
   }
-  
+
   if ($six) {
-    $date= $day.$month.$year;
+    $date = $day . $month . $year;
   } else {
-    $date= $day.$month;
+    $date = $day . $month;
   }
 
   $main::lxdebug->leave_sub();
@@ -465,50 +667,35 @@ sub datetofour {
   return $date;
 }
 
-sub formatumsatz {
-  $main::lxdebug->enter_sub();
+sub trim_leading_zeroes {
+  my $str = shift;
 
-  my ($umsatz, $stellen) = @_;
-  
-  $umsatz =~ s/-//;
-  ($vorkomma, $nachkomma) = split /\./, $umsatz;
-  $umsatz="";
-  if ($stellen>0) {
-    for ($i=$stellen; $i >= $stellen+2 - length($vorkomma); $i--) {
-      $umsatz .="0";
-    }
-  }
-  for ($i=3; $i > length($nachkomma); $i--) {
-    $nachkomma .= "0";
-  }
-  $umsatz = $vorkomma.substr($nachkomma,0,2);
+  $str =~ s/^0+//g;
 
-  $main::lxdebug->leave_sub();
-
-  return $umsatz;
+  return $str;
 }
 
 sub make_ed_versionset {
   $main::lxdebug->enter_sub();
 
   my ($header, $filename, $blockcount, $fromto) = @_;
-  
-  $versionset="V".substr($filename,2,5);
-  $versionset.=substr($header,6,22);
+
+  my $versionset  = "V" . substr($filename, 2, 5);
+  $versionset    .= substr($header, 6, 22);
+
   if ($fromto ne "") {
-  $versionset.="0000".substr($header,28,19);
-  } else { $datum= "\x20" x 16;
-           $versionset .= $datum."001".substr($header,28,4);
-         }
-  while (length($blockcount) <5) {
-    $blockcount= "0".$blockcount;
+    $versionset .= "0000" . substr($header, 28, 19);
+  } else {
+    my $datum = " " x 16;
+    $versionset .= $datum . "001" . substr($header, 28, 4);
   }
-  $versionset.=$blockcount;
-  $versionset.="001";
-  $versionset.="\x20\x31";
-  $versionset.= substr($header,-12,10)."    ";
-  $versionset.= "\x20" x 53;
-  
+
+  $versionset .= _fill($blockcount, 5, '0');
+  $versionset .= "001";
+  $versionset .= " 1";
+  $versionset .= substr($header, -12, 10) . "    ";
+  $versionset .= " " x 53;
+
   $main::lxdebug->leave_sub();
 
   return $versionset;
@@ -518,33 +705,15 @@ sub make_ev_header {
   $main::lxdebug->enter_sub();
 
   my ($form, $fileno) = @_;
-  $datentraegernr=$form->{datentraegernr};
-  $beraternummer=$form->{beraternr};
-  $beratername=$form->{beratername};
-  $anzahl_dateien=$fileno;
-  
-  while (length($datentraegernr) <3) {
-   $datentraegernr.= " ";
-  }
 
-  while (length($beraternummer) <7) {
-    $beraternummer.=" ";
-  }
-  
-  while (length($beratername) <9) {
-    $beratername.= " ";
-  }
-  
-  while (length($anzahl_dateien) <5) {
-    $anzahl_dateien = "0".$anzahl_dateien;
-  }
- 
-  
-  $ev_header=$datentraegernr."\x20\x20\x20".$beraternummer.$beratername."\x20";
-  $ev_header.=$anzahl_dateien.$anzahl_dateien;
-  $ev_header.= "\x20" x 95;
-  
-  
+  my $ev_header  = _fill($form->{datentraegernr}, 3, ' ', 'left');
+  $ev_header    .= "   ";
+  $ev_header    .= _fill($form->{beraternr}, 7, ' ', 'left');
+  $ev_header    .= _fill($form->{beratername}, 9, ' ', 'left');
+  $ev_header    .= " ";
+  $ev_header    .= (_fill($fileno, 5, '0')) x 2;
+  $ev_header    .= " " x 95;
+
   $main::lxdebug->leave_sub();
 
   return $ev_header;
@@ -554,300 +723,292 @@ sub kne_buchungsexport {
   $main::lxdebug->enter_sub();
 
   my ($myconfig, $form) = @_;
-  
-  my $export_path="datev/";
-  my $filename="ED00000";
-  my $evfile="EV01";
-  my @ed_versionsets;
-  my $fileno=0;
-  
-  $fromto= &get_dates($form->{zeitraum}, $form->{monat}, $form->{quartal}, $form->{transdatefrom}, $form->{transdateto});
-  &get_transactions($myconfig, $form, $fromto);
-
-  while (scalar(@{ $form->{DATEV}})) {
-    my $blockcount=1;
-    my $remaining_bytes=256;
-    my $total_bytes=256;
-    my $umsatzsumme=0;
-    my $buchungssatz = "";
+
+  my @filenames;
+
+  my $export_path = _get_export_path() . "/";
+  my $filename    = "ED00000";
+  my $evfile      = "EV01";
+  my @ed_versionset;
+  my $fileno = 0;
+
+  $form->header;
+  print qq|
+  <html>
+  <body>Export in Bearbeitung<br>
+  Buchungss&auml;tze verarbeitet:
+|;
+
+  my ($fromto, $start_jahr) =
+    &get_dates($form->{zeitraum}, $form->{monat},
+               $form->{quartal},  $form->{transdatefrom},
+               $form->{transdateto});
+  _get_transactions($fromto);
+  my $counter = 0;
+  print qq|<br>2. Durchlauf:|;
+  while (scalar(@{ $form->{DATEV} })) {
+    my $umsatzsumme = 0;
     $filename++;
-    my $ed_filename= $export_path.$filename;
-    open (ED, "> $ed_filename") or die "can't open outputfile: $!\n";
-    $header=&make_kne_data_header($myconfig, $form, $fromto);
-    $remaining_bytes -= length($header);
-    
-    while (scalar(@{ $form->{DATEV}})>0) {
-      $transaction = shift @{ $form->{DATEV}};
-      $trans_lines = scalar(@ {$transaction});
-      $umsatz =0;
-      $gegenkonto="";
-      $konto="";
-      $belegfeld1="";
-      $datum="";
-      $waehrung="";
-      $buchungstext="";
-      $belegfeld2="";
-      $datevautomatik=0;
-      $taxkey=0;
-      $charttax=0;
-      %umlaute = ('ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'Ä' => 'Ae', 'Ö' => 'Oe', 'Ü' => 'Ue', 'ß' => 'sz');
-      
-      for (my $i=0; $i <$trans_lines; $i++) {
-        if (abs($transaction->[$i]->{'umsatz'}) > abs($umsatz)) {
-          $umsatz = $transaction->[$i]->{'umsatz'};
+    my $ed_filename = $export_path . $filename;
+    push(@filenames, $filename);
+    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 $transaction = shift @{ $form->{DATEV} };
+      my $trans_lines = scalar(@{$transaction});
+      $counter++;
+      if (($counter % 500) == 0) {
+        print("$counter ");
+      }
+
+      my $umsatz         = 0;
+      my $gegenkonto     = "";
+      my $konto          = "";
+      my $belegfeld1     = "";
+      my $datum          = "";
+      my $waehrung       = "";
+      my $buchungstext   = "";
+      my $belegfeld2     = "";
+      my $datevautomatik = 0;
+      my $taxkey         = 0;
+      my $charttax       = 0;
+      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)) {
+            $umsatz = $transaction->[$i]->{'amount'};
+          }
+        } else {
+          if (abs($transaction->[$i]->{'umsatz'}) > abs($umsatz)) {
+            $umsatz = $transaction->[$i]->{'umsatz'};
+          }
         }
         if ($transaction->[$i]->{'datevautomatik'}) {
-          $datevautomatik=1;
+          $datevautomatik = 1;
         }
         if ($transaction->[$i]->{'taxkey'}) {
           $taxkey = $transaction->[$i]->{'taxkey'};
         }
         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;
         }
       }
-      
-      $umsatzsumme += $umsatz;
 
-      # Umwandlung von Umlauten und Sonderzeichen in erlaubte Zeichen bei Textfeldern     
-      foreach $umlaut (keys(%umlaute)) {
+      # Umwandlung von Umlauten und Sonderzeichen in erlaubte Zeichen bei Textfeldern
+      foreach my $umlaut (keys(%umlaute)) {
         $transaction->[$haben]->{'invnumber'} =~ s/${umlaut}/${umlaute{$umlaut}}/g;
-        $transaction->[$haben]->{'name'} =~ s/${umlaut}/${umlaute{$umlaut}}/g;
+        $transaction->[$haben]->{'name'}      =~ s/${umlaut}/${umlaute{$umlaut}}/g;
       }
-      
-      $transaction->[$haben]->{'invnumber'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g;
-      $transaction->[$haben]->{'name'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\ \/]//g;
 
+      $transaction->[$haben]->{'invnumber'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g;
+      $transaction->[$haben]->{'name'}      =~ s/[^0-9A-Za-z\$\%\&\*\+\-\ \/]//g;
 
-      $transaction->[$haben]->{'invnumber'} = substr($transaction->[$haben]->{'invnumber'}, 0, 12);
-      $transaction->[$haben]->{'name'} = substr($transaction->[$haben]->{'name'}, 0, 30);
+      $transaction->[$haben]->{'invnumber'} =  substr($transaction->[$haben]->{'invnumber'}, 0, 12);
+      $transaction->[$haben]->{'name'}      =  substr($transaction->[$haben]->{'name'}, 0, 30);
       $transaction->[$haben]->{'invnumber'} =~ s/\ *$//;
-      $transaction->[$haben]->{'name'} =~ s/\ *$//;
-      
+      $transaction->[$haben]->{'name'}      =~ s/\ *$//;
 
       if ($trans_lines >= 2) {
 
-        $gegenkonto = "a".$transaction->[$haben]->{'accno'};
-        $konto = "e".$transaction->[$soll]->{'accno'};
-        if ($transaction->[$haben]->{'invnumber'} ne "") { 
-          $belegfeld1= "\xBD".$transaction->[$haben]->{'invnumber'}."\x1C";}
+        $gegenkonto = "a" . trim_leading_zeroes($transaction->[$haben]->{'accno'});
+        $konto      = "e" . trim_leading_zeroes($transaction->[$soll]->{'accno'});
+        if ($transaction->[$haben]->{'invnumber'} ne "") {
+          $belegfeld1 = "\xBD" . $transaction->[$haben]->{'invnumber'} . "\x1C";
+        }
         $datum = "d";
-        $datum .= &datetofour($transaction->[$haben]->{'transdate'},0);
-        $waehrung = "\xB3"."EUR"."\x1C";
-        if ($transaction->[$haben]->{'name'} ne "") { 
-        $buchungstext = "\x1E".$transaction->[$haben]->{'name'}."\x1C";}
-        if ($transaction->[$haben]->{'duedate'} ne "") { 
-        $belegfeld2 = "\xBE".&datetofour($transaction->[$haben]->{'duedate'},1)."\x1C";}
-      }
-
-
-      if (($remaining_bytes- length("+".&formatumsatz($umsatz, 0))) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $vorzeichen = ($umsatz > 0) ? "+" : "-";
-      $buchungssatz .=$vorzeichen.&formatumsatz($umsatz, 0);
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);
-      
-      if (($taxkey || $datevautomatik) && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) {
-        if (($remaining_bytes- length("\x6C"."11")) <=6) {
-            $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-          $buchungssatz .= "\x00" x $fuellzeichen;
-          $blockcount++;
-          $total_bytes = ($blockcount) *256;
+        $datum .= &datetofour($transaction->[$haben]->{'transdate'}, 0);
+        $waehrung = "\xB3" . "EUR" . "\x1C";
+        if ($transaction->[$haben]->{'name'} ne "") {
+          $buchungstext = "\x1E" . $transaction->[$haben]->{'name'} . "\x1C";
         }
-        if (!$datevautomatik) {
-          $buchungssatz .="\x6C".$taxkey;
-        } else {
-          $buchungssatz .="\x6C"."4";
+        if ($transaction->[$haben]->{'duedate'} ne "") {
+          $belegfeld2 = "\xBE" . &datetofour($transaction->[$haben]->{'duedate'}, 1) . "\x1C";
         }
-        $remaining_bytes = $total_bytes - length($buchungssatz.$header);
-      }
-      
-      if (($remaining_bytes- length($gegenkonto)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= $gegenkonto;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);      
-          
-      if (($remaining_bytes- length($belegfeld1)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
       }
-      $buchungssatz .= $belegfeld1;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);       
-
-      if (($remaining_bytes- length($belegfeld2)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= $belegfeld2;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);
-
-      if (($remaining_bytes- length($datum)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= $datum;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header); 
-
-      if (($remaining_bytes- length($konto)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= $konto;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header); 
 
+      $umsatz       = $kne_file->format_amount(abs($umsatz), 0);
+      $umsatzsumme += $umsatz;
+      $kne_file->add_block("+" . $umsatz);
 
-      if (($remaining_bytes- length($buchungstext)) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= $buchungstext;
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);
-      
-      if (($remaining_bytes- (length($waehrung."\x79"))) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
+      if (   ( $datevautomatik || $taxkey)
+          && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) {
+#         $kne_file->add_block("\x6C" . (!$datevautomatik ? $taxkey : "4"));
+        $kne_file->add_block("\x6C${taxkey}");
       }
-      $buchungssatz .= $waehrung."\x79";
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);      
-      
+
+      $kne_file->add_block($gegenkonto);
+      $kne_file->add_block($belegfeld1);
+      $kne_file->add_block($belegfeld2);
+      $kne_file->add_block($datum);
+      $kne_file->add_block($konto);
+      $kne_file->add_block($buchungstext);
+      $kne_file->add_block($waehrung . "\x79");
     }
-    
-    $mandantenendsumme = "x".&formatumsatz($umsatzsumme,14)."\x79"."\x7a";
-    $fuellzeichen = 256 - (length($header.$buchungssatz.$mandantenendsumme) % 256);
-    $dateiende = "\x00" x $fuellzeichen;    
-    print (ED $header);
-    print (ED $buchungssatz);
-    print (ED $mandantenendsumme);
-    print (ED $dateiende);
-    close (ED);
-    
-    $ed_versionset[$fileno]= &make_ed_versionset($header, $filename, $blockcount, $fromto);
+
+    my $mandantenendsumme = "x" . $kne_file->format_amount($umsatzsumme / 100.0, 14) . "\x79\x7a";
+
+    $kne_file->add_block($mandantenendsumme);
+    $kne_file->flush();
+
+    open(ED, "> $ed_filename") or die "can't open outputfile: $!\n";
+    print(ED $kne_file->get_data());
+    close(ED);
+
+    $ed_versionset[$fileno] = &make_ed_versionset($header, $filename, $kne_file->get_block_count(), $fromto);
     $fileno++;
   }
-  
+
   #Make EV Verwaltungsdatei
-  $ev_header= &make_ev_header($form, $fileno);
-  $ev_filename= $export_path.$evfile;
-  open (EV, "> $ev_filename") or die "can't open outputfile: EV01\n";  
-  print (EV $ev_header);
-  
-  foreach $file (@ed_versionset) {
-    print (EV $ed_versionset[$file]);
+  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);
+
+  foreach my $file (@ed_versionset) {
+    print(EV $ed_versionset[$file]);
   }
-  close (EV); 
+  close(EV);
+  print qq|<br>Done. <br>
+|;
   ###
   $main::lxdebug->leave_sub();
+
+  return { 'download_token' => get_download_token_for_path($export_path), 'filenames' => \@filenames };
 }
 
 sub kne_stammdatenexport {
   $main::lxdebug->enter_sub();
 
   my ($myconfig, $form) = @_;
-  $form->{abrechnungsnr}="99";
-  
-  my $export_path="datev/";
-  my $filename="ED00000";
-  my $evfile="EV01";
-  my @ed_versionsets;
-  my $fileno=1;
-  my $i=0;
-  my $blockcount=1;
-  my $remaining_bytes=256;
-  my $total_bytes=256;
-  my $buchungssatz = "";
+  $form->{abrechnungsnr} = "99";
+
+  $form->header;
+  print qq|
+  <html>
+  <body>Export in Bearbeitung<br>
+|;
+
+  my @filenames;
+
+  my $export_path = _get_export_path() . "/";
+  my $filename    = "ED00000";
+  my $evfile      = "EV01";
+  my @ed_versionset;
+  my $fileno          = 1;
+  my $i               = 0;
+  my $blockcount      = 1;
+  my $remaining_bytes = 256;
+  my $total_bytes     = 256;
+  my $buchungssatz    = "";
   $filename++;
-  my $ed_filename= $export_path.$filename;
-  open (ED, "> $ed_filename") or die "can't open outputfile: $!\n";
-  $header=&make_kne_data_header($myconfig, $form, "");
+  my $ed_filename = $export_path . $filename;
+  push(@filenames, $filename);
+  open(ED, "> $ed_filename") or die "can't open outputfile: $!\n";
+  my $header = &make_kne_data_header($myconfig, $form, "");
   $remaining_bytes -= length($header);
-  
-  
+
+  my $fuellzeichen;
+  our $fromto;
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  
-  $query = qq|SELECT c.accno, c.description FROM chart c WHERE c.accno >=|.$dbh->quote($form->{accnofrom}).qq|
-           AND c.accno <= |.$dbh->quote($form->{accnoto}).qq| ORDER BY c.accno|;
- 
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
 
-  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;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= "t".$ref->{'accno'};
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);
-      $ref->{'description'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g;
-      $ref->{'description'} = substr($ref->{'description'}, 0, 40);
-      $ref->{'description'} =~ s/\ *$//;
-
-      if (($remaining_bytes- length("\x1E".$ref->{'description'}."\x1C\x79")) <=6) {
-        $fuellzeichen = ($blockcount * 256 - length($buchungssatz.$header));
-        $buchungssatz .= "\x00" x $fuellzeichen;
-        $blockcount++;
-        $total_bytes = ($blockcount) *256;
-      }
-      $buchungssatz .= "\x1E".$ref->{'description'}."\x1C\x79";
-      $remaining_bytes = $total_bytes - length($buchungssatz.$header);
+  my (@where, @values) = ((), ());
+  if ($form->{accnofrom}) {
+    push @where, 'c.accno >= ?';
+    push @values, $form->{accnofrom};
   }
-  
+  if ($form->{accnoto}) {
+    push @where, 'c.accno <= ?';
+    push @values, $form->{accnoto};
+  }
+
+  my $where_str = ' WHERE ' . join(' AND ', map { "($_)" } @where) if (scalar @where);
+
+  my $query     = qq|SELECT c.accno, c.description
+                     FROM chart c
+                     $where_str
+                     ORDER BY c.accno|;
+
+  my $sth = $dbh->prepare($query);
+  $sth->execute(@values) || $form->dberror($query);
+
+  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;
+      $blockcount++;
+      $total_bytes = ($blockcount) * 256;
+    }
+    $buchungssatz .= "t" . $ref->{'accno'};
+    $remaining_bytes = $total_bytes - length($buchungssatz . $header);
+    $ref->{'description'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g;
+    $ref->{'description'} = substr($ref->{'description'}, 0, 40);
+    $ref->{'description'} =~ s/\ *$//;
+
+    if (
+        ($remaining_bytes - length("\x1E" . $ref->{'description'} . "\x1C\x79")
+        ) <= 6
+      ) {
+      $fuellzeichen = ($blockcount * 256 - length($buchungssatz . $header));
+      $buchungssatz .= "\x00" x $fuellzeichen;
+      $blockcount++;
+      $total_bytes = ($blockcount) * 256;
+    }
+    $buchungssatz .= "\x1E" . $ref->{'description'} . "\x1C\x79";
+    $remaining_bytes = $total_bytes - length($buchungssatz . $header);
+  }
+
   $sth->finish;
-  print (ED $header);
-  print (ED $buchungssatz);
-  $fuellzeichen = 256 - (length($header.$buchungssatz."z") % 256);
-  $dateiende = "\x00" x $fuellzeichen;
-  print (ED "z");
-  print (ED $dateiende);
-  close (ED);
-  
+  print(ED $header);
+  print(ED $buchungssatz);
+  $fuellzeichen = 256 - (length($header . $buchungssatz . "z") % 256);
+  my $dateiende = "\x00" x $fuellzeichen;
+  print(ED "z");
+  print(ED $dateiende);
+  close(ED);
+
   #Make EV Verwaltungsdatei
-  $ed_versionset[0]= &make_ed_versionset($header, $filename, $blockcount, $fromto);
-
-  $ev_header= &make_ev_header($form, $fileno);
-  $ev_filename= $export_path.$evfile;
-  open (EV, "> $ev_filename") or die "can't open outputfile: EV01\n";  
-  print (EV $ev_header);
-  
-  foreach $file (@ed_versionset) {
-    print (EV $ed_versionset[$file]);
+  $ed_versionset[0] =
+    &make_ed_versionset($header, $filename, $blockcount, $fromto);
+
+  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);
+
+  foreach my $file (@ed_versionset) {
+    print(EV $ed_versionset[$file]);
   }
-  close (EV);
-  
-  $dbh->disconnect; 
+  close(EV);
+
+  $dbh->disconnect;
   ###
 
+  print qq|<br>Done. <br>
+|;
+
   $main::lxdebug->leave_sub();
+
+  return { 'download_token' => get_download_token_for_path($export_path), 'filenames' => \@filenames };
 }
 
 1;