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

(-)a/C4/Reserves.pm (-4 / +7 lines)
Lines 859-864 sub CheckReserves { Link Here
859
                # See if this item is more important than what we've got so far
859
                # See if this item is more important than what we've got so far
860
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
860
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
861
                    $item ||= Koha::Items->find($itemnumber);
861
                    $item ||= Koha::Items->find($itemnumber);
862
                    next if $res->{volume_id} && ( !$item->volume || $item->volume->id != $res->{volume_id} );
862
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
863
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
863
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
864
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
864
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
865
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
Lines 1651-1657 sub _Findgroupreserve { Link Here
1651
               biblioitems.biblioitemnumber AS biblioitemnumber,
1652
               biblioitems.biblioitemnumber AS biblioitemnumber,
1652
               reserves.itemnumber          AS itemnumber,
1653
               reserves.itemnumber          AS itemnumber,
1653
               reserves.reserve_id          AS reserve_id,
1654
               reserves.reserve_id          AS reserve_id,
1654
               reserves.itemtype            AS itemtype
1655
               reserves.itemtype            AS itemtype,
1656
               reserves.volume_id           AS volume_id
1655
        FROM reserves
1657
        FROM reserves
1656
        JOIN biblioitems USING (biblionumber)
1658
        JOIN biblioitems USING (biblionumber)
1657
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
1659
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
Lines 1686-1692 sub _Findgroupreserve { Link Here
1686
               biblioitems.biblioitemnumber AS biblioitemnumber,
1688
               biblioitems.biblioitemnumber AS biblioitemnumber,
1687
               reserves.itemnumber          AS itemnumber,
1689
               reserves.itemnumber          AS itemnumber,
1688
               reserves.reserve_id          AS reserve_id,
1690
               reserves.reserve_id          AS reserve_id,
1689
               reserves.itemtype            AS itemtype
1691
               reserves.itemtype            AS itemtype,
1692
               reserves.volume_id           AS volume_id
1690
        FROM reserves
1693
        FROM reserves
1691
        JOIN biblioitems USING (biblionumber)
1694
        JOIN biblioitems USING (biblionumber)
1692
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
1695
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
Lines 1720-1726 sub _Findgroupreserve { Link Here
1720
               reserves.timestamp                  AS timestamp,
1723
               reserves.timestamp                  AS timestamp,
1721
               reserves.itemnumber                 AS itemnumber,
1724
               reserves.itemnumber                 AS itemnumber,
1722
               reserves.reserve_id                 AS reserve_id,
1725
               reserves.reserve_id                 AS reserve_id,
1723
               reserves.itemtype                   AS itemtype
1726
               reserves.itemtype                   AS itemtype,
1727
               reserves.volume_id                  AS volume_id
1724
        FROM reserves
1728
        FROM reserves
1725
        WHERE reserves.biblionumber = ?
1729
        WHERE reserves.biblionumber = ?
1726
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1730
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1727
- 

Return to bug 24860