From 470cd7228cc266776adaaabe4f4939239cbcfc63 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 29 Oct 2015 14:59:29 +0100 Subject: [PATCH] GDPDU: itime in Buchungen mit anzeigen --- SL/DATEV.pm | 6 +++--- SL/GDPDU.pm | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SL/DATEV.pm b/SL/DATEV.pm index f5a9d5996..026cbe2af 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -384,7 +384,7 @@ sub _get_transactions { my $query = qq|SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo, - ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate, + ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate, ar.itime::date, ct.name, ct.ustid, ct.customernumber AS vcnumber, ct.id AS customer_id, NULL AS vendor_id, c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, ar.invoice, @@ -406,7 +406,7 @@ sub _get_transactions { UNION ALL SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey, ac.memo, - ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate, + ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate, ap.itime::date, ct.name, ct.ustid, ct.vendornumber AS vcnumber, NULL AS customer_id, ct.id AS vendor_id, c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, ap.invoice, @@ -428,7 +428,7 @@ sub _get_transactions { UNION ALL SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo, - gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate, + gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date, gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id, c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, FALSE AS invoice, diff --git a/SL/GDPDU.pm b/SL/GDPDU.pm index e9878ae34..9ff2cbc52 100644 --- a/SL/GDPDU.pm +++ b/SL/GDPDU.pm @@ -57,6 +57,7 @@ my %datev_column_defs = ( vcnumber => { type => 'Rose::DB::Object::Metadata::Column::Text', text => t8('Customer/Vendor Number'), }, customer_id => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Customer (database ID)'), }, vendor_id => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Vendor (database ID)'), }, + itime => { type => 'Rose::DB::Object::Metadata::Column::Date', text => t8('Create Date'), }, ); my @datev_columns = qw( @@ -68,7 +69,7 @@ my @datev_columns = qw( credit_accno credit_accname taxdescription tax tax_accno tax_accname taxkey - notes + notes itime ); # rows in this listing are tiers. @@ -416,6 +417,7 @@ sub do_datev_csv_export { tax => defined $amount->{net_amount} ? abs($amount->{amount}) - abs($amount->{net_amount}) : 0, taxdescription => defined($soll->{tax_accno}) ? $soll->{taxdescription} : $haben->{taxdescription}, notes => $haben->{notes}, + itime => $soll->{itime}, (map { ($_ => $tax->{$_}) } qw(taxkey tax_accname tax_accno)), (map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(acc_trans_id invnumber name vcnumber transdate)), ); -- 2.20.1