From ebc2ab012e84b1bf68b74b80289c51203a399ab2 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Tue, 23 Dec 2008 15:14:27 +0100 Subject: [PATCH] (bug #2750) Cannot return to another branch if the independantbranch option is set as ON The code was modified to change the holding branch ONLY if the return to the right branch is done. If you set IndependantBranch to on, you must return the document to the HomeBranch. And verify the return is done before show the message that allow to transfert the document to another branch. Signed-off-by: Galen Charlton Signed-off-by: Henri-Damien LAURENT --- C4/Circulation.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 86a107c935..91d024ecd5 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1435,11 +1435,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 . -<<<<<<< HEAD:C4/Circulation.pm - if ($doreturn and ($iteminformation->{'holdingbranch'} ne $iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) and ($reserveDone ne 1) ){ -======= if ($doreturn and ($branch ne $iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) and ($reserveDone ne 1) ){ ->>>>>>> be5e89b... (bug #2750) Cannot return to another branch if the independantbranch option is set as ON:C4/Circulation.pm if (C4::Context->preference("AutomaticItemReturn") == 1) { ModItemTransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'}); $messages->{'WasTransfered'} = 1; -- 2.39.5