From cf9d0e651b0b7686a25602336b8d3060388de0e9 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 14 Aug 2020 11:30:12 +0000 Subject: [PATCH] Bug 26078: (follow-up) Use a boolean rather than changing returnbranch Bug 26078: (follow-up) used validTransfer instead of checking WrongTransfer message Signed-off-by: Jonathan Druart (cherry picked from commit d8f3e0ec0dbaf73075299a88a254334cfaf1d29e) Signed-off-by: Lucas Gass (cherry picked from commit 0b444c4bc0f3a677acfc2423b19a04ddea8b9dff) Signed-off-by: Aleisha Amohia --- C4/Circulation.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 7ff18f078b..0eaf6f3a7a 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1849,7 +1849,7 @@ sub AddReturn { my $messages; my $patron; my $doreturn = 1; - my $validTransfert = 0; + my $validTransfer = 1; my $stat_type = 'return'; # get information on item @@ -1996,19 +1996,18 @@ sub AddReturn { # if we have a transfer to do, we update the line of transfers with the datearrived my $is_in_rotating_collection = C4::RotatingCollections::isItemInAnyCollection( $item->itemnumber ); if ($datesent) { + # At this point we will either fill the transfer or it is a wrong transfer + # either way we should not now generate a new transfer + $validTransfer = 0; if ( $tobranch eq $branch ) { my $sth = C4::Context->dbh->prepare( "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL" ); $sth->execute( $item->itemnumber ); - - # If we are completing a transfer we should not generate a new transfer from return policy - $returnbranch = $branch; } else { $messages->{'WrongTransfer'} = $tobranch; $messages->{'WrongTransferItem'} = $item->itemnumber; } - $validTransfert = 1; } # fix up the accounts..... @@ -2118,7 +2117,7 @@ sub AddReturn { } # 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'}){ + if ($validTransfer && !$is_in_rotating_collection && ($doreturn or $messages->{'NotIssued'}) and !$resfound and ($branch ne $returnbranch) ){ my $BranchTransferLimitsType = C4::Context->preference("BranchTransferLimitsType") eq 'itemtype' ? 'effective_itemtype' : 'ccode'; if (C4::Context->preference("AutomaticItemReturn" ) or (C4::Context->preference("UseBranchTransferLimits") and -- 2.39.5