@@ -, +, @@ returns.pl - Hold found and waiting - Hold found but not waiting AND whether HoldsAutoFill is enabled - Hold found but not waiting AND whether HoldsAutoFill disabled 1. Apply patch 2. Make sure HoldsAutoFill is disabled 3. Make item-level hold on branch A 4. Check-in the item at branch A and you should get pop-up confirming the hold, ignore it 5. Set HoldsAutoFill is enabled 4. Check-in the item again and you now the hold should have been automatically filled --- circ/returns.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/circ/returns.pl +++ a/circ/returns.pl @@ -417,7 +417,11 @@ if ( $messages->{'ResFound'}) { my $patron = Koha::Patrons->find( $reserve->{borrowernumber} ); my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } ); my $branchCheck = ( $userenv_branch eq $reserve->{branchcode} ); - if ( ( $reserve->{'ResFound'} eq "Reserved" || $reserve->{'ResFound'} eq "Processing" || $reserve->{'ResFound'} eq "Transferred" ) && C4::Context->preference('HoldsAutoFill') ) { + if ( $reserve->{'ResFound'} eq "Waiting" ) { + $template->param( + waiting => $branchCheck ? 1 : undef, + ); + } elsif ( C4::Context->preference('HoldsAutoFill') ) { my $item = Koha::Items->find( $itemnumber ); my $biblio = $item->biblio; @@ -439,18 +443,14 @@ if ( $messages->{'ResFound'}) { diffbranch => 1, ); } - } elsif ( $reserve->{'ResFound'} eq "Waiting" ) { - $template->param( - waiting => $branchCheck ? 1 : undef, - ); - } elsif ( $reserve->{'ResFound'} eq "Reserved" || $reserve->{'ResFound'} eq "Processing" || $reserve->{'ResFound'} eq "Transferred" ) { + } else { $template->param( intransit => $branchCheck ? undef : 1, transfertodo => $branchCheck ? undef : 1, reserve_id => $reserve->{reserve_id}, reserved => 1, ); - } # else { ; } # error? + } # same params for Waiting or Reserved $template->param( --