From b6935d2139aa60c31171026831f935423868d5a4 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Tue, 21 Jun 2016 15:18:51 -0300
Subject: [PATCH] Bug 14048: (followup) Use the original holding branch

This patch picks the item's holding branch *before* it gets fixed
by using the checkin library instead. This way the RefundLostOnReturnControl
syspref set to ItemHoldingBranch is respected (otherwise, as Nick explained
this behaves just like if CheckinLibrary was set)

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jason Robb <jrobb@sekls.org>

Signed-off-by: Jennifer Schmidt <jschmidt@switchinc.org>

Signed-off-by: Margaret Thrasher <p.thrasher@dover.nh.gov>
---
 C4/Circulation.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 08081fc..8c5f0a3 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2089,6 +2089,7 @@ sub AddReturn {
 
     # the holdingbranch is updated if the document is returned to another location.
     # this is always done regardless of whether the item was on loan or not
+    my $item_holding_branch = $item->{ holdingbranch };
     if ($item->{'holdingbranch'} ne $branch) {
         UpdateHoldingbranch($branch, $item->{'itemnumber'});
         $item->{'holdingbranch'} = $branch; # update item data holdingbranch too
@@ -2128,7 +2129,7 @@ sub AddReturn {
                     {
                         current_branch      => C4::Context->userenv->{branch},
                         item_home_branch    => $item->{homebranch},
-                        item_holding_branch => $item->{holdingbranch}
+                        item_holding_branch => $item_holding_branch
                     }
                 )
               )
-- 
2.1.4