From e3f8bfba375fb48a94af799ec64d4c9f9de1103e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 21 Feb 2020 12:37:44 +0100 Subject: [PATCH] Bug 24413: Do not remove the restrictions from AddReturn As we are now removing them from MarkIssueReturned they should not be removed from AddReturn as well. Also I think this will fix a regression, if $doreturn is not set (in case the item is withdrawn and BlockReturnOfWithdrawnItems or the item is lost and BlockReturnOfLostItems, and other specific cases). --- C4/Circulation.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 796aa2ef21..15d6b06674 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2120,16 +2120,6 @@ sub AddReturn { if C4::Context->preference("ReturnLog"); } - # Remove any OVERDUES related debarment if the borrower has no overdues - if ( $borrowernumber - && $patron->debarred - && C4::Context->preference('AutoRemoveOverduesRestrictions') - && !Koha::Patrons->find( $borrowernumber )->has_overdues - && @{ GetDebarments({ borrowernumber => $borrowernumber, type => 'OVERDUES' }) } - ) { - DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' }); - } - # Transfer to returnbranch if Automatic transfer set or append message NeedsTransfer if (!$is_in_rotating_collection && ($doreturn or $messages->{'NotIssued'}) and !$resfound and ($branch ne $returnbranch) and not $messages->{'WrongTransfer'}){ my $BranchTransferLimitsType = C4::Context->preference("BranchTransferLimitsType") eq 'itemtype' ? 'effective_itemtype' : 'ccode'; -- 2.11.0