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

(-)a/C4/Reserves.pm (-4 / +7 lines)
Lines 849-854 sub CheckReserves { Link Here
849
                # See if this item is more important than what we've got so far
849
                # See if this item is more important than what we've got so far
850
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
850
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
851
                    $item ||= Koha::Items->find($itemnumber);
851
                    $item ||= Koha::Items->find($itemnumber);
852
                    next if $res->{volume_id} && ( !$item->volume || $item->volume->id != $res->{volume_id} );
852
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
853
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
853
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
854
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
854
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
855
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
Lines 1641-1647 sub _Findgroupreserve { Link Here
1641
               biblioitems.biblioitemnumber AS biblioitemnumber,
1642
               biblioitems.biblioitemnumber AS biblioitemnumber,
1642
               reserves.itemnumber          AS itemnumber,
1643
               reserves.itemnumber          AS itemnumber,
1643
               reserves.reserve_id          AS reserve_id,
1644
               reserves.reserve_id          AS reserve_id,
1644
               reserves.itemtype            AS itemtype
1645
               reserves.itemtype            AS itemtype,
1646
               reserves.volume_id           AS volume_id
1645
        FROM reserves
1647
        FROM reserves
1646
        JOIN biblioitems USING (biblionumber)
1648
        JOIN biblioitems USING (biblionumber)
1647
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
1649
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
Lines 1676-1682 sub _Findgroupreserve { Link Here
1676
               biblioitems.biblioitemnumber AS biblioitemnumber,
1678
               biblioitems.biblioitemnumber AS biblioitemnumber,
1677
               reserves.itemnumber          AS itemnumber,
1679
               reserves.itemnumber          AS itemnumber,
1678
               reserves.reserve_id          AS reserve_id,
1680
               reserves.reserve_id          AS reserve_id,
1679
               reserves.itemtype            AS itemtype
1681
               reserves.itemtype            AS itemtype,
1682
               reserves.volume_id           AS volume_id
1680
        FROM reserves
1683
        FROM reserves
1681
        JOIN biblioitems USING (biblionumber)
1684
        JOIN biblioitems USING (biblionumber)
1682
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
1685
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
Lines 1710-1716 sub _Findgroupreserve { Link Here
1710
               reserves.timestamp                  AS timestamp,
1713
               reserves.timestamp                  AS timestamp,
1711
               reserves.itemnumber                 AS itemnumber,
1714
               reserves.itemnumber                 AS itemnumber,
1712
               reserves.reserve_id                 AS reserve_id,
1715
               reserves.reserve_id                 AS reserve_id,
1713
               reserves.itemtype                   AS itemtype
1716
               reserves.itemtype                   AS itemtype,
1717
               reserves.volume_id                  AS volume_id
1714
        FROM reserves
1718
        FROM reserves
1715
        WHERE reserves.biblionumber = ?
1719
        WHERE reserves.biblionumber = ?
1716
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1720
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1717
- 

Return to bug 24860