From 8f1dd24237c6fcb238ecdbcaed564156feb619bb Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 14 Dec 2016 23:29:47 +1300 Subject: [PATCH] Revert "Bug 17564: Fix t/db_dependent/Acquisition/OrderUsers.t" This reverts commit 54aee78d6afb0cd1bcb26fc7c7a65e46c372cd0f. --- t/db_dependent/Acquisition/OrderUsers.t | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t index 51e7877ca0..7d051e8e7a 100644 --- a/t/db_dependent/Acquisition/OrderUsers.t +++ b/t/db_dependent/Acquisition/OrderUsers.t @@ -41,7 +41,8 @@ my $budget = C4::Budgets::GetBudget($budgetid); my @ordernumbers; my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( MARC::Record->new, '' ); -my $order = Koha::Acquisition::Order->new( +my $ordernumber; +$ordernumber = Koha::Acquisition::Order->new( { basketno => $basketno, quantity => 2, @@ -56,8 +57,7 @@ my $order = Koha::Acquisition::Order->new( rrp => 10, ecost => 10, } -)->insert; -my $ordernumber = $order->{ordernumber}; +)->insert->{ordernumber}; my $invoiceid = AddInvoice( invoicenumber => 'invoice', @@ -83,11 +83,10 @@ C4::Acquisition::ModOrderUsers( $ordernumber, $borrowernumber ); my $is_added = grep { /^$borrowernumber$/ } C4::Acquisition::GetOrderUsers( $ordernumber ); is( $is_added, 1, 'ModOrderUsers should link patrons to an order' ); -$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber }); ModReceiveOrder( { biblionumber => $biblionumber, - order => $order, + ordernumber => $ordernumber, quantityreceived => 1, cost => 10, ecost => 10, @@ -100,11 +99,10 @@ ModReceiveOrder( my $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); is( scalar( @$messages ), 0, 'The letter has not been sent to message queue on receiving the order, the order is not entire received'); -$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber }); ModReceiveOrder( { biblionumber => $biblionumber, - order => $order, + ordernumber => $ordernumber, quantityreceived => 1, cost => 10, ecost => 10, -- 2.20.1