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

(-)a/C4/Acquisition.pm (-2 / +10 lines)
Lines 1677-1682 sub SearchOrders { Link Here
1677
            LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
1677
            LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
1678
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
1678
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
1679
            LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
1679
            LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
1680
    };
1681
1682
    # If we search on ordernumber, we retrieve the transfered order is a transfer has been done.
1683
    $query .= q{
1684
            LEFT JOIN aqorders_transfers ON aqorders_transfers.ordernumber_to = aqorders.ordernumber
1685
    } if $ordernumber;
1686
1687
    $query .= q{
1680
        WHERE (datecancellationprinted is NULL)
1688
        WHERE (datecancellationprinted is NULL)
1681
    };
1689
    };
1682
1690
Lines 1698-1705 sub SearchOrders { Link Here
1698
    }
1706
    }
1699
1707
1700
    if ( $ordernumber ) {
1708
    if ( $ordernumber ) {
1701
        $query .= ' AND (aqorders.ordernumber=?)';
1709
        $query .= ' AND ( aqorders.ordernumber = ? OR aqorders_transfers.ordernumber_from = ? ) ';
1702
        push @args, $ordernumber;
1710
        push @args, ( $ordernumber, $ordernumber );
1703
    }
1711
    }
1704
    if( $search ) {
1712
    if( $search ) {
1705
        $query .= ' AND (biblio.title LIKE ? OR biblio.author LIKE ? OR biblioitems.isbn LIKE ?)';
1713
        $query .= ' AND (biblio.title LIKE ? OR biblio.author LIKE ? OR biblioitems.isbn LIKE ?)';
(-)a/t/db_dependent/Acquisition/TransferOrder.t (-2 / +8 lines)
Lines 2-8 Link Here
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
5
use Test::More tests => 8;
5
use Test::More tests => 11;
6
use C4::Context;
6
use C4::Context;
7
use C4::Acquisition;
7
use C4::Acquisition;
8
use C4::Biblio;
8
use C4::Biblio;
Lines 78-83 is(scalar GetOrders($basketno2), 1, "1 order in basket2"); Link Here
78
($order) = GetOrders($basketno2);
78
($order) = GetOrders($basketno2);
79
is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket2's order");
79
is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket2's order");
80
80
81
# Bug 11552
82
my $orders = SearchOrders({ ordernumber => $newordernumber });
83
is ( scalar( @$orders ), 1, 'SearchOrders returns 1 order with newordernumber' );
84
$orders = SearchOrders({ ordernumber => $ordernumber });
85
is ( scalar( @$orders ), 1, 'SearchOrders returns 1 order with [old]ordernumber' );
86
is ( $orders->[0]->{ordernumber}, $newordernumber, 'SearchOrders returns newordernumber if [old]ordernumber is given' );
87
81
ModReceiveOrder( $biblionumber, $newordernumber, 2, undef, undef, undef, undef, undef, undef, dt_from_string );
88
ModReceiveOrder( $biblionumber, $newordernumber, 2, undef, undef, undef, undef, undef, undef, dt_from_string );
82
CancelReceipt( $newordernumber );
89
CancelReceipt( $newordernumber );
83
$order = GetOrder( $newordernumber );
90
$order = GetOrder( $newordernumber );
84
- 

Return to bug 11552