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

(-)a/C4/Reserves.pm (-4 / +7 lines)
Lines 843-848 sub CheckReserves { Link Here
843
                # See if this item is more important than what we've got so far
843
                # See if this item is more important than what we've got so far
844
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
844
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
845
                    $item ||= Koha::Items->find($itemnumber);
845
                    $item ||= Koha::Items->find($itemnumber);
846
                    next if $res->{volume_id} && $item->volume->id != $res->{volume_id};
846
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
847
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
847
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
848
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
848
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
849
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
Lines 1620-1626 sub _Findgroupreserve { Link Here
1620
               biblioitems.biblioitemnumber AS biblioitemnumber,
1621
               biblioitems.biblioitemnumber AS biblioitemnumber,
1621
               reserves.itemnumber          AS itemnumber,
1622
               reserves.itemnumber          AS itemnumber,
1622
               reserves.reserve_id          AS reserve_id,
1623
               reserves.reserve_id          AS reserve_id,
1623
               reserves.itemtype            AS itemtype
1624
               reserves.itemtype            AS itemtype,
1625
               reserves.volume_id           AS volume_id
1624
        FROM reserves
1626
        FROM reserves
1625
        JOIN biblioitems USING (biblionumber)
1627
        JOIN biblioitems USING (biblionumber)
1626
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
1628
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
Lines 1655-1661 sub _Findgroupreserve { Link Here
1655
               biblioitems.biblioitemnumber AS biblioitemnumber,
1657
               biblioitems.biblioitemnumber AS biblioitemnumber,
1656
               reserves.itemnumber          AS itemnumber,
1658
               reserves.itemnumber          AS itemnumber,
1657
               reserves.reserve_id          AS reserve_id,
1659
               reserves.reserve_id          AS reserve_id,
1658
               reserves.itemtype            AS itemtype
1660
               reserves.itemtype            AS itemtype,
1661
               reserves.volume_id           AS volume_id
1659
        FROM reserves
1662
        FROM reserves
1660
        JOIN biblioitems USING (biblionumber)
1663
        JOIN biblioitems USING (biblionumber)
1661
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
1664
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
Lines 1689-1695 sub _Findgroupreserve { Link Here
1689
               reserves.timestamp                  AS timestamp,
1692
               reserves.timestamp                  AS timestamp,
1690
               reserves.itemnumber                 AS itemnumber,
1693
               reserves.itemnumber                 AS itemnumber,
1691
               reserves.reserve_id                 AS reserve_id,
1694
               reserves.reserve_id                 AS reserve_id,
1692
               reserves.itemtype                   AS itemtype
1695
               reserves.itemtype                   AS itemtype,
1696
               reserves.volume_id                  AS volume_id
1693
        FROM reserves
1697
        FROM reserves
1694
        WHERE reserves.biblionumber = ?
1698
        WHERE reserves.biblionumber = ?
1695
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1699
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1696
- 

Return to bug 24860