From e7001d2fce1a0c9f884d5e0b95a301728dd09eeb Mon Sep 17 00:00:00 2001 From: ruth@bywatersolutions.com Date: Wed, 30 Mar 2011 10:32:00 -0400 Subject: [PATCH] [Signed Off] Bug 6004/3270: Sending things "home" Content-Type: text/plain; charset="utf-8" This patch addresses two problems: Bug 6004: If an item is returned at other than its' home library, and there is a hold for it--at any library other than the return library--two prompts come up: one telling the user to send the item home, and the other, to confirm and transfer for the hold. Only the latter should be displayed. Bug 3270: Cancelling a hold request after transfer initiated orphans item. Signed-off-by: Liz Rea --- C4/Circulation.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index dad54e3..edcdd39 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1669,7 +1669,7 @@ sub AddReturn { #adding message if holdingbranch is non equal a userenv branch to return the document to homebranch #we check, if we don't have reserv or transfert for this document, if not, return it to homebranch . - if ($doreturn and ($branch ne $hbr) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) ){ + if (($doreturn or $messages->{'NotIssued'}) and !$resfound and ($branch ne $hbr) and not $messages->{'WrongTransfer'}){ if ( C4::Context->preference("AutomaticItemReturn" ) or (C4::Context->preference("UseBranchTransferLimits") and ! IsBranchTransferAllowed($branch, $hbr, $item->{C4::Context->preference("BranchTransferLimitsType")} ) -- 1.5.6.5