View | Details | Raw Unified | Return to bug 15184
Collapse All | Expand All

(-)a/C4/Acquisition.pm (+5 lines)
Lines 2282-2287 sub GetHistory { Link Here
2282
    my $ordernumber = $params{ordernumber};
2282
    my $ordernumber = $params{ordernumber};
2283
    my $search_children_too = $params{search_children_too} || 0;
2283
    my $search_children_too = $params{search_children_too} || 0;
2284
    my $created_by = $params{created_by} || [];
2284
    my $created_by = $params{created_by} || [];
2285
    my $ordernumbers = $params{ordernumbers} || [];
2285
2286
2286
    my @order_loop;
2287
    my @order_loop;
2287
    my $total_qty         = 0;
2288
    my $total_qty         = 0;
Lines 2442-2447 sub GetHistory { Link Here
2442
        push @query_params, @$created_by;
2443
        push @query_params, @$created_by;
2443
    }
2444
    }
2444
2445
2446
    if ( @$ordernumbers ) {
2447
        $query .= ' AND (aqorders.ordernumber IN ( ' . join (',', ('?') x @$ordernumbers ) . '))';
2448
        push @query_params, @$ordernumbers;
2449
    }
2445
2450
2446
    if ( C4::Context->preference("IndependentBranches") ) {
2451
    if ( C4::Context->preference("IndependentBranches") ) {
2447
        unless ( C4::Context->IsSuperLibrarian() ) {
2452
        unless ( C4::Context->IsSuperLibrarian() ) {
(-)a/t/db_dependent/Acquisition.t (-2 / +6 lines)
Lines 19-25 use Modern::Perl; Link Here
19
19
20
use POSIX qw(strftime);
20
use POSIX qw(strftime);
21
21
22
use Test::More tests => 68;
22
use Test::More tests => 70;
23
use t::lib::Mocks;
23
use t::lib::Mocks;
24
use Koha::Database;
24
use Koha::Database;
25
25
Lines 437-442 my $orders = GetHistory( ordernumber => $ordernumbers[1] ); Link Here
437
is( scalar( @$orders ), 1, 'GetHistory with a given ordernumber returns 1 order' );
437
is( scalar( @$orders ), 1, 'GetHistory with a given ordernumber returns 1 order' );
438
$orders = GetHistory( ordernumber => $ordernumbers[1], search_children_too => 1 );
438
$orders = GetHistory( ordernumber => $ordernumbers[1], search_children_too => 1 );
439
is( scalar( @$orders ), 2, 'GetHistory with a given ordernumber and search_children_too set returns 2 orders' );
439
is( scalar( @$orders ), 2, 'GetHistory with a given ordernumber and search_children_too set returns 2 orders' );
440
$orders = GetHistory( ordernumbers => [$ordernumbers[1]] );
441
is( scalar( @$orders ), 1, 'GetHistory with a given ordernumbers returns 1 order' );
442
$orders = GetHistory( ordernumbers => \@ordernumbers );
443
is( scalar( @$orders ), scalar( @ordernumbers ) - 1, 'GetHistory with a list of ordernumbers returns N-1 orders (was has been deleted [3])' );
444
440
445
441
# Test GetHistory() with and without SearchWithISBNVariations
446
# Test GetHistory() with and without SearchWithISBNVariations
442
# The ISBN passed as a param is the ISBN-10 version of the 13-digit ISBN in the sample record declared in $marcxml
447
# The ISBN passed as a param is the ISBN-10 version of the 13-digit ISBN in the sample record declared in $marcxml
443
- 

Return to bug 15184