From dcf93633b386053073d897da28925c9750345e08 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 27 Apr 2021 14:10:27 +0100
Subject: [PATCH] Bug 25883: Replace 'holdingbranch' with 'transfer to' in
 returns

This patch replaces the "Holding library" column in the returns table
with a 'Transfer to' column that displays the destination for the item
awaiting transfer if a transfer exists.

Signed-off-by: Ben Daeuber <bdaeuber@fargolibrary.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 circ/returns.pl                                         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index 045a30ee31..8ab9986d91 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -618,7 +618,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
         $ri{itemnumber}          = $item->itemnumber;
         $ri{barcode}             = $bar_code;
         $ri{homebranch}          = $item->homebranch;
-        $ri{holdingbranch}       = $item->holdingbranch;
+        $ri{transferbranch}      = $item->get_transfer ? $item->get_transfer->tobranch : '';
         $ri{damaged}             = $item->damaged;
 
         $ri{location} = $item->location;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 27e5c305da..67a1a22109 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -869,7 +869,7 @@
                                         <th class="ci-author">Author</th>
                                         <th class="ci-barcode">Barcode</th>
                                         <th class="ci-homelibrary">Home library</th>
-                                        <th class="ci-holdinglibrary">Holding library</th>
+                                        <th class="ci-transferlibrary">Transfer to</th>
                                         <th class="ci-shelvinglocation">Shelving location</th>
                                         <th class="ci-callnumber">Call number</th>
                                         <th class="ci-dateaccessioned">Date acquired</th>
@@ -916,8 +916,8 @@
                                         <td class="ci-homelibrary">
                                             [% Branches.GetName( riloo.homebranch ) | html %]
                                         </td>
-                                        <td class="ci-holdinglibrary">
-                                            [% Branches.GetName( riloo.holdingbranch ) | html %]
+                                        <td class="ci-transferlibrary">
+                                            [% Branches.GetName( riloo.transferbranch ) | html %]
                                         </td>
                                         <td class="ci-shelvinglocation">
                                             <span class="shelvingloc">[% riloo.location | html %]</span>
-- 
2.39.5