@@ -, +, @@ --- C4/Circulation.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -2039,8 +2039,18 @@ sub AddReturn { $item->holdingbranch($branch)->store; } + my $item_was_lost = $item->itemlost; my $leave_item_lost = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0; - ModDateLastSeen( $item->itemnumber, $leave_item_lost ); + ModDateLastSeen( $item->itemnumber, $leave_item_lost ); # will unset itemlost if needed + + # fix up the accounts..... + if ( $item_was_lost ) { + $messages->{'WasLost'} = 1; + unless ( C4::Context->preference("BlockReturnOfLostItems") ) { + #my $refunded = Koha::Account::Lines->search{(itemnumber => $item->itemnumber, type => 'LOST_FOUND', # FIXME which other parameters to know it has been refunded? + $messages->{'LostItemFeeRefunded'} = 1; + } + } # check if we have a transfer for this document my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->itemnumber ); @@ -2060,14 +2070,6 @@ sub AddReturn { $validTransfert = 1; } - # fix up the accounts..... - if ( $item->itemlost ) { - $messages->{'WasLost'} = 1; - unless ( C4::Context->preference("BlockReturnOfLostItems") ) { - $messages->{'LostItemFeeRefunded'} = $refunded; - } - } - # fix up the overdues in accounts... if ($borrowernumber) { my $fix = _FixOverduesOnReturn( $borrowernumber, $item->itemnumber, $exemptfine, 'RETURNED' ); --