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

(-)a/circ/returns.pl (-6 / +5 lines)
Lines 417-428 if ( $messages->{'ResFound'}) { Link Here
417
    my $reserve    = $messages->{'ResFound'};
417
    my $reserve    = $messages->{'ResFound'};
418
    my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
418
    my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
419
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
419
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
420
420
    my $branchCheck = ( $userenv_branch eq $reserve->{branchcode} );
421
    if ( $reserve->{'ResFound'} eq "Reserved" && C4::Context->preference('HoldsAutoFill') ) {
421
    if ( $reserve->{'ResFound'} eq "Reserved" && C4::Context->preference('HoldsAutoFill') ) {
422
        my $item = Koha::Items->find( $itemnumber );
422
        my $item = Koha::Items->find( $itemnumber );
423
        my $biblio = $item->biblio;
423
        my $biblio = $item->biblio;
424
424
425
        my $diffBranchSend = ($userenv_branch ne $reserve->{branchcode}) ? $reserve->{branchcode} : undef;
425
        my $diffBranchSend = !$branchCheck ? $reserve->{branchcode} : undef;
426
        ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id} );
426
        ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id} );
427
        my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
427
        my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
428
428
Lines 449-460 if ( $messages->{'ResFound'}) { Link Here
449
    elsif ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
449
    elsif ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
450
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
450
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
451
            $template->param(
451
            $template->param(
452
                waiting      => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ),
452
                waiting      => $branchCheck ? 1 : undef,
453
            );
453
            );
454
        } elsif ( $reserve->{'ResFound'} eq "Reserved" ) {
454
        } elsif ( $reserve->{'ResFound'} eq "Reserved" ) {
455
            $template->param(
455
            $template->param(
456
                intransit    => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
456
                intransit    => $branchCheck ? undef : 1,
457
                transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
457
                transfertodo => $branchCheck ? undef : 1,
458
                reserve_id   => $reserve->{reserve_id},
458
                reserve_id   => $reserve->{reserve_id},
459
                reserved     => 1,
459
                reserved     => 1,
460
            );
460
            );
461
- 

Return to bug 21346