From: Bernd Bleßmann Date: Fri, 24 Jan 2020 17:29:24 +0000 (+0100) Subject: DATEV-Tests nach Erweiterung f. Festschreibungskennzeichen gefixed X-Git-Tag: release-3.5.6.1~386 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2d9b08c723af0fbab5153ba6c8603db3a44cf98d;p=kivitendo-erp.git DATEV-Tests nach Erweiterung f. Festschreibungskennzeichen gefixed Die Tests gingen mit "DATEV-Export Festschreibungskennzeichen für jede Buchung einzel setzen" (commit e4edba0587fc8224bd69047fe57dbf435b776aa6) kaputt. Das Array hat jetzt mehr Einträge und das Festschreibunungskennzeichen ist an. Behebt #416 (redmine). --- diff --git a/t/datev/datev_format_2018.t b/t/datev/datev_format_2018.t index f1ef1b5b7..d97c32998 100644 --- a/t/datev/datev_format_2018.t +++ b/t/datev/datev_format_2018.t @@ -130,6 +130,7 @@ $datev4->from($startdate); $datev4->to($enddate); $datev4->generate_datev_data; $datev4->generate_datev_lines; + my ($datev_csv4, $die_message3, $lines_aref); eval { $datev_csv4 = SL::DATEV::CSV->new(datev_lines => $datev4->generate_datev_lines, @@ -160,8 +161,8 @@ cmp_deeply $sorted[0], [ '1963,5', 'S', 'EUR', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '', '', '', '', '', - '', + '', '', '', '', '', '', '', '1', '', + '', '', '', '', '', ]; cmp_deeply $sorted[1], [ '535', 'S', 'EUR', '', '', '', '1400', '8300', '', '1907','meine muh', @@ -176,8 +177,8 @@ cmp_deeply $sorted[1], [ '535', 'S', 'EUR', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '', '', '', '', '', - '', + '', '', '', '', '', '', '', '1', '', + '', '', '', '', '', ]; # create one haben buchung with GLTransaction today @@ -229,7 +230,7 @@ cmp_deeply($data_csv[0], [ '100', 'S', 'EUR', '', '', '', '4660', '1000', 9, '17 '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '' ] + '', '', '1', '', '', '', '', '', '', ] ); # TODO warnings are not yet tested diff --git a/t/datev/invoices.t b/t/datev/invoices.t index 318b9f9be..3b2d4af57 100644 --- a/t/datev/invoices.t +++ b/t/datev/invoices.t @@ -73,6 +73,7 @@ cmp_deeply \@data_datev, [ 'konto' => '1400', 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', + 'locked' => undef, 'umsatz' => '249.9', 'waehrung' => 'EUR', }, @@ -84,6 +85,7 @@ cmp_deeply \@data_datev, [ 'konto' => '1400', 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', + 'locked' => undef, 'umsatz' => 535, 'waehrung' => 'EUR', }, @@ -97,6 +99,7 @@ cmp_deeply \@data_datev, [ 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '784.9', + 'locked' => undef, 'waehrung' => 'EUR', }, ], "trans_id datev check ok"; @@ -114,6 +117,7 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '249.9', + 'locked' => undef, 'waehrung' => 'EUR', }, { @@ -125,6 +129,7 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => 535, + 'locked' => undef, 'waehrung' => 'EUR', }, { @@ -136,6 +141,7 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost1' => 'Kostenstelle DATEV-Schnittstelle 2018', 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '784.9', + 'locked' => undef, 'waehrung' => 'EUR', }, ], "trans_id datev check use_pk ok"; @@ -175,7 +181,7 @@ cmp_deeply($data_csv[1], [ '535', 'S', 'EUR', '', '', '', '1400', '8300', '', '0 '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '' ] + '', '', '1', '', '', '', '', '', '' ] ); cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '', '0101', "\x{de} sales \x{a5}& i", @@ -187,7 +193,7 @@ cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '' ] + '', '', '1', '', '', '', '', '', '' ] ); cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '', '0501', "\x{de} sales \x{a5}& i", '', '', 'Testcustomer', '', '', '', '', '', '', '', '', @@ -198,7 +204,7 @@ cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '' ] + '', '', '1', '', '', '', '', '', '' ] ); my $march_9 = DateTime->new(year => 2017, month => 3, day => 9); my $invoice2 = create_sales_invoice( @@ -278,6 +284,7 @@ cmp_deeply $datev1->generate_datev_lines, [ 'kost1' => undef, 'kost2' => undef, 'umsatz' => 119, + 'locked' => undef, 'waehrung' => 'EUR' }, { @@ -289,6 +296,7 @@ cmp_deeply $datev1->generate_datev_lines, [ 'kost1' => undef, 'kost2' => undef, 'umsatz' => 107, + 'locked' => undef, 'waehrung' => 'EUR' } ], "trans_id datev check purchase_invoice ok"; @@ -304,6 +312,7 @@ cmp_deeply $datev1->generate_datev_lines, [ 'kost1' => undef, 'kost2' => undef, 'umsatz' => 119, + 'locked' => undef, 'waehrung' => 'EUR' }, { @@ -315,6 +324,7 @@ cmp_deeply $datev1->generate_datev_lines, [ 'kost1' => undef, 'kost2' => undef, 'umsatz' => 107, + 'locked' => undef, 'waehrung' => 'EUR' } ], "trans_id datev check purchase_invoice use_pk ok";