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

(-)a/circ/returns.pl (+10 lines)
Lines 162-170 if ( $query->param('reserve_id') && $op eq 'cud-affect_reserve') { Link Here
162
        } # FIXME else?
162
        } # FIXME else?
163
    } else {
163
    } else {
164
        my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
164
        my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
165
165
        # diffBranchSend tells ModReserveAffect whether document is expected in this library or not,
166
        # diffBranchSend tells ModReserveAffect whether document is expected in this library or not,
166
        # i.e., whether to apply waiting status
167
        # i.e., whether to apply waiting status
167
        ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id, $desk_id );
168
        ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id, $desk_id );
169
170
        if ($diffBranchSend) {
171
            ModItemTransfer( $itemnumber, $item->holdingbranch, $diffBranchSend, 'Reserve' );
172
        }
168
    }
173
    }
169
#   check if we have other reserves for this document, if we have a return send the message of transfer
174
#   check if we have other reserves for this document, if we have a return send the message of transfer
170
    my ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
175
    my ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
Lines 587-592 if ( $messages->{'ResFound'} ) { Link Here
587
592
588
        my $diffBranchSend = !$branchCheck ? $reserve->{branchcode} : undef;
593
        my $diffBranchSend = !$branchCheck ? $reserve->{branchcode} : undef;
589
        ModReserveAffect( $itemnumber, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id}, $desk_id );
594
        ModReserveAffect( $itemnumber, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id}, $desk_id );
595
596
        if ($diffBranchSend) {
597
            ModItemTransfer( $itemnumber, $item->holdingbranch, $reserve->{branchcode}, 'Reserve' );
598
        }
599
590
        my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
600
        my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
591
601
592
        $template->param(
602
        $template->param(
(-)a/t/db_dependent/Circulation.t (-3 / +2 lines)
Lines 5918-5925 subtest 'Checkout should correctly terminate a transfer' => sub { Link Here
5918
    ModItemTransfer( $item->itemnumber, $library_1->branchcode,
5918
    ModItemTransfer( $item->itemnumber, $library_1->branchcode,
5919
        $library_2->branchcode, 'Manual' );
5919
        $library_2->branchcode, 'Manual' );
5920
    ModReserveAffect( $item->itemnumber, undef, $do_transfer, $reserve_id );
5920
    ModReserveAffect( $item->itemnumber, undef, $do_transfer, $reserve_id );
5921
    GetOtherReserves( $item->itemnumber )
5921
    ModItemTransfer( $item->itemnumber, $library_1->branchcode,
5922
      ;    # To put the Reason, it's what does returns.pl...
5922
        $library_2->branchcode, 'Reserve' );    # To put the Reason, it's what does returns.pl...
5923
    my $hold = Koha::Holds->find($reserve_id);
5923
    my $hold = Koha::Holds->find($reserve_id);
5924
    is( $hold->found, 'T', 'Hold is in transit' );
5924
    is( $hold->found, 'T', 'Hold is in transit' );
5925
    my $transfer = $item->get_transfer;
5925
    my $transfer = $item->get_transfer;
5926
- 

Return to bug 34972