From 1453485a4c152b34c126f8218fd51348a48cd0fa Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 3 Mar 2017 14:56:31 +0000 Subject: [PATCH] Bug 12972 - Transfer slip and transfer message (blue box) can conflict Instead of passing the homebranch to the slip, let's pass TransferWaitingAt (the value we display) To test: 1 - Check in an item that will initiate a transfer (hold or automatic item return) 2 - Note the transfer message and receipt match 3 - Remove the reason for transfer (bot don't cancel transfer) i.e. cancel hold or change homebranch of item to current library 4 - Check the item in again 5 - Note the message displays the transfer destination and the slip shows the homebranch 6 - Apply patch 7 - Repeat 5 but note slip and message match 8 - Test any edge cases for correctness 9 - sign off Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit f454013ec9beb8f6e4c382253b76bfac5ca65244) Signed-off-by: Katrin Fischer (cherry picked from commit 29526afcef6143ddafac8ffd00820ef9086ccaa0) Signed-off-by: Julian Maurice --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ab23086e7c..b84d0555ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -181,7 +181,7 @@ $(document).ready(function () {

Please return item to: [% Branches.GetName( TransferWaitingAt ) %]

[% itembarcode |html %]: [% title |html %]

- + [% IF ( wborcnum ) %]
Hold for: