X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=407943928647e1f4dddd95b3c5b0c321f1667d7c;hb=5b2980ad49f1937786d25f10fa9dac43cf255eb0;hp=ac3c11228f5583bc10e2a76b50594a1c0e85e493;hpb=e20f3f0dac8c4b362af0e6594de9581d05d0f6c4;p=kivitendo-erp.git diff --git a/SL/DATEV.pm b/SL/DATEV.pm index ac3c11228..407943928 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -332,7 +332,7 @@ sub _get_transactions { 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.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, c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, @@ -347,7 +347,7 @@ sub _get_transactions { 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, c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, @@ -362,7 +362,7 @@ sub _get_transactions { 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, c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, @@ -374,7 +374,7 @@ sub _get_transactions { AND $fromto $filter - ORDER BY trans_id, oid|; + ORDER BY trans_id, acc_trans_id|; my $sth = prepare_execute_query($form, $dbh, $query);