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

(-)a/C4/Reserves.pm (-7 / +11 lines)
Lines 1127-1135 sub ModReserveFill { Link Here
1127
        if C4::Context->preference('HoldsLog');
1127
        if C4::Context->preference('HoldsLog');
1128
1128
1129
    # if this hold was part of a group, cancel other holds in the group
1129
    # if this hold was part of a group, cancel other holds in the group
1130
    my @holds = Koha::Holds->search({ hold_group_id => $hold->hold_group_id });
1130
    if ( $hold->hold_group_id ) {
1131
    foreach my $h ( @holds ) {
1131
        my @holds = Koha::Holds->search({ hold_group_id => $hold->hold_group_id });
1132
        $h->cancel unless $h->reserve_id == $hold->reserve_id;
1132
        foreach my $h ( @holds ) {
1133
            $h->cancel unless $h->reserve_id == $hold->reserve_id;
1134
        }
1133
    }
1135
    }
1134
1136
1135
    # FIXME Must call Koha::Hold->cancel ? => No, should call ->filled and add the correct log
1137
    # FIXME Must call Koha::Hold->cancel ? => No, should call ->filled and add the correct log
Lines 1240-1249 sub ModReserveAffect { Link Here
1240
        $transfer->receive if $transfer;
1242
        $transfer->receive if $transfer;
1241
1243
1242
        # if this hold was part of a group, cancel other holds in the group
1244
        # if this hold was part of a group, cancel other holds in the group
1243
        my @holds = Koha::Holds->search({ hold_group_id => $hold->hold_group_id });
1245
        if ( $hold->hold_group_id ) {
1244
        foreach my $h ( @holds ) {
1246
            my @holds = Koha::Holds->search({ hold_group_id => $hold->hold_group_id });
1245
            push @reserve_ids, $h->reserve_id;
1247
            foreach my $h ( @holds ) {
1246
            $h->cancel unless $h->reserve_id == $hold->reserve_id;
1248
                push @reserve_ids, $h->reserve_id;
1249
                $h->cancel unless $h->reserve_id == $hold->reserve_id;
1250
            }
1247
        }
1251
        }
1248
    }
1252
    }
1249
1253
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-3 / +2 lines)
Lines 177-185 Link Here
177
                [%- IF hold.non_priority -%]
177
                [%- IF hold.non_priority -%]
178
                    <br><i>Non priority hold</i>
178
                    <br><i>Non priority hold</i>
179
                [%- END -%]
179
                [%- END -%]
180
                [% IF hold.hold_group_id %]
180
                [%- IF hold.hold_group_id -%]
181
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
181
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
182
                [% END %]
182
                [%- END -%]
183
            </td>
183
            </td>
184
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
184
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
185
            [%- UNLESS hold.found -%]
185
            [%- UNLESS hold.found -%]
186
- 

Return to bug 15516