projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'b-3.6.1' into mebil
[kivitendo-erp.git]
/
SL
/
DATEV.pm
diff --git
a/SL/DATEV.pm
b/SL/DATEV.pm
index
1db417c
..
86cb729
100644
(file)
--- a/
SL/DATEV.pm
+++ b/
SL/DATEV.pm
@@
-543,6
+543,7
@@
sub generate_datev_data {
$gl_itime_filter
$gl_department_id_filter
$gl_imported
$gl_itime_filter
$gl_department_id_filter
$gl_imported
+ AND NOT EXISTS (SELECT gl_id from ap_gl where gl_id = gl.id)
$filter
ORDER BY trans_id, acc_trans_id|;
$filter
ORDER BY trans_id, acc_trans_id|;
@@
-835,6
+836,7
@@
sub generate_datev_lines {
}
if ($transaction->[$i]->{'taxkey'}) {
$taxkey = $transaction->[$i]->{'taxkey'};
}
if ($transaction->[$i]->{'taxkey'}) {
$taxkey = $transaction->[$i]->{'taxkey'};
+ # $taxkey = 0 if $taxkey == 94; # taxbookings are in gl
}
if ($transaction->[$i]->{'charttax'}) {
$charttax = $transaction->[$i]->{'charttax'};
}
if ($transaction->[$i]->{'charttax'}) {
$charttax = $transaction->[$i]->{'charttax'};