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

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

Return to bug 21346