From f7e89f5cc9f599d390e3c386bfa0bc4934f11fcb Mon Sep 17 00:00:00 2001 From: Nick Clemens <nick@bywatersolutions.com> Date: Fri, 3 Mar 2017 14:56:31 +0000 Subject: [PATCH] [SIGNED-OFF] 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 <josef.moravec@gmail.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 702a039..7f0d886 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -224,7 +224,7 @@ $(document).ready(function () { <!-- WrongTransfer --> <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3> <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> - <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> + <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% TransferWaitingAt %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button> [% IF ( wborcnum ) %]<h5>Hold for:</h5> <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> -- 2.1.4