@@ -, +, @@ --- C4/Circulation.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -2074,6 +2074,7 @@ sub AddReturn { } } + my $show_checkin_message = 0; # fix up the overdues in accounts... if ($borrowernumber) { my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox); @@ -2088,8 +2089,15 @@ sub AddReturn { } else { $messages->{'Debarred'} = $debardate if $debardate; } + if (!$debardate && $borrower->{debarred}) { + $show_checkin_message = 1; + } # there's no overdue on the item but borrower had been previously debarred } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) { + $show_checkin_message = 1; + } + + if ($show_checkin_message) { if ( $borrower->{debarred} eq "9999-12-31") { $messages->{'ForeverDebarred'} = $borrower->{'debarred'}; } else { @@ -2099,7 +2107,7 @@ sub AddReturn { if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) { $messages->{'PrevDebarred'} = $borrower->{'debarred'}; } - } + } } } --