X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=28fc018e60c075d88367dc4b324a5898b962f671;hb=6ed3eaf6cdcec633878703161f2d6d886bfe2ac3;hp=e0a0435eb31f0ad4da4dca59d32dd0702bc43a29;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index e0a0435eb..28fc018e6 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -83,17 +83,17 @@ sub kne_export {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form) = @_;
- my $rc;
+ my @rc;
if ($form->{exporttype} == 0) {
- $rc = &kne_buchungsexport($myconfig, $form);
+ @rc = &kne_buchungsexport($myconfig, $form);
} else {
- $rc = &kne_stammdatenexport($myconfig, $form);
+ @rc = &kne_stammdatenexport($myconfig, $form);
}
$main::lxdebug->leave_sub();
- return $rc;
+ return @rc;
}
sub obe_export {
@@ -224,30 +224,30 @@ sub get_transactions {
$fromto =~ s/transdate/ac\.transdate/g;
- $query = qq|SELECT taxkey, rate FROM tax|;
+ $query = qq|SELECT id, 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};
+ $taxes{ $ref->{id} } = $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,
+ 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
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
+ 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
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,
+ 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
ORDER BY trans_id, oid|;
@@ -275,6 +275,7 @@ sub get_transactions {
push @{$i}, $ref2;
$firstrun = 0;
}
+ my %taxid_taxkeys = ();
$absumsatz = 0;
if (scalar(@{$i}) > 2) {
for my $j (0 .. (scalar(@{$i}) - 1)) {
@@ -282,6 +283,9 @@ sub get_transactions {
$absumsatz = $i->[$j]->{'amount'};
$notsplitindex = $j;
}
+ if (($i->[$j]->{'taxtaxkey'}) && ($i->[$j]->{'taxid'})) {
+ $taxid_taxkeys{$i->[$j]->{'taxtaxkey'}} = $i->[$j]->{'taxid'};
+ }
}
$ml = ($i->[0]->{'umsatz'} > 0) ? 1 : -1;
for my $j (0 .. (scalar(@{$i}) - 1)) {
@@ -306,11 +310,11 @@ sub get_transactions {
$g++;
} elsif (($j != $notsplitindex) && ($i->[$j]->{'chart_id'} eq "")) {
$absumsatz +=
- ($i->[$j]->{'amount'} * (1 + $taxes{ $i->[$j]->{'taxkey'} }));
+ ($i->[$j]->{'amount'} * (1 + $taxes{ $taxid_taxkeys{$i->[$j]->{'taxkey'}} }));
my %blubb = {};
map({ $blubb{$_} = $i->[$notsplitindex]->{$_}; }
keys(%{ $i->[$notsplitindex] }));
- $test = 1 + $taxes{ $i->[$j]->{'taxkey'} };
+ $test = 1 + $taxes{ $taxid_taxkeys{$i->[$j]->{'taxkey'}} };
$blubb{'amount'} =
$form->round_amount(($i->[$j]->{'amount'} * $test * -1), 2);
@@ -329,7 +333,7 @@ sub get_transactions {
}
}
if (abs($absumsatz) > 0.01) {
- $form->error("Datev-Export fehlgeschlagen! Bei Transaktion $i->[0]->{trans_id}\n");
+ $form->error("Datev-Export fehlgeschlagen! Bei Transaktion $i->[0]->{trans_id} $absumsatz\n");
}
} else {
push @{ $form->{DATEV} }, \@{$i};
@@ -391,7 +395,7 @@ sub make_kne_data_header {
$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;
}
@@ -406,7 +410,7 @@ sub make_kne_data_header {
$header .= $from;
if ($to ne "") {
- my ($tday, $tmonth, $tyear) = split /\./, $to;
+ my ($tday, $tmonth, $tyear) = split(/\./, $to);
if (length($tmonth) < 2) {
$tmonth = "0" . $tmonth;
}
@@ -470,7 +474,7 @@ sub datetofour {
my ($date, $six) = @_;
- ($day, $month, $year) = split /\./, $date;
+ ($day, $month, $year) = split(/\./, $date);
if ($day =~ /^0/) {
$day = substr($day, 1, 1);
@@ -499,7 +503,7 @@ sub formatumsatz {
my ($umsatz, $stellen) = @_;
$umsatz =~ s/-//;
- ($vorkomma, $nachkomma) = split /\./, $umsatz;
+ ($vorkomma, $nachkomma) = split(/\./, $umsatz);
$umsatz = "";
if ($stellen > 0) {
for ($i = $stellen; $i >= $stellen + 2 - length($vorkomma); $i--) {
@@ -583,7 +587,9 @@ sub kne_buchungsexport {
my ($myconfig, $form) = @_;
- my $export_path = "datev/";
+ my @filenames;
+
+ my $export_path = $main::userspath . "/";
my $filename = "ED00000";
my $evfile = "EV01";
my @ed_versionsets;
@@ -611,6 +617,7 @@ sub kne_buchungsexport {
my $buchungssatz = "";
$filename++;
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, $fromto);
$remaining_bytes -= length($header);
@@ -822,6 +829,7 @@ sub kne_buchungsexport {
#Make EV Verwaltungsdatei
$ev_header = &make_ev_header($form, $fileno);
$ev_filename = $export_path . $evfile;
+ push(@filenames, $evfile);
open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
print(EV $ev_header);
@@ -829,11 +837,12 @@ sub kne_buchungsexport {
print(EV $ed_versionset[$file]);
}
close(EV);
- print qq|
Done.
-