projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Locales zu 1424
[kivitendo-erp.git]
/
SL
/
DATEV.pm
diff --git
a/SL/DATEV.pm
b/SL/DATEV.pm
index
f53e9fc
..
e0a0435
100644
(file)
--- a/
SL/DATEV.pm
+++ b/
SL/DATEV.pm
@@
-314,16
+314,12
@@
sub get_transactions {
$blubb{'amount'} =
$form->round_amount(($i->[$j]->{'amount'} * $test * -1), 2);
$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;
$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] };
push @{ $splits[$g] }, \%blubb;
push @{ $splits[$g] }, $i->[$j];
push @{ $form->{DATEV} }, \@{ $splits[$g] };
@@
-333,8
+329,7
@@
sub get_transactions {
}
}
if (abs($absumsatz) > 0.01) {
}
}
if (abs($absumsatz) > 0.01) {
- print(STDERR $absumsatz, "ABSAUMSATZ\n");
- $form->error("Datev-Export fehlgeschlagen!");
+ $form->error("Datev-Export fehlgeschlagen! Bei Transaktion $i->[0]->{trans_id}\n");
}
} else {
push @{ $form->{DATEV} }, \@{$i};
}
} else {
push @{ $form->{DATEV} }, \@{$i};
@@
-593,7
+588,7
@@
sub kne_buchungsexport {
my $evfile = "EV01";
my @ed_versionsets;
my $fileno = 0;
my $evfile = "EV01";
my @ed_versionsets;
my $fileno = 0;
-
+
$form->header;
print qq|
<html>
$form->header;
print qq|
<html>
@@
-621,8
+616,8
@@
sub kne_buchungsexport {
$remaining_bytes -= length($header);
while (scalar(@{ $form->{DATEV} }) > 0) {
$remaining_bytes -= length($header);
while (scalar(@{ $form->{DATEV} }) > 0) {
- $transaction
= shift @{ $form->{DATEV} };
- $trans_lines
= scalar(@{$transaction});
+ $transaction = shift @{ $form->{DATEV} };
+ $trans_lines = scalar(@{$transaction});
$counter++;
if (($counter % 500) == 0) {
print("$counter ");
$counter++;
if (($counter % 500) == 0) {
print("$counter ");
@@
-834,7
+829,7
@@
sub kne_buchungsexport {
print(EV $ed_versionset[$file]);
}
close(EV);
print(EV $ed_versionset[$file]);
}
close(EV);
-print qq|<br>Done. <br></body>
+
print qq|<br>Done. <br></body>
</html>
|;
###
</html>
|;
###
@@
-870,8
+865,7
@@
sub kne_stammdatenexport {
qq|SELECT c.accno, c.description FROM chart c WHERE c.accno >=|
. $dbh->quote($form->{accnofrom}) . qq|
AND c.accno <= |
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|;
+ . $dbh->quote($form->{accnoto}) . qq| ORDER BY c.accno|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);