X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fdatev%2Finvoices.t;h=3625f8867193f410bfcc04552a6c176730cb9436;hb=90a1b6fad6aeeab84fc96d6511fdf42fff315df5;hp=a37c34c98b9dd5c5376c51217b5cadc6649093ae;hpb=d76eb69edc6e531f9fcc393de03f3a7a18b265e0;p=kivitendo-erp.git diff --git a/t/datev/invoices.t b/t/datev/invoices.t index a37c34c98..3625f8867 100644 --- a/t/datev/invoices.t +++ b/t/datev/invoices.t @@ -1,8 +1,9 @@ use strict; use Test::More; -use Test::Deep qw(cmp_bag); +use Test::Deep qw(cmp_deeply cmp_bag); use lib 't'; +use utf8; use_ok 'Support::TestSetup'; use SL::DATEV qw(:CONSTANTS); @@ -59,8 +60,11 @@ my $datev1 = SL::DATEV->new( dbh => $invoice->db->dbh, trans_id => $invoice->id, ); + $datev1->generate_datev_data; -cmp_bag $datev1->generate_datev_lines, [ + +my @data_datev = sort { $a->{umsatz} <=> $b->{umsatz} } @{ $datev1->generate_datev_lines() }; +cmp_deeply \@data_datev, [ { 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", 'buchungstext' => 'Testcustomer', @@ -71,7 +75,6 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '249.9', 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, { 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", @@ -83,10 +86,12 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => 535, 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, { 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", + + +'buchungstext' => 'Testcustomer', 'buchungstext' => 'Testcustomer', 'datum' => '05.01.2017', 'gegenkonto' => '1400', @@ -95,15 +100,15 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '784.9', 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, ], "trans_id datev check ok"; $datev1->use_pk(1); $datev1->generate_datev_data; +# TODO for cmp_deeply we need to sort the incoming data structure (see below) cmp_bag $datev1->generate_datev_lines, [ { - 'belegfeld1' => Encode::decode('utf-8', "Þ sales ¥& invöice"), + 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", 'buchungstext' => 'Testcustomer', 'datum' => '01.01.2017', 'gegenkonto' => '8400', @@ -112,10 +117,9 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '249.9', 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, { - 'belegfeld1' => Encode::decode('utf-8', "Þ sales ¥& invöice"), + 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", 'buchungstext' => 'Testcustomer', 'datum' => '01.01.2017', 'gegenkonto' => '8300', @@ -124,10 +128,9 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => 535, 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, { - 'belegfeld1' => Encode::decode('utf-8', "Þ sales ¥& invöice"), + 'belegfeld1' => "\x{de} sales \x{a5}& inv\x{f6}ice", 'buchungstext' => 'Testcustomer', 'datum' => '05.01.2017', 'gegenkonto' => $customer->customernumber, @@ -136,7 +139,6 @@ cmp_bag $datev1->generate_datev_lines, [ 'kost2' => 'Crowd-Funding September 2017', 'umsatz' => '784.9', 'waehrung' => 'EUR', - 'soll_haben_kennzeichen' => 'S', }, ], "trans_id datev check use_pk ok"; @@ -147,49 +149,58 @@ my $enddate = DateTime->new(year => 2017, month => 12, day => 31); # check conversion to csv $datev1->from($startdate); $datev1->to($enddate); -$datev1->use_pk(0); # reset use_pk for csv_buchungsexport +# reset use_pk for csv_buchungsexport +$datev1->use_pk(0); +$datev1->generate_datev_data; + + +my $datev_csv = SL::DATEV::CSV->new(datev_lines => $datev1->generate_datev_lines, + from => $startdate, + to => $enddate, + locked => $datev1->locked, + ); +$datev_csv->lines; + -# splice away the header, because sort won't do # we need sort, because pay_invoice is not acc_trans_id order safe -my @data_csv = splice @{ $datev1->csv_buchungsexport() }, 2, 5; -@data_csv = sort { $a->[0] <=> $b->[0] } @data_csv; - -my $cp1252_belegfeld1 = SL::Iconv::convert("UTF-8", "CP1252", 'Þ sales ¥& i'); -my $cp1252_buchungstext = SL::Iconv::convert("UTF-8", "CP1252", 'Þ sales ¥& invöice'); - -cmp_bag($data_csv[1], [ 535, 'S', 'EUR', undef, undef, undef, '1400', '8300', undef, '0101', $cp1252_belegfeld1, - undef, undef, $cp1252_buchungstext, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, 'Crowd-Fu', 'Kostenst', undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef ] +my @data_csv = sort { $a->[0] cmp $b->[0] } @{ $datev_csv->lines }; +# warnings should be undef -> no array elements at all +is(scalar @{ $datev_csv->warnings }, 0); + + +cmp_deeply($data_csv[1], [ '535', 'S', 'EUR', '', '', '', '1400', '8300', '', '0101', "\x{de} sales \x{a5}& i", + '', '', 'Testcustomer', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '' ] ); -cmp_bag($data_csv[0], [ '249,9', 'S', 'EUR', undef, undef, undef, '1400', '8400', undef, '0101', $cp1252_belegfeld1, - undef, undef, $cp1252_buchungstext, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, 'Crowd-Fu', 'Kostenst', undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef ] +cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '', '0101', "\x{de} sales \x{a5}& i", + '', '', 'Testcustomer', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '' ] ); -cmp_bag($data_csv[2], [ '784,9', 'S', 'EUR', undef, undef, undef, '1200', '1400', undef, '0501', $cp1252_belegfeld1, - undef, undef, $cp1252_buchungstext, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, 'Crowd-Fu', 'Kostenst', undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef ] +cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '', '0501', "\x{de} sales \x{a5}& i", + '', '', 'Testcustomer', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '', '', '', '', '', '', '', '', '', + '', '', '', '', '' ] ); my $march_9 = DateTime->new(year => 2017, month => 3, day => 9); my $invoice2 = create_sales_invoice( @@ -239,7 +250,7 @@ $datev1 = SL::DATEV->new( ); $datev1->generate_datev_data; -cmp_bag $datev1->generate_datev_lines, [ +cmp_deeply $datev1->generate_datev_lines, [ { 'belegfeld1' => 'ap1', 'buchungstext' => 'Testvendor', @@ -248,7 +259,6 @@ cmp_bag $datev1->generate_datev_lines, [ 'konto' => '3400', 'kost1' => undef, 'kost2' => undef, - 'soll_haben_kennzeichen' => 'H', 'umsatz' => 119, 'waehrung' => 'EUR' }, @@ -260,14 +270,13 @@ cmp_bag $datev1->generate_datev_lines, [ 'konto' => '3300', 'kost1' => undef, 'kost2' => undef, - 'soll_haben_kennzeichen' => 'H', 'umsatz' => 107, 'waehrung' => 'EUR' } ], "trans_id datev check purchase_invoice ok"; $datev1->use_pk(1); $datev1->generate_datev_data; -cmp_bag $datev1->generate_datev_lines, [ +cmp_deeply $datev1->generate_datev_lines, [ { 'belegfeld1' => 'ap1', 'buchungstext' => 'Testvendor', @@ -276,7 +285,6 @@ cmp_bag $datev1->generate_datev_lines, [ 'konto' => '3400', 'kost1' => undef, 'kost2' => undef, - 'soll_haben_kennzeichen' => 'H', 'umsatz' => 119, 'waehrung' => 'EUR' }, @@ -288,7 +296,6 @@ cmp_bag $datev1->generate_datev_lines, [ 'konto' => '3300', 'kost1' => undef, 'kost2' => undef, - 'soll_haben_kennzeichen' => 'H', 'umsatz' => 107, 'waehrung' => 'EUR' } @@ -311,10 +318,10 @@ cmp_ok($umsatzsumme, '==', 1569.8, "Sum of bookings made after March 1st (only i $::form->{gldatefrom} = DateTime->new(year => 2017, month => 5, day => 1)->to_kivitendo; $datev->generate_datev_data(from_to => $datev->fromto); -cmp_bag $datev->generate_datev_lines, [], "no bookings for January made after May 1st: ok"; +cmp_deeply $datev->generate_datev_lines, [], "no bookings for January made after May 1st: ok"; done_testing(); -# clear_up(); +clear_up(); sub new_purchase_invoice { # manually create a Kreditorenbuchung from scratch, ap + acc_trans bookings, as no helper exists yet, like $invoice->post.