Merge branch 'bug_7455' into 3.12-master

[koha.git] / t / db_dependent / Acquisition.t

diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t
index ab0b6d0..4a5b31e 100755 (executable)
--- a/t/db_dependent/Acquisition.t
+++ b/t/db_dependent/Acquisition.t
@@ -33,10 +33,13 @@ my $orders = GetPendingOrders( $supplierid, $grouped );
 isa_ok( $orders, 'ARRAY' );
 
 my @lateorders = GetLateOrders(0);
-my $order = $lateorders[0];
-AddClaim( $order->{ordernumber} );
-my $neworder = GetOrder( $order->{ordernumber} );
-is( $neworder->{claimed_date}, strftime( "%Y-%m-%d", localtime(time) ), "AddClaim : Check claimed_date" );
+SKIP: {
+   skip 'No Late Orders, cannot test AddClaim', 1 unless @lateorders;
+   my $order = $lateorders[0];
+   AddClaim( $order->{ordernumber} );
+   my $neworder = GetOrder( $order->{ordernumber} );
+   is( $neworder->{claimed_date}, strftime( "%Y-%m-%d", localtime(time) ), "AddClaim : Check claimed_date" );
+}
 
 SKIP: {
     skip 'No relevant orders in database, cannot test baskets', 33 unless( scalar @$orders );
@@ -44,7 +47,7 @@ SKIP: {
     my @expectedfields = qw( basketno
                              biblioitemnumber
                              biblionumber
-                             booksellerinvoicenumber
+                             invoiceid
                              budgetdate
                              cancelledby
                              closedate
@@ -56,7 +59,7 @@ SKIP: {
                              entrydate
                              firstname
                              freight
-                             gst
+                             gstrate
                              listprice
                              notes
                              ordernumber