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

(-)a/C4/Reserves.pm (-4 / +7 lines)
Lines 820-825 sub CheckReserves { Link Here
820
                # See if this item is more important than what we've got so far
820
                # See if this item is more important than what we've got so far
821
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
821
                if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
822
                    $item ||= Koha::Items->find($itemnumber);
822
                    $item ||= Koha::Items->find($itemnumber);
823
                    next if $res->{volume_id} && $item->volume->id != $res->{volume_id};
823
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
824
                    next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
824
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
825
                    $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
825
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
826
                    my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
Lines 1592-1598 sub _Findgroupreserve { Link Here
1592
               biblioitems.biblioitemnumber AS biblioitemnumber,
1593
               biblioitems.biblioitemnumber AS biblioitemnumber,
1593
               reserves.itemnumber          AS itemnumber,
1594
               reserves.itemnumber          AS itemnumber,
1594
               reserves.reserve_id          AS reserve_id,
1595
               reserves.reserve_id          AS reserve_id,
1595
               reserves.itemtype            AS itemtype
1596
               reserves.itemtype            AS itemtype,
1597
               reserves.volume_id           AS volume_id
1596
        FROM reserves
1598
        FROM reserves
1597
        JOIN biblioitems USING (biblionumber)
1599
        JOIN biblioitems USING (biblionumber)
1598
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
1600
        JOIN hold_fill_targets USING (biblionumber, borrowernumber, itemnumber)
Lines 1627-1633 sub _Findgroupreserve { Link Here
1627
               biblioitems.biblioitemnumber AS biblioitemnumber,
1629
               biblioitems.biblioitemnumber AS biblioitemnumber,
1628
               reserves.itemnumber          AS itemnumber,
1630
               reserves.itemnumber          AS itemnumber,
1629
               reserves.reserve_id          AS reserve_id,
1631
               reserves.reserve_id          AS reserve_id,
1630
               reserves.itemtype            AS itemtype
1632
               reserves.itemtype            AS itemtype,
1633
               reserves.volume_id           AS volume_id
1631
        FROM reserves
1634
        FROM reserves
1632
        JOIN biblioitems USING (biblionumber)
1635
        JOIN biblioitems USING (biblionumber)
1633
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
1636
        JOIN hold_fill_targets USING (biblionumber, borrowernumber)
Lines 1661-1667 sub _Findgroupreserve { Link Here
1661
               reserves.timestamp                  AS timestamp,
1664
               reserves.timestamp                  AS timestamp,
1662
               reserves.itemnumber                 AS itemnumber,
1665
               reserves.itemnumber                 AS itemnumber,
1663
               reserves.reserve_id                 AS reserve_id,
1666
               reserves.reserve_id                 AS reserve_id,
1664
               reserves.itemtype                   AS itemtype
1667
               reserves.itemtype                   AS itemtype,
1668
               reserves.volume_id                  AS volume_id
1665
        FROM reserves
1669
        FROM reserves
1666
        WHERE reserves.biblionumber = ?
1670
        WHERE reserves.biblionumber = ?
1667
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1671
          AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
1668
- 

Return to bug 24860