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

(-)a/circ/returns.pl (-8 / +7 lines)
Lines 417-423 if ( $messages->{'ResFound'}) { Link Here
417
    my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
417
    my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
418
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
418
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
419
    my $branchCheck = ( $userenv_branch eq $reserve->{branchcode} );
419
    my $branchCheck = ( $userenv_branch eq $reserve->{branchcode} );
420
    if ( ( $reserve->{'ResFound'} eq "Reserved" || $reserve->{'ResFound'} eq "Processing" || $reserve->{'ResFound'} eq "Transferred" ) && C4::Context->preference('HoldsAutoFill') ) {
420
    if ( $reserve->{'ResFound'} eq "Waiting" ) {
421
        $template->param(
422
            waiting      => $branchCheck ? 1 : undef,
423
        );
424
    } elsif ( C4::Context->preference('HoldsAutoFill') ) {
421
        my $item = Koha::Items->find( $itemnumber );
425
        my $item = Koha::Items->find( $itemnumber );
422
        my $biblio = $item->biblio;
426
        my $biblio = $item->biblio;
423
427
Lines 439-456 if ( $messages->{'ResFound'}) { Link Here
439
                diffbranch       => 1,
443
                diffbranch       => 1,
440
            );
444
            );
441
        }
445
        }
442
    } elsif ( $reserve->{'ResFound'} eq "Waiting" ) {
446
    } else {
443
        $template->param(
444
            waiting      => $branchCheck ? 1 : undef,
445
        );
446
    } elsif ( $reserve->{'ResFound'} eq "Reserved" || $reserve->{'ResFound'} eq "Processing" || $reserve->{'ResFound'} eq "Transferred" ) {
447
        $template->param(
447
        $template->param(
448
            intransit    => $branchCheck ? undef : 1,
448
            intransit    => $branchCheck ? undef : 1,
449
            transfertodo => $branchCheck ? undef : 1,
449
            transfertodo => $branchCheck ? undef : 1,
450
            reserve_id   => $reserve->{reserve_id},
450
            reserve_id   => $reserve->{reserve_id},
451
            reserved     => 1,
451
            reserved     => 1,
452
        );
452
        );
453
    } # else { ; }  # error?
453
    }
454
454
455
    # same params for Waiting or Reserved
455
    # same params for Waiting or Reserved
456
    $template->param(
456
    $template->param(
457
- 

Return to bug 28139