Revision 39fc1390
Von Sven Schöling vor etwa 8 Jahren hinzugefügt
SL/DATEV.pm | ||
---|---|---|
383 | 383 |
my %all_taxchart_ids = selectall_as_map($form, $self->dbh, qq|SELECT DISTINCT chart_id, TRUE AS is_set FROM tax|, 'chart_id', 'is_set'); |
384 | 384 |
|
385 | 385 |
my $query = |
386 |
qq|SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo, |
|
386 |
qq|SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo,
|
|
387 | 387 |
ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate, ar.itime::date, |
388 | 388 |
ct.name, ct.ustid, ct.customernumber AS vcnumber, ct.id AS customer_id, NULL AS vendor_id, |
389 | 389 |
c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, |
... | ... | |
405 | 405 |
|
406 | 406 |
UNION ALL |
407 | 407 |
|
408 |
SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey, ac.memo, |
|
408 |
SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ap.id, ac.amount, ac.taxkey, ac.memo,
|
|
409 | 409 |
ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate, ap.itime::date, |
410 | 410 |
ct.name, ct.ustid, ct.vendornumber AS vcnumber, NULL AS customer_id, ct.id AS vendor_id, |
411 | 411 |
c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, |
... | ... | |
427 | 427 |
|
428 | 428 |
UNION ALL |
429 | 429 |
|
430 |
SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo, |
|
430 |
SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo,
|
|
431 | 431 |
gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date, |
432 | 432 |
gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id, |
433 | 433 |
c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, |
SL/GoBD.pm | ||
---|---|---|
90 | 90 |
customer_id => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Customer (database ID)'), }, |
91 | 91 |
vendor_id => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Vendor (database ID)'), }, |
92 | 92 |
itime => { type => 'Rose::DB::Object::Metadata::Column::Date', text => t8('Create Date'), }, |
93 |
gldate => { type => 'Rose::DB::Object::Metadata::Column::Date', text => t8('Booking Date'), }, |
|
93 | 94 |
); |
94 | 95 |
|
95 | 96 |
my @datev_columns = qw( |
... | ... | |
101 | 102 |
credit_accno credit_accname credit_amount credit_tax |
102 | 103 |
taxdescription tax |
103 | 104 |
tax_accno tax_accname taxkey |
104 |
notes itime |
|
105 |
notes itime gldate
|
|
105 | 106 |
); |
106 | 107 |
|
107 | 108 |
# rows in this listing are tiers. |
... | ... | |
465 | 466 |
tax => $tax_amount, |
466 | 467 |
notes => $haben->{notes}, |
467 | 468 |
(map { ($_ => $tax->{$_}) } qw(taxkey tax_accname tax_accno taxdescription)), |
468 |
(map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(trans_id invnumber name vcnumber transdate itime customer_id vendor_id)), |
|
469 |
(map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(trans_id invnumber name vcnumber transdate gldate itime customer_id vendor_id)),
|
|
469 | 470 |
); |
470 | 471 |
|
471 | 472 |
# if ($row{debit_amount} + $row{debit_tax} - ($row{credit_amount} + $row{credit_tax}) > 0.005) { |
Auch abrufbar als: Unified diff
GoBD: gldate zusätzlich zur beleg.itime ausgeben