Bug 16609: Catch warning from Koha::Hold in Hold.t
[koha.git] / t / db_dependent / Acquisition.t
index 04d2f5a..7c80387 100755 (executable)
@@ -1,14 +1,26 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# This Koha test module is a stub!
-# Add more tests here!!!
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use POSIX qw(strftime);
 
-use C4::Bookseller qw( GetBookSellerFromId );
+use POSIX qw(strftime);
 
-use Test::More tests => 64;
+use Test::More tests => 91;
+use Koha::Database;
 
 BEGIN {
     use_ok('C4::Acquisition');
@@ -16,563 +28,777 @@ BEGIN {
     use_ok('C4::Biblio');
     use_ok('C4::Budgets');
     use_ok('C4::Bookseller');
+    use_ok('Koha::Acquisition::Order');
+    use_ok('Koha::Acquisition::Bookseller');
 }
 
-# Sub used for testing C4::Acquisition subs returning order(s) : GetOrdersByStatus,GetOrders, GetDeletedOrders, GetOrder etc.
-# (\@test_missing_fields,\@test_extra_fields,\@test_different_fields,$test_nbr_fields) = _check_fields_of_order ($exp_fields, $original_order_content, $order_to_check);
+# Sub used for testing C4::Acquisition subs returning order(s):
+#    GetOrdersByStatus, GetOrders, GetDeletedOrders, GetOrder etc.
+# (\@test_missing_fields,\@test_extra_fields,\@test_different_fields,$test_nbr_fields) =
+#  _check_fields_of_order ($exp_fields, $original_order_content, $order_to_check);
 # params :
 # $exp_fields             : arrayref whose elements are the keys we expect to find
-# $original_order_content : hashref whose 2 keys str and num contains hashrefs containing content fields of the order created with NewOrder
-# $order_to_check         : hashref whose keys/values are the content of an order returned by the C4::Acquisition sub we are testing
+# $original_order_content : hashref whose 2 keys str and num contains hashrefs
+#                           containing content fields of the order created with Koha::Acquisition::Order
+# $order_to_check         : hashref whose keys/values are the content of an order
+#                           returned by the C4::Acquisition sub we are testing
 # returns :
-# \@test_missing_fields   : arrayref void if ok ; otherwise contains the list of fields missing in $order_to_check
-# \@test_extra_fields     : arrayref void if ok ; otherwise contains the list of fields unexpected in $order_to_check
-# \@test_different_fields : arrayref void if ok ; otherwise contains the list of fields which value is not the same in between $order_to_check and
+# \@test_missing_fields   : arrayref void if ok ; otherwise contains the list of
+#                           fields missing in $order_to_check
+# \@test_extra_fields     : arrayref void if ok ; otherwise contains the list of
+#                           fields unexpected in $order_to_check
+# \@test_different_fields : arrayref void if ok ; otherwise contains the list of
+#                           fields which value is not the same in between $order_to_check and
 # $test_nbr_fields        : contains the number of fields of $order_to_check
 
 sub _check_fields_of_order {
-    my ($exp_fields, $original_order_content, $order_to_check) = @_;
-    my @test_missing_fields = ();
-    my @test_extra_fields = ();
+    my ( $exp_fields, $original_order_content, $order_to_check ) = @_;
+    my @test_missing_fields   = ();
+    my @test_extra_fields     = ();
     my @test_different_fields = ();
-    my $test_nbr_fields = scalar (keys %$order_to_check);
-    foreach my $field ( @$exp_fields )  {
-        push @test_missing_fields, $field unless exists( $order_to_check->{ $field });
+    my $test_nbr_fields       = scalar( keys %$order_to_check );
+    foreach my $field (@$exp_fields) {
+        push @test_missing_fields, $field
+          unless exists( $order_to_check->{$field} );
     }
-    foreach my $field ( keys %$order_to_check)  {
-        push @test_extra_fields, $field unless grep (/^$field$/, @$exp_fields);
+    foreach my $field ( keys %$order_to_check ) {
+        push @test_extra_fields, $field
+          unless grep ( /^$field$/, @$exp_fields );
     }
-    foreach my $field ( keys %{$original_order_content->{str}})  {
-        push @test_different_fields, $field unless (! exists $order_to_check->{ $field }) or ($original_order_content->{str}->{$field} eq $order_to_check->{ $field });
+    foreach my $field ( keys %{ $original_order_content->{str} } ) {
+        push @test_different_fields, $field
+          unless ( !exists $order_to_check->{$field} )
+          or ( $original_order_content->{str}->{$field} eq
+            $order_to_check->{$field} );
     }
-    foreach my $field ( keys %{$original_order_content->{num}})  {
-        push @test_different_fields, $field unless (! exists $order_to_check->{ $field }) or ($original_order_content->{num}->{$field} == $order_to_check->{ $field });
+    foreach my $field ( keys %{ $original_order_content->{num} } ) {
+        push @test_different_fields, $field
+          unless ( !exists $order_to_check->{$field} )
+          or ( $original_order_content->{num}->{$field} ==
+            $order_to_check->{$field} );
     }
-    return ( \@test_missing_fields,\@test_extra_fields,\@test_different_fields,$test_nbr_fields);
+    return (
+        \@test_missing_fields,   \@test_extra_fields,
+        \@test_different_fields, $test_nbr_fields
+    );
 }
 
 # Sub used for testing C4::Acquisition subs returning several orders
-# (\@test_missing_fields,\@test_extra_fields,\@test_different_fields,\@test_nbr_fields) = _check_fields_of_orders ($exp_fields, $original_orders_content, $orders_to_check)
+# (\@test_missing_fields,\@test_extra_fields,\@test_different_fields,\@test_nbr_fields) =
+#   _check_fields_of_orders ($exp_fields, $original_orders_content, $orders_to_check)
 sub _check_fields_of_orders {
-    my ($exp_fields, $original_orders_content, $orders_to_check) = @_;
-    my @test_missing_fields = ();
-    my @test_extra_fields = ();
+    my ( $exp_fields, $original_orders_content, $orders_to_check ) = @_;
+    my @test_missing_fields   = ();
+    my @test_extra_fields     = ();
     my @test_different_fields = ();
-    my @test_nbr_fields = ();
-    foreach my $order_to_check (@$orders_to_check ) {
-        my $original_order_content = (grep {$_->{str}->{ordernumber} eq $order_to_check-> {ordernumber}} @$original_orders_content)[0];
-        my ($t_missing_fields,$t_extra_fields,$t_different_fields,$t_nbr_fields) = _check_fields_of_order ($exp_fields,$original_order_content,$order_to_check);
-        push @test_missing_fields, @$t_missing_fields;
-        push @test_extra_fields, @$t_extra_fields;
+    my @test_nbr_fields       = ();
+    foreach my $order_to_check (@$orders_to_check) {
+        my $original_order_content =
+          ( grep { $_->{str}->{ordernumber} eq $order_to_check->{ordernumber} }
+              @$original_orders_content )[0];
+        my (
+            $t_missing_fields,   $t_extra_fields,
+            $t_different_fields, $t_nbr_fields
+          )
+          = _check_fields_of_order( $exp_fields, $original_order_content,
+            $order_to_check );
+        push @test_missing_fields,   @$t_missing_fields;
+        push @test_extra_fields,     @$t_extra_fields;
         push @test_different_fields, @$t_different_fields;
-        push @test_nbr_fields, $t_nbr_fields;
+        push @test_nbr_fields,       $t_nbr_fields;
     }
-    @test_missing_fields = keys %{{map {$_ => 1} @test_missing_fields}};
-    @test_extra_fields = keys %{{map {$_ => 1} @test_extra_fields}};
-    @test_different_fields = keys %{{map {$_ => 1} @test_different_fields}};
-    return (\@test_missing_fields,\@test_extra_fields,\@test_different_fields,\@test_nbr_fields);
+    @test_missing_fields = keys %{ { map { $_ => 1 } @test_missing_fields } };
+    @test_extra_fields   = keys %{ { map { $_ => 1 } @test_extra_fields } };
+    @test_different_fields =
+      keys %{ { map { $_ => 1 } @test_different_fields } };
+    return (
+        \@test_missing_fields,   \@test_extra_fields,
+        \@test_different_fields, \@test_nbr_fields
+    );
 }
 
+
+my $schema = Koha::Database->new()->schema();
+$schema->storage->txn_begin();
+
 my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
 $dbh->{RaiseError} = 1;
 
 # Creating some orders
 my $booksellerid = C4::Bookseller::AddBookseller(
     {
-        name => "my vendor",
-        address1 => "bookseller's address",
-        phone => "0123456",
-        active => 1,
+        name         => "my vendor",
+        address1     => "bookseller's address",
+        phone        => "0123456",
+        active       => 1,
         deliverytime => 5,
     }
 );
 
-my $booksellerinfo = C4::Bookseller::GetBookSellerFromId( $booksellerid );
+my $booksellerinfo = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
 
-is($booksellerinfo->{deliverytime}, 5, 'set deliverytime when creating vendor (Bug 10556)');
+is( $booksellerinfo->{deliverytime},
+    5, 'set deliverytime when creating vendor (Bug 10556)' );
 
-my ($basket, $basketno);
-ok($basketno = NewBasket($booksellerid, 1), "NewBasket(  $booksellerid , 1  ) returns $basketno");
-ok($basket   = GetBasket($basketno), "GetBasket($basketno) returns $basket");
+my ( $basket, $basketno );
+ok(
+    $basketno = NewBasket( $booksellerid, 1 ),
+    "NewBasket(  $booksellerid , 1  ) returns $basketno"
+);
+ok( $basket = GetBasket($basketno), "GetBasket($basketno) returns $basket" );
+
+my $bpid=AddBudgetPeriod({
+        budget_period_startdate => '2008-01-01'
+        , budget_period_enddate => '2008-12-31'
+        , budget_period_active  => 1
+        , budget_period_description    => "MAPERI"
+});
 
 my $budgetid = C4::Budgets::AddBudget(
     {
         budget_code => "budget_code_test_getordersbybib",
         budget_name => "budget_name_test_getordersbybib",
+        budget_period_id => $bpid,
     }
 );
-my $budget = C4::Budgets::GetBudget( $budgetid );
+my $budget = C4::Budgets::GetBudget($budgetid);
 
 my @ordernumbers;
-my ($biblionumber1, $biblioitemnumber1) = AddBiblio(MARC::Record->new, '');
-my ($biblionumber2, $biblioitemnumber2) = AddBiblio(MARC::Record->new, '');
-my ($biblionumber3, $biblioitemnumber3) = AddBiblio(MARC::Record->new, '');
-my ($biblionumber4, $biblioitemnumber4) = AddBiblio(MARC::Record->new, '');
-
-
-#
-# Test NewOrder
-#
-
-my ($mandatoryparams, $return_error,$basketnum);
-
-# returns undef and croaks if basketno, quantity, biblionumber or budget_id is missing
-eval {($basketnum, $ordernumbers[0] ) = C4::Acquisition::NewOrder()};
-$return_error = $@;
-ok ((!(defined $basketnum || defined $ordernumbers[0])) && (defined $return_error),"NewOrder with no params returns undef and croaks");
-
-$mandatoryparams = {
-         basketno => $basketno,
-         quantity => 24,
-         biblionumber => $biblionumber1,
-         budget_id => $budget->{budget_id},
-    };
-my @mandatoryparams_keys = keys %$mandatoryparams;
-foreach my $mandatoryparams_key (@mandatoryparams_keys) {
-    my %test_missing_mandatoryparams = %$mandatoryparams;
-    delete $test_missing_mandatoryparams {$mandatoryparams_key};
-    eval {($basketnum, $ordernumbers[0] ) = C4::Acquisition::NewOrder(\%test_missing_mandatoryparams)};
-    $return_error = $@;
-    my $expected_error = "Mandatory parameter $mandatoryparams_key missing";
-    ok ((!(defined $basketnum || defined $ordernumbers[0])) && ( index ($return_error, $expected_error) >=0 ),"NewOrder with no $mandatoryparams_key returns undef and croaks with expected error message");
-}
-
-# FIXME to do : test the other features of NewOrder
+my ( $biblionumber1, $biblioitemnumber1 ) = AddBiblio( MARC::Record->new, '' );
+my ( $biblionumber2, $biblioitemnumber2 ) = AddBiblio( MARC::Record->new, '' );
+my ( $biblionumber3, $biblioitemnumber3 ) = AddBiblio( MARC::Record->new, '' );
+my ( $biblionumber4, $biblioitemnumber4 ) = AddBiblio( MARC::Record->new, '' );
 
 # Prepare 5 orders, and make distinction beween fields to be tested with eq and with ==
 # Ex : a price of 50.1 will be stored internally as 5.100000
 
 my @order_content = (
-    {str => {
-        basketno => $basketno,
-        biblionumber => $biblionumber1,
-        budget_id => $budget->{budget_id},
-        uncertainprice=>0,
-        notes=>"some notes",
+    {
+        str => {
+            basketno       => $basketno,
+            biblionumber   => $biblionumber1,
+            budget_id      => $budget->{budget_id},
+            uncertainprice => 0,
+            order_internalnote => "internal note",
+            order_vendornote   => "vendor note",
+            ordernumber => '',
+        },
+        num => {
+            quantity  => 24,
+            listprice => 50.121111,
+            ecost     => 38.15,
+            rrp       => 40.15,
+            discount  => 5.1111,
+            gstrate   => 0.0515
+        }
     },
-     num => {
-        quantity => 24,
-        listprice=>50.121111,
-        ecost => 38.15,
-        rrp => 40.15,
-        discount =>5.1111,
-        gstrate=>0.0515
-    }},
-    {str => {
-        basketno => $basketno,
-        biblionumber => $biblionumber2,
-        budget_id => $budget->{budget_id}
+    {
+        str => {
+            basketno     => $basketno,
+            biblionumber => $biblionumber2,
+            budget_id    => $budget->{budget_id}
+        },
+        num => { quantity => 42 }
     },
-     num => {
-        quantity => 42
-    }},
-    {str => {
-        basketno => $basketno,
-        biblionumber => $biblionumber2,
-        budget_id => $budget->{budget_id},
-        uncertainprice=>0,
-        notes=>"ordernotes"
+    {
+        str => {
+            basketno       => $basketno,
+            biblionumber   => $biblionumber2,
+            budget_id      => $budget->{budget_id},
+            uncertainprice => 0,
+            order_internalnote => "internal note",
+            order_vendornote   => "vendor note"
         },
-     num =>{
-        quantity => 4,
-        ecost => 42.1,
-        rrp => 42.1,
-        listprice=>10.1,
-        ecost => 38.1,
-        rrp => 11.0,
-        discount =>5.1,
-        gstrate=>0.1
-    }},
-    {str =>{
-        basketno => $basketno,
-        biblionumber => $biblionumber3,
-        budget_id => $budget->{budget_id},
-        notes=>"ordernotes"
+        num => {
+            quantity  => 4,
+            ecost     => 42.1,
+            rrp       => 42.1,
+            listprice => 10.1,
+            ecost     => 38.1,
+            rrp       => 11.0,
+            discount  => 5.1,
+            gstrate   => 0.1
+        }
     },
-     num => {
-        quantity => 4,
-        ecost => 40,
-        rrp => 42,
-        listprice=>10,
-        ecost => 38.15,
-        rrp => 11.00,
-        discount =>0,
-        uncertainprice=>0,
-        gstrate=>0
-    }},
-    {str =>{
-        basketno => $basketno,
-        biblionumber => $biblionumber4,
-        budget_id => $budget->{budget_id},
-        notes=>"ordernotes"
+    {
+        str => {
+            basketno     => $basketno,
+            biblionumber => $biblionumber3,
+            budget_id    => $budget->{budget_id},
+            order_internalnote => "internal note",
+            order_vendornote   => "vendor note"
+        },
+        num => {
+            quantity       => 4,
+            ecost          => 40,
+            rrp            => 42,
+            listprice      => 10,
+            ecost          => 38.15,
+            rrp            => 11.00,
+            discount       => 0,
+            uncertainprice => 0,
+            gstrate        => 0
+        }
     },
-     num => {
-        quantity => 1,
-        ecost => 10,
-        rrp => 10,
-        listprice=>10,
-        ecost => 10,
-        rrp => 10,
-        discount =>0,
-        uncertainprice=>0,
-        gstrate=>0
-    }}
-    );
+    {
+        str => {
+            basketno     => $basketno,
+            biblionumber => $biblionumber4,
+            budget_id    => $budget->{budget_id},
+            order_internalnote => "internal note",
+            order_vendornote   => "vendor note"
+        },
+        num => {
+            quantity       => 1,
+            ecost          => 10,
+            rrp            => 10,
+            listprice      => 10,
+            ecost          => 10,
+            rrp            => 10,
+            discount       => 0,
+            uncertainprice => 0,
+            gstrate        => 0
+        }
+    }
+);
 
 # Create 4 orders in database
-for (0..4) {
-    my %ocontent ;
-    @ocontent { keys %{$order_content[$_]->{num}} } = values %{$order_content[$_]->{num}};
-    @ocontent { keys %{$order_content[$_]->{str}} } = values %{$order_content[$_]->{str}};
-    ( undef, $ordernumbers[$_] ) = C4::Acquisition::NewOrder(\%ocontent);
+for ( 0 .. 4 ) {
+    my %ocontent;
+    @ocontent{ keys %{ $order_content[$_]->{num} } } =
+      values %{ $order_content[$_]->{num} };
+    @ocontent{ keys %{ $order_content[$_]->{str} } } =
+      values %{ $order_content[$_]->{str} };
+    $ordernumbers[$_] = Koha::Acquisition::Order->new( \%ocontent )->insert->{ordernumber};
     $order_content[$_]->{str}->{ordernumber} = $ordernumbers[$_];
 }
 
-
 # Test UT sub _check_fields_of_order
 
-my ($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_order ([qw /a b c d e/], {str=>{a=>"bla",b=>"105"},num=>{c=>15.12}}, {a=>"blabla",f=>"f",b=>"105",c=>15.1200,g=>''});
-ok ((($test_nbr_fields == 5) and (join (" ",sort @$test_missing_fields) eq 'd e') and (join (" ",sort @$test_extra_fields) eq 'f g') and (join(" ",@$test_different_fields) eq 'a')), "_check_fields_of_order can check an order (test 1)");
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_order ([qw /a b c /], {str=>{a=>"bla",b=>"105"},num=>{c=>15.00}}, {a=>"bla",b=>"105",c=>15});
-ok ((($test_nbr_fields == 3) and (scalar @$test_missing_fields == 0) and (scalar @$test_extra_fields == 0) and (scalar @$test_different_fields == 0)) , "_check_fields_of_order can check an order (test 2)");
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_order ([qw /a b c d e/], {str=>{a=>"bla",b=>"105"},num=>{c=>15.12}}, {a=>"blabla",b=>"105",c=>15,d=>"error"});
-ok ((($test_nbr_fields == 4) and (join (" ",sort @$test_missing_fields) eq 'e') and (scalar @$test_extra_fields == 0) and (join(" ",@$test_different_fields) eq 'a c')) , "_check_fields_of_order can check an order (test 3)");
-
+my (
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_order(
+    [qw /a b c d e/],
+    { str => { a => "bla", b => "105" }, num => { c => 15.12 } },
+    { a => "blabla", f => "f", b => "105", c => 15.1200, g => '' }
+  );
+ok(
+    (
+              ( $test_nbr_fields == 5 )
+          and ( join( " ", sort @$test_missing_fields ) eq 'd e' )
+          and ( join( " ", sort @$test_extra_fields )   eq 'f g' )
+          and ( join( " ", @$test_different_fields )    eq 'a' )
+    ),
+    "_check_fields_of_order can check an order (test 1)"
+);
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_order(
+    [qw /a b c /],
+    { str => { a => "bla", b => "105" }, num => { c => 15.00 } },
+    { a => "bla", b => "105", c => 15 }
+  );
+ok(
+    (
+              ( $test_nbr_fields == 3 )
+          and ( scalar @$test_missing_fields == 0 )
+          and ( scalar @$test_extra_fields == 0 )
+          and ( scalar @$test_different_fields == 0 )
+    ),
+    "_check_fields_of_order can check an order (test 2)"
+);
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_order(
+    [qw /a b c d e/],
+    { str => { a => "bla", b => "105" }, num => { c => 15.12 } },
+    { a => "blabla", b => "105", c => 15, d => "error" }
+  );
+ok(
+    (
+              ( $test_nbr_fields == 4 )
+          and ( join( " ", sort @$test_missing_fields ) eq 'e' )
+          and ( scalar @$test_extra_fields == 0 )
+          and ( join( " ", @$test_different_fields ) eq 'a c' )
+    ),
+    "_check_fields_of_order can check an order (test 3)"
+);
 
 #
 # test GetOrder
 #
 
 my @expectedfields = qw(
-    ordernumber
-    biblionumber
-    entrydate
-    quantity
-    currency
-    listprice
-    totalamount
-    datereceived
-    invoiceid
-    freight
-    unitprice
-    quantityreceived
-    cancelledby
-    datecancellationprinted
-    notes
-    supplierreference
-    purchaseordernumber
-    basketno
-    timestamp
-    rrp
-    ecost
-    unitpricesupplier
-    unitpricelib
-    gstrate
-    discount
-    budget_id
-    budgetgroup_id
-    budgetdate
-    sort1
-    sort2
-    sort1_authcat
-    sort2_authcat
-    uncertainprice
-    claims_count
-    claimed_date
-    subscriptionid
-    parent_ordernumber
-    orderstatus
-    title
-    author
-    basketname
-    branchcode
-    publicationyear
-    copyrightdate
-    editionstatement
-    isbn
-    ean
-    seriestitle
-    publishercode
-    publisher
-    budget
-    supplier
-    supplierid
-    estimateddeliverydate
-    orderdate
-    quantity_to_receive
-    subtotal
-    latesince
-    );
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_order (\@expectedfields , $order_content[0], GetOrder($ordernumbers[0]));
-is($test_nbr_fields,scalar @expectedfields , "GetOrder gets an order with the right number of fields" );
-is(join (" ",@$test_missing_fields),'', "GetOrder gets an order with no missing fields" );
-is(join (" ",@$test_extra_fields),'', "GetOrder gets an order with no unexpected fields" );
-is(join (" ",@$test_different_fields),'', "GetOrder gets an order with the right content in every fields" );
+  order_internalnote
+  order_vendornote
+  ordernumber
+  biblionumber
+  entrydate
+  quantity
+  currency
+  listprice
+  datereceived
+  invoiceid
+  freight
+  unitprice
+  quantityreceived
+  datecancellationprinted
+  purchaseordernumber
+  basketno
+  timestamp
+  rrp
+  ecost
+  unitpricesupplier
+  unitpricelib
+  gstrate
+  discount
+  budget_id
+  budgetdate
+  sort1
+  sort2
+  sort1_authcat
+  sort2_authcat
+  uncertainprice
+  claims_count
+  claimed_date
+  subscriptionid
+  parent_ordernumber
+  orderstatus
+  line_item_id
+  suppliers_reference_number
+  suppliers_reference_qualifier
+  suppliers_report
+  title
+  author
+  basketname
+  branchcode
+  publicationyear
+  copyrightdate
+  editionstatement
+  isbn
+  ean
+  seriestitle
+  publishercode
+  publisher
+  budget
+  supplier
+  supplierid
+  estimateddeliverydate
+  orderdate
+  quantity_to_receive
+  subtotal
+  latesince
+  cancellationreason
+);
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_order( \@expectedfields, $order_content[0],
+    GetOrder( $ordernumbers[0] ) );
+is(
+    $test_nbr_fields,
+    scalar @expectedfields,
+    "GetOrder gets an order with the right number of fields"
+);
+is( join( " ", @$test_missing_fields ),
+    '', "GetOrder gets an order with no missing fields" );
+is( join( " ", @$test_extra_fields ),
+    '', "GetOrder gets an order with no unexpected fields" );
+is( join( " ", @$test_different_fields ),
+    '', "GetOrder gets an order with the right content in every fields" );
 
 #
 # Test GetOrders
 #
 
-my @base_expectedfields  = qw(
-    ordernumber
-    ecost
-    uncertainprice
-    marc
-    cancelledby
-    url
-    isbn
-    copyrightdate
-    serial
-    cn_suffix
-    cn_item
-    marcxml
-    freight
-    cn_class
-    title
-    pages
-    budget_encumb
-    budget_name
-    number
-    itemtype
-    totalissues
-    author
-    budget_permission
-    parent_ordernumber
-    size
-    claims_count
-    currency
-    seriestitle
-    timestamp
-    editionstatement
-    budget_parent_id
-    publishercode
-    unitprice
-    collectionvolume
-    budget_amount
-    budget_owner_id
-    datecreated
-    claimed_date
-    subscriptionid
-    editionresponsibility
-    sort2
-    notes
-    volumedate
-    budget_id
-    illus
-    ean
-    biblioitemnumber
-    datereceived
-    orderstatus
-    supplierreference
-    agerestriction
-    budget_branchcode
-    gstrate
-    listprice
-    budget_code
-    budgetdate
-    basketno
-    discount
-    abstract
-    collectionissn
-    publicationyear
-    collectiontitle
-    invoiceid
-    budgetgroup_id
-    place
-    issn
-    quantityreceived
-    entrydate
-    cn_source
-    sort1_authcat
-    budget_notes
-    biblionumber
-    unititle
-    sort2_authcat
-    budget_expend
-    rrp
-    cn_sort
-    totalamount
-    lccn
-    sort1
-    volume
-    purchaseordernumber
-    quantity
-    budget_period_id
-    frameworkcode
-    volumedesc
-    datecancellationprinted
-    );
-@expectedfields = (@base_expectedfields, ('transferred_from_timestamp','transferred_from'));
-is(GetOrders(),undef,"GetOrders with no params returns undef");
-DelOrder ($order_content[3]->{str}->{biblionumber},$ordernumbers[3]);
+my @base_expectedfields = qw(
+  order_internalnote
+  order_vendornote
+  notes
+  ordernumber
+  ecost
+  uncertainprice
+  marc
+  url
+  isbn
+  copyrightdate
+  serial
+  cn_suffix
+  cn_item
+  marcxml
+  freight
+  cn_class
+  title
+  pages
+  budget_encumb
+  budget_name
+  number
+  itemtype
+  totalissues
+  author
+  budget_permission
+  parent_ordernumber
+  size
+  claims_count
+  currency
+  seriestitle
+  timestamp
+  editionstatement
+  budget_parent_id
+  publishercode
+  unitprice
+  collectionvolume
+  budget_amount
+  budget_owner_id
+  datecreated
+  claimed_date
+  subscriptionid
+  editionresponsibility
+  sort2
+  volumedate
+  budget_id
+  illus
+  ean
+  biblioitemnumber
+  datereceived
+  orderstatus
+  line_item_id
+  suppliers_reference_number
+  suppliers_reference_qualifier
+  suppliers_report
+  agerestriction
+  budget_branchcode
+  gstrate
+  listprice
+  budget_code
+  budgetdate
+  basketno
+  discount
+  abstract
+  collectionissn
+  publicationyear
+  collectiontitle
+  invoiceid
+  place
+  issn
+  quantityreceived
+  entrydate
+  cn_source
+  sort1_authcat
+  budget_notes
+  biblionumber
+  unititle
+  sort2_authcat
+  budget_expend
+  rrp
+  cn_sort
+  lccn
+  sort1
+  volume
+  purchaseordernumber
+  quantity
+  budget_period_id
+  frameworkcode
+  volumedesc
+  datecancellationprinted
+  cancellationreason
+);
+@expectedfields =
+  ( @base_expectedfields,
+    ( 'transferred_from_timestamp', 'transferred_from' ) );
+is( GetOrders(), undef, "GetOrders with no params returns undef" );
+DelOrder( $order_content[3]->{str}->{biblionumber}, $ordernumbers[3] );
 my @get_orders = GetOrders($basketno);
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_orders (\@expectedfields , \@order_content, \@get_orders);
-is($$test_nbr_fields [0],scalar @expectedfields , "GetOrders gets orders with the right number of fields" );
-is(join (" ",@$test_missing_fields),'', "GetOrders gets orders with no missing fields" );
-is(join (" ",@$test_extra_fields),'', "GetOrders gets orders with no unexpected fields" );
-is(join (" ",@$test_different_fields),'', "GetOrders gets orders with the right content in every fields" );
-ok(((scalar @get_orders == 4) and !grep ($_->{ordernumber} eq $ordernumbers[3], @get_orders)),"GetOrders only gets non-cancelled orders" );
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_orders( \@expectedfields, \@order_content, \@get_orders );
+is(
+    $$test_nbr_fields[0],
+    scalar @expectedfields,
+    "GetOrders gets orders with the right number of fields"
+);
+is( join( " ", @$test_missing_fields ),
+    '', "GetOrders gets orders with no missing fields" );
+is( join( " ", @$test_extra_fields ),
+    '', "GetOrders gets orders with no unexpected fields" );
+is( join( " ", @$test_different_fields ),
+    '', "GetOrders gets orders with the right content in every fields" );
+ok(
+    (
+        ( scalar @get_orders == 4 )
+          and !grep ( $_->{ordernumber} eq $ordernumbers[3], @get_orders )
+    ),
+    "GetOrders only gets non-cancelled orders"
+);
 
 #
-# Test GetCancelledOrders
+# Test GetOrders { cancelled => 1 }
 #
 
-@expectedfields = (@base_expectedfields, ('transferred_to_timestamp','transferred_to'));
-is(GetCancelledOrders(),undef,"GetCancelledOrders with no params returns undef");
-@get_orders = GetCancelledOrders($basketno);
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_orders (\@expectedfields , \@order_content, \@get_orders);
-is($$test_nbr_fields [0],scalar @expectedfields , "GetCancelledOrders gets orders with the right number of fields" );
-is(join (" ",@$test_missing_fields),'', "GetCancelledOrders gets orders with no missing fields" );
-is(join (" ",@$test_extra_fields),'', "GetCancelledOrders gets orders with no unexpected fields" );
-is(join (" ",@$test_different_fields),'', "GetCancelledOrders gets orders with the right content in every fields" );
-ok(((scalar @get_orders == 1) and grep ($_->{ordernumber} eq $ordernumbers[3], @get_orders)),"GetCancelledOrders only gets cancelled orders" );
+@expectedfields =
+  ( @base_expectedfields, ( 'transferred_to_timestamp', 'transferred_to' ) );
+@get_orders = GetOrders($basketno, { cancelled => 1 });
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_orders( \@expectedfields, \@order_content, \@get_orders );
+is(
+    $$test_nbr_fields[0],
+    scalar @expectedfields,
+    "GetOrders { cancelled => 1 } gets orders with the right number of fields"
+);
+is( join( " ", @$test_missing_fields ),
+    '', "GetOrders { cancelled => 1 } gets orders with no missing fields" );
+is( join( " ", @$test_extra_fields ),
+    '', "GetOrders { cancelled => 1 } gets orders with no unexpected fields" );
+is( join( " ", @$test_different_fields ),
+    '',
+    "GetOrders { cancelled => 1 } gets orders with the right content in every fields" );
+ok(
+    (
+        ( scalar @get_orders == 1 )
+          and grep ( $_->{ordernumber} eq $ordernumbers[3], @get_orders )
+    ),
+    "GetOrders { cancelled => 1 } only gets cancelled orders"
+);
 
 #
 # Test SearchOrders
 #
 
 @expectedfields = qw (
-                   basketgroupid
-                   basketgroupname
-                   firstname
-                   biblioitemnumber
-                   ecost
-                   uncertainprice
-                   creationdate
-                   datereceived
-                   orderstatus
-                   supplierreference
-                   cancelledby
-                   isbn
-                   copyrightdate
-                   gstrate
-                   serial
-                   listprice
-                   budgetdate
-                   basketno
-                   discount
-                   surname
-                   freight
-                   abstract
-                   title
-                   closedate
-                   basketname
-                   budgetgroup_id
-                   invoiceid
-                   author
-                   parent_ordernumber
-                   claims_count
-                   entrydate
-                   currency
-                   quantityreceived
-                   seriestitle
-                   sort1_authcat
-                   timestamp
-                   biblionumber
-                   unititle
-                   sort2_authcat
-                   rrp
-                   unitprice
-                   totalamount
-                   sort1
-                   ordernumber
-                   datecreated
-                   purchaseordernumber
-                   quantity
-                   claimed_date
-                   subscriptionid
-                   frameworkcode
-                   sort2
-                   notes
-                   datecancellationprinted
-                   budget_id
-    authorisedby
+  order_internalnote
+  order_vendornote
+  notes
+  basketgroupid
+  basketgroupname
+  firstname
+  biblioitemnumber
+  ecost
+  uncertainprice
+  creationdate
+  datereceived
+  orderstatus
+  line_item_id
+  suppliers_reference_number
+  suppliers_reference_qualifier
+  suppliers_report
+  isbn
+  copyrightdate
+  gstrate
+  serial
+  listprice
+  budgetdate
+  basketno
+  discount
+  surname
+  freight
+  abstract
+  title
+  closedate
+  basketname
+  invoiceid
+  author
+  parent_ordernumber
+  claims_count
+  entrydate
+  currency
+  quantityreceived
+  seriestitle
+  sort1_authcat
+  timestamp
+  biblionumber
+  unititle
+  sort2_authcat
+  rrp
+  unitprice
+  sort1
+  ordernumber
+  datecreated
+  purchaseordernumber
+  quantity
+  claimed_date
+  subscriptionid
+  frameworkcode
+  sort2
+  datecancellationprinted
+  budget_id
+  authorisedby
+  booksellerid
+  cancellationreason
 );
+
 # note that authorisedby was added to the return of SearchOrder by the
 # patch for bug 11777
 
 my $invoiceid = AddInvoice(
     invoicenumber => 'invoice',
-    booksellerid => $booksellerid,
-    unknown => "unknown"
+    booksellerid  => $booksellerid,
+    unknown       => "unknown"
 );
 
 my ($datereceived, $new_ordernumber) = ModReceiveOrder(
-    $biblionumber4,
-    $ordernumbers[4],
-    1,
-    undef,
-    10,
-    10,
-    $invoiceid,
-    10,
-    $order_content[4]->{str}->{budget_id}
-    );
+    {
+        biblionumber      => $biblionumber4,
+        ordernumber       => $ordernumbers[4],
+        quantityreceived  => 1,
+        cost              => 10,
+        ecost             => 10,
+        invoiceid         => $invoiceid,
+        rrp               => 10,
+        budget_id          => $order_content[4]->{str}->{budget_id},
+    }
+);
 
 my $search_orders = SearchOrders({
     booksellerid => $booksellerid,
-    basketno => $basketno
+    basketno     => $basketno
 });
 isa_ok( $search_orders, 'ARRAY' );
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_orders (\@expectedfields , \@order_content, $search_orders );
-is($$test_nbr_fields [0],scalar @expectedfields , "SearchOrders gets orders with the right number of fields" );
-is(join (" ",@$test_missing_fields),'', "SearchOrders gets orders with no missing fields" );
-is(join (" ",@$test_extra_fields),'', "SearchOrders gets orders with no unexpected fields" );
-is(join (" ",@$test_different_fields),'', "SearchOrders gets orders with the right content in every fields" );
-ok(((scalar @$search_orders == 4) and !grep ($_->{ordernumber} eq $ordernumbers[3], @$search_orders)),"SearchOrders only gets non-cancelled orders" );
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_orders( \@expectedfields, \@order_content,
+    $search_orders );
+is(
+    $$test_nbr_fields[0],
+    scalar @expectedfields,
+    "SearchOrders gets orders with the right number of fields"
+);
+is( join( " ", @$test_missing_fields ),
+    '', "SearchOrders gets orders with no missing fields" );
+is( join( " ", @$test_extra_fields ),
+    '', "SearchOrders gets orders with no unexpected fields" );
+is( join( " ", @$test_different_fields ),
+    '', "SearchOrders gets orders with the right content in every fields" );
+ok(
+    (
+        ( scalar @$search_orders == 4 )
+          and !grep ( $_->{ordernumber} eq $ordernumbers[3], @$search_orders )
+    ),
+    "SearchOrders only gets non-cancelled orders"
+);
+
+$search_orders = SearchOrders({
+    booksellerid => $booksellerid,
+    basketno     => $basketno,
+    pending      => 1
+});
+ok(
+    (
+        ( scalar @$search_orders == 3 ) and !grep ( (
+                     ( $_->{ordernumber} eq $ordernumbers[3] )
+                  or ( $_->{ordernumber} eq $ordernumbers[4] )
+            ),
+            @$search_orders )
+    ),
+    "SearchOrders with pending params gets only pending orders (bug 10723)"
+);
 
 $search_orders = SearchOrders({
     booksellerid => $booksellerid,
-    basketno => $basketno,
-    pending => 1
+    basketno     => $basketno,
+    pending      => 1,
+    ordered      => 1,
 });
-ok(((scalar @$search_orders == 3) and !grep ((($_->{ordernumber} eq $ordernumbers[3]) or ($_->{ordernumber} eq $ordernumbers[4])), @$search_orders)),"SearchOrders with pending params gets only pending orders" );
+is( scalar (@$search_orders), 0, "SearchOrders with pending and ordered params gets only pending ordered orders (bug 11170)" );
+
+$search_orders = SearchOrders({
+    ordernumber => $ordernumbers[4]
+});
+is( scalar (@$search_orders), 1, "SearchOrders takes into account the ordernumber filter" );
+
+$search_orders = SearchOrders({
+    biblionumber => $biblionumber4
+});
+is( scalar (@$search_orders), 1, "SearchOrders takes into account the biblionumber filter" );
+
+$search_orders = SearchOrders({
+    biblionumber => $biblionumber4,
+    pending      => 1
+});
+is( scalar (@$search_orders), 0, "SearchOrders takes into account the biblionumber and pending filters" );
 
 #
 # Test GetBudgetByOrderNumber
 #
-
-ok( GetBudgetByOrderNumber($ordernumbers[0])->{'budget_id'} eq $budgetid, "GetBudgetByOrderNumber returns expected budget" );
-
+ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid,
+    "GetBudgetByOrderNumber returns expected budget" );
 
 #
 # Test GetLateOrders
 #
 
 @expectedfields = qw (
-                   orderdate
-                   author
-                   budget
-                   supplierid
-                   claims_count
-                   supplier
-                   publisher
-                   ordernumber
-                   quantity
-                   basketno
-                   claimed_date
-                   branch
-                   estimateddeliverydate
-                   title
-                   publicationyear
-                   unitpricelib
-                   unitpricesupplier
-                   subtotal
-                   latesince
+  orderdate
+  author
+  budget
+  supplierid
+  claims_count
+  supplier
+  publisher
+  ordernumber
+  quantity
+  basketno
+  claimed_date
+  branch
+  estimateddeliverydate
+  title
+  publicationyear
+  unitpricelib
+  unitpricesupplier
+  subtotal
+  latesince
+  basketname
+  basketgroupid
+  basketgroupname
 );
 my @lateorders = GetLateOrders(0);
-is(scalar grep ($_->{basketno} eq $basketno, @lateorders),0, "GetLateOrders does not get orders from opened baskets" );
-C4::Acquisition::CloseBasket( $basketno );
+is( scalar grep ( $_->{basketno} eq $basketno, @lateorders ),
+    0, "GetLateOrders does not get orders from opened baskets" );
+C4::Acquisition::CloseBasket($basketno);
 @lateorders = GetLateOrders(0);
-isnt(scalar grep ($_->{basketno} eq $basketno, @lateorders),0, "GetLateOrders gets orders from closed baskets" );
-ok(!grep ($_->{ordernumber} eq $ordernumbers[3], @lateorders),"GetLateOrders does not gets cancelled orders" );
-ok(!grep ($_->{ordernumber} eq $ordernumbers[4], @lateorders),"GetLateOrders does not gets reveived orders" );
-($test_missing_fields,$test_extra_fields,$test_different_fields,$test_nbr_fields) = _check_fields_of_orders (\@expectedfields , \@order_content, \@lateorders );
-is($$test_nbr_fields [0],scalar @expectedfields , "GetLateOrders gets orders with the right number of fields" );
-is(join (" ",@$test_missing_fields),'', "GetLateOrders gets orders with no missing fields" );
-is(join (" ",@$test_extra_fields),'', "GetLateOrders gets orders with no unexpected fields" );
-is(join (" ",@$test_different_fields),'', "GetLateOrders gets orders with the right content in every fields" );
+isnt( scalar grep ( $_->{basketno} eq $basketno, @lateorders ),
+    0, "GetLateOrders gets orders from closed baskets" );
+ok( !grep ( $_->{ordernumber} eq $ordernumbers[3], @lateorders ),
+    "GetLateOrders does not gets cancelled orders" );
+ok( !grep ( $_->{ordernumber} eq $ordernumbers[4], @lateorders ),
+    "GetLateOrders does not gets reveived orders" );
+(
+    $test_missing_fields,   $test_extra_fields,
+    $test_different_fields, $test_nbr_fields
+  )
+  = _check_fields_of_orders( \@expectedfields, \@order_content, \@lateorders );
+is(
+    $$test_nbr_fields[0],
+    scalar @expectedfields,
+    "GetLateOrders gets orders with the right number of fields"
+);
+is( join( " ", @$test_missing_fields ),
+    '', "GetLateOrders gets orders with no missing fields" );
+is( join( " ", @$test_extra_fields ),
+    '', "GetLateOrders gets orders with no unexpected fields" );
+is( join( " ", @$test_different_fields ),
+    '', "GetLateOrders gets orders with the right content in every fields" );
+
+$search_orders = SearchOrders({
+    booksellerid => $booksellerid,
+    basketno     => $basketno,
+    pending      => 1,
+    ordered      => 1,
+});
+is( scalar (@$search_orders), 3, "SearchOrders with pending and ordered params gets only pending ordered orders. After closing the basket, orders are marked as 'ordered' (bug 11170)" );
 
 #
 # Test AddClaim
@@ -581,36 +807,49 @@ is(join (" ",@$test_different_fields),'', "GetLateOrders gets orders with the ri
 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" );
-
-my $firstorder = $search_orders->[0];
-
-# fake receiving the order
-ModOrder({
-    ordernumber      => $firstorder->{ordernumber},
-    biblionumber     => $firstorder->{biblionumber},
-    quantityreceived => $firstorder->{quantity},
-});
+is(
+    $neworder->{claimed_date},
+    strftime( "%Y-%m-%d", localtime(time) ),
+    "AddClaim : Check claimed_date"
+);
 
-($datereceived, $new_ordernumber) = ModReceiveOrder(
-    $biblionumber2,
-    $ordernumbers[1],
-    2,
-    undef,
-    12,
-    12,
-    $invoiceid,
-    42,
-    );
+( $datereceived, $new_ordernumber ) = ModReceiveOrder(
+    {
+        biblionumber     => $biblionumber2,
+        ordernumber      => $ordernumbers[1],
+        quantityreceived => 2,
+        cost             => 12,
+        ecost            => 12,
+        invoiceid        => $invoiceid,
+        rrp              => 42,
+        order_internalnote => "my notes",
+        order_vendornote   => "my vendor notes",
+    }
+);
 my $order2 = GetOrder( $ordernumbers[1] );
-is($order2->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
-is($order2->{'quantity'}, 40, '40 items on original order');
-is($order2->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
-
-$neworder = GetOrder( $new_ordernumber );
-is($neworder->{'quantity'}, 2, '2 items on new order');
-is($neworder->{'quantityreceived'}, 2, 'Splitting up order received items on new order');
-is($neworder->{'budget_id'}, $budgetid, 'Budget on new order is unchanged');
+is( $order2->{'quantityreceived'},
+    0, 'Splitting up order did not receive any on original order' );
+is( $order2->{'quantity'}, 40, '40 items on original order' );
+is( $order2->{'budget_id'}, $budgetid,
+    'Budget on original order is unchanged' );
+is( $order2->{order_internalnote}, "my notes",
+    'ModReceiveOrder and GetOrder deal with internal notes' );
+is( $order2->{order_vendornote}, "my vendor notes",
+    'ModReceiveOrder and GetOrder deal with vendor notes' );
+
+$neworder = GetOrder($new_ordernumber);
+is( $neworder->{'quantity'}, 2, '2 items on new order' );
+is( $neworder->{'quantityreceived'},
+    2, 'Splitting up order received items on new order' );
+is( $neworder->{'budget_id'}, $budgetid, 'Budget on new order is unchanged' );
+
+is( $neworder->{ordernumber}, $new_ordernumber, 'Split: test ordernumber' );
+is( $neworder->{parent_ordernumber}, $ordernumbers[1], 'Split: test parent_ordernumber' );
+
+my $orders = GetHistory( ordernumber => $ordernumbers[1] );
+is( scalar( @$orders ), 1, 'GetHistory with a given ordernumber returns 1 order' );
+$orders = GetHistory( ordernumber => $ordernumbers[1], search_children_too => 1 );
+is( scalar( @$orders ), 2, 'GetHistory with a given ordernumber and search_children_too set returns 2 orders' );
 
 my $budgetid2 = C4::Budgets::AddBudget(
     {
@@ -619,43 +858,94 @@ my $budgetid2 = C4::Budgets::AddBudget(
     }
 );
 
-($datereceived, $new_ordernumber) = ModReceiveOrder(
-    $biblionumber2,
-    $ordernumbers[2],
-    2,
-    undef,
-    12,
-    12,
-    $invoiceid,
-    42,
-    $budgetid2
-    );
+( $datereceived, $new_ordernumber ) = ModReceiveOrder(
+    {
+        biblionumber     => $biblionumber2,
+        ordernumber      => $ordernumbers[2],
+        quantityreceived => 2,
+        cost             => 12,
+        ecost            => 12,
+        invoiceid        => $invoiceid,
+        rrp              => 42,
+        budget_id        => $budgetid2,
+        order_internalnote => "my other notes",
+    }
+);
 
 my $order3 = GetOrder( $ordernumbers[2] );
-is($order3->{'quantityreceived'}, 0, 'Splitting up order did not receive any on original order');
-is($order3->{'quantity'}, 2, '2 items on original order');
-is($order3->{'budget_id'}, $budgetid, 'Budget on original order is unchanged');
-
-$neworder = GetOrder( $new_ordernumber );
-is($neworder->{'quantity'}, 2, '2 items on new order');
-is($neworder->{'quantityreceived'}, 2, 'Splitting up order received items on new order');
-is($neworder->{'budget_id'}, $budgetid2, 'Budget on new order is changed');
-
-($datereceived, $new_ordernumber) = ModReceiveOrder(
-    $biblionumber2,
-    $ordernumbers[2],
-    2,
-    undef,
-    12,
-    12,
-    $invoiceid,
-    42,
-    $budgetid2
-    );
+is( $order3->{'quantityreceived'},
+    0, 'Splitting up order did not receive any on original order' );
+is( $order3->{'quantity'}, 2, '2 items on original order' );
+is( $order3->{'budget_id'}, $budgetid,
+    'Budget on original order is unchanged' );
+is( $order3->{order_internalnote}, "my other notes",
+    'ModReceiveOrder and GetOrder deal with notes' );
+
+$neworder = GetOrder($new_ordernumber);
+is( $neworder->{'quantity'}, 2, '2 items on new order' );
+is( $neworder->{'quantityreceived'},
+    2, 'Splitting up order received items on new order' );
+is( $neworder->{'budget_id'}, $budgetid2, 'Budget on new order is changed' );
+
+( $datereceived, $new_ordernumber ) = ModReceiveOrder(
+    {
+        biblionumber     => $biblionumber2,
+        ordernumber      => $ordernumbers[2],
+        quantityreceived => 2,
+        cost             => 12,
+        ecost            => 12,
+        invoiceid        => $invoiceid,
+        rrp              => 42,
+        budget_id        => $budgetid2,
+        order_internalnote => "my third notes",
+    }
+);
 
 $order3 = GetOrder( $ordernumbers[2] );
-is($order3->{'quantityreceived'}, 2, 'Order not split up');
-is($order3->{'quantity'}, 2, '2 items on order');
-is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
-
-$dbh->rollback;
+is( $order3->{'quantityreceived'}, 2,          'Order not split up' );
+is( $order3->{'quantity'},         2,          '2 items on order' );
+is( $order3->{'budget_id'},        $budgetid2, 'Budget has changed' );
+is( $order3->{order_internalnote}, "my third notes", 'ModReceiveOrder and GetOrder deal with notes' );
+
+my $nonexistent_order = GetOrder();
+is( $nonexistent_order, undef, 'GetOrder returns undef if no ordernumber is given' );
+$nonexistent_order = GetOrder( 424242424242 );
+is( $nonexistent_order, undef, 'GetOrder returns undef if a nonexistent ordernumber is given' );
+
+# Tests for DelOrder
+my $order1 = GetOrder($ordernumbers[0]);
+my $error = DelOrder($order1->{biblionumber}, $order1->{ordernumber});
+ok((not defined $error), "DelOrder does not fail");
+$order1 = GetOrder($order1->{ordernumber});
+ok((defined $order1->{datecancellationprinted}), "order is cancelled");
+ok((not defined $order1->{cancellationreason}), "order has no cancellation reason");
+ok((defined GetBiblio($order1->{biblionumber})), "biblio still exists");
+
+$order2 = GetOrder($ordernumbers[1]);
+$error = DelOrder($order2->{biblionumber}, $order2->{ordernumber}, 1);
+ok((not defined $error), "DelOrder does not fail");
+$order2 = GetOrder($order2->{ordernumber});
+ok((defined $order2->{datecancellationprinted}), "order is cancelled");
+ok((not defined $order2->{cancellationreason}), "order has no cancellation reason");
+ok((not defined GetBiblio($order2->{biblionumber})), "biblio does not exist anymore");
+
+my $order4 = GetOrder($ordernumbers[3]);
+$error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
+ok((not defined $error), "DelOrder does not fail");
+$order4 = GetOrder($order4->{ordernumber});
+ok((defined $order4->{datecancellationprinted}), "order is cancelled");
+ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\"");
+ok((not defined GetBiblio($order4->{biblionumber})), "biblio does not exist anymore");
+# End of tests for DelOrder
+
+# Budget reports
+my $all_count = scalar GetBudgetsReport();
+ok($all_count >= 1, "GetBudgetReport OK");
+
+my $active_count = scalar GetBudgetsReport(1);
+ok($active_count >= 1 , "GetBudgetsReport(1) OK");
+
+is($all_count, scalar GetBudgetsReport(), "GetBudgetReport returns inactive budget period acquisitions.");
+ok($active_count >= scalar GetBudgetsReport(1), "GetBudgetReport doesn't return inactive budget period acquisitions.");
+
+$schema->storage->txn_rollback();