From 237abf0a523a9b9aa278d85686f0a4a503fd5586 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cbrannon@cdalibrary.org>
Date: Thu, 1 Nov 2018 21:08:19 +0000
Subject: [PATCH] Bug 21346: Remove double dialog

To Test:
1) Place a hold on an item for pickup at another branch.
2) Check in item to trigger hold and transfer.
3) Check in item again without changing location.  Note modal AND old
dialog behind modal.
4) Apply patch.
5) Check in item again without changing location.  Note modal without
the old dialog.

Signed-off-by: Lisette <lisetteslatah@gmail.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 230905e1d56a11cf5619f95c95920eb09803900c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6055a519c4474ab3b9004ed99b9b2e76c9735076)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 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 0905186877..5b02a1d5e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -119,7 +119,7 @@
 [% END %]
 
 <!-- case of a mistake in transfer loop -->
-[% IF ( WrongTransfer ) %]
+[% IF ( WrongTransfer && !transfertodo ) %]
     <div id="return2" class="dialog message">
         <!-- WrongTransfer -->
         <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
-- 
2.39.5