Bug 9987: Remove DB field aqorders.biblioitemnunmber

[koha.git] / t / db_dependent / lib / KohaTest / Acquisition.pm

diff --git a/t/db_dependent/lib/KohaTest/Acquisition.pm b/t/db_dependent/lib/KohaTest/Acquisition.pm
index eca0b16..3f0b789 100644 (file)
--- a/t/db_dependent/lib/KohaTest/Acquisition.pm
+++ b/t/db_dependent/lib/KohaTest/Acquisition.pm
@@ -7,6 +7,7 @@ use warnings;
 use Test::More;
 
 use C4::Acquisition;
+use C4::Budgets;
 use C4::Context;
 use C4::Members;
 use Time::localtime;
@@ -21,11 +22,9 @@ sub methods : Test( 1 ) {
                        CloseBasket 
                        GetPendingOrders 
                        GetOrders 
-                       GetOrderNumber 
                        GetOrder 
                        NewOrder 
                        ModOrder 
-                       ModOrderBiblioNumber 
                        ModReceiveOrder 
                        SearchOrder 
                        DelOrder 
@@ -71,27 +70,21 @@ sub create_new_basket {
     $self->add_biblios( add_items => 1 );
     ok( scalar @{$self->{'biblios'}} > 0, 'we have added at least one biblio' );
 
-    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
-                                          $self->{'biblios'}[0], # $bibnum,
-                                          undef, # $title,
-                                          1, # $quantity,
-                                          undef, # $listprice,
-                                          $self->{'booksellerid'}, # $booksellerid,
-                                          $param{'authorizedby'}, # $authorisedby,
-                                          undef, # $notes,
-                                          $self->{'bookfundid'},     # $bookfund,
-                                          undef, # $bibitemnum,
-                                          1, # $rrp,
-                                          1, # $ecost,
-                                          undef, # $gst,
-                                          undef, # $budget,
-                                          undef, # $cost,
-                                          undef, # $sub,
-                                          $param{'invoice'}, # $invoice,
-                                          undef, # $sort1,
-                                          undef, # $sort2,
-                                          undef, # $purchaseorder
-                                     );
+    my $rand = int(rand(10000));
+    my $basketno = NewBasket( $self->{'booksellerid'}, $param{'authorizedby'},  "Basket $rand");
+#             $basketnote, $basketbooksellernote, $basketcontractnumber );
+#   The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gst", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "bookfundid".
+    my $budget_id = AddBudget( { budget_name => "Budget $rand" } );
+    my ( undef, $ordernumber ) = NewOrder( {
+            basketno => $basketno,
+            budget_id => $budget_id,
+            biblionumber => $self->{'biblios'}[0],
+            quantity => 1,
+            bookfundid => $self->{'bookfundid'},
+            rrp => 1,
+            ecost => 1,
+            booksellerinvoicenumber => $param{'invoice'},
+        } );
     ok( $basketno, "my basket number is $basketno" );
     ok( $ordernumber,   "my order number is $ordernumber" );
     
@@ -125,7 +118,7 @@ sub enable_independant_branches {
                          );
 
     # set a preference. There's surely a method for this, but I can't find it.
-    my $retval = C4::Context->dbh->do( q(update systempreferences set value = '1' where variable = 'IndependantBranches') );
+    my $retval = C4::Context->dbh->do( q(update systempreferences set value = '1' where variable = 'IndependentBranches') );
     ok( $retval, 'set the preference' );
     
     ok( C4::Context->userenv, 'usernev' );
@@ -139,7 +132,7 @@ sub enable_independant_branches {
 sub disable_independant_branches {
     my $self = shift;
 
-    my $retval = C4::Context->dbh->do( q(update systempreferences set value = '0' where variable = 'IndependantBranches') );
+    my $retval = C4::Context->dbh->do( q(update systempreferences set value = '0' where variable = 'IndependentBranches') );
     ok( $retval, 'set the preference back' );