OrderController: reorder mit Sort::Naturally damit nach Preis ordentlich

[kivitendo-erp.git] / t / datev / invoices.t

diff --git a/t/datev/invoices.t b/t/datev/invoices.t
index 9060e5b..3625f88 100644 (file)
--- a/t/datev/invoices.t
+++ b/t/datev/invoices.t
@@ -75,7 +75,6 @@ cmp_deeply \@data_datev, [
                                            'kost2'        => 'Crowd-Funding September 2017',
                                            'umsatz'       => '249.9',
                                            'waehrung'     => 'EUR',
-                                           'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
                                            'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
@@ -87,7 +86,6 @@ cmp_deeply \@data_datev, [
                                            'kost2'        => 'Crowd-Funding September 2017',
                                            'umsatz'       => 535,
                                            'waehrung'     => 'EUR',
-                                           'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
                                            'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
@@ -102,7 +100,6 @@ cmp_deeply \@data_datev, [
                                            'kost2'        => 'Crowd-Funding September 2017',
                                            'umsatz'       => '784.9',
                                            'waehrung'     => 'EUR',
-                                           'soll_haben_kennzeichen' => 'S',
                                          },
                                        ], "trans_id datev check ok";
 
@@ -120,7 +117,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",
@@ -132,7 +128,6 @@ 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",
@@ -144,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";
 
@@ -160,21 +154,22 @@ $datev1->use_pk(0);
 $datev1->generate_datev_data;
 
 
-my ($datev_ref, $w_ref) = SL::DATEV::CSV->new(datev_lines  => $datev1->generate_datev_lines,
-                                              from         => $startdate,
-                                              to           => $enddate,
-                                              locked       => $datev1->locked,
+my $datev_csv = SL::DATEV::CSV->new(datev_lines  => $datev1->generate_datev_lines,
+                                    from         => $startdate,
+                                    to           => $enddate,
+                                    locked       => $datev1->locked,
                                    );
-# warnings should be undef -> no array elements at all
-is(scalar @{ $w_ref }, 0);
+$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 @{ $datev_ref }, 2, 5;
-@data_csv    = sort { $a->[0] cmp $b->[0] } @data_csv;
+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",
-                     '', '', '', '', '', '', '', '', '', '', '',
+
+cmp_deeply($data_csv[1], [ '535', 'S', 'EUR', '', '', '', '1400', '8300', '', '0101', "\x{de} sales \x{a5}& i",
+                     '', '', 'Testcustomer', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -186,7 +181,7 @@ cmp_deeply($data_csv[1], [ 535, 'S', 'EUR', '', '', '', '1400', '8300', '', '010
        );
 
 cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '', '0101', "\x{de} sales \x{a5}& i",
-                     '', '', '', '', '', '', '', '', '', '', '',
+                     '', '', 'Testcustomer', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -197,7 +192,7 @@ cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '',
                      '', '', '', '', '' ]
        );
 cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '', '0501', "\x{de} sales \x{a5}& i",
-                     '', '', '', '', '', '', '', '', '', '', '',
+                     '', '', 'Testcustomer', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', 'Kostenst', 'Crowd-Fu', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -264,7 +259,6 @@ cmp_deeply $datev1->generate_datev_lines, [
                                           'konto'                  => '3400',
                                           'kost1'                  => undef,
                                           'kost2'                  => undef,
-                                          'soll_haben_kennzeichen' => 'H',
                                           'umsatz'                 => 119,
                                           'waehrung'               => 'EUR'
                                         },
@@ -276,7 +270,6 @@ cmp_deeply $datev1->generate_datev_lines, [
                                           'konto'                  => '3300',
                                           'kost1'                  => undef,
                                           'kost2'                  => undef,
-                                          'soll_haben_kennzeichen' => 'H',
                                           'umsatz'                 => 107,
                                           'waehrung'               => 'EUR'
                                         }
@@ -292,7 +285,6 @@ cmp_deeply $datev1->generate_datev_lines, [
                                           'konto'                  => '3400',
                                           'kost1'                  => undef,
                                           'kost2'                  => undef,
-                                          'soll_haben_kennzeichen' => 'H',
                                           'umsatz'                 => 119,
                                           'waehrung'               => 'EUR'
                                         },
@@ -304,7 +296,6 @@ cmp_deeply $datev1->generate_datev_lines, [
                                           'konto'                  => '3300',
                                           'kost1'                  => undef,
                                           'kost2'                  => undef,
-                                          'soll_haben_kennzeichen' => 'H',
                                           'umsatz'                 => 107,
                                           'waehrung'               => 'EUR'
                                         }
@@ -330,7 +321,7 @@ $datev->generate_datev_data(from_to => $datev->fromto);
 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.