Bugzilla – Attachment 60810 Details for
Bug 12972
Transfer slip and transfer message (blue box) can conflict
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12972 - Transfer slip and transfer message (blue box) can conflict
Bug-12972---Transfer-slip-and-transfer-message-blu.patch (text/plain), 2.32 KB, created by
Nick Clemens
on 2017-03-03 15:02:27 UTC
(
hide
)
Description:
Bug 12972 - Transfer slip and transfer message (blue box) can conflict
Filename:
MIME Type:
Creator:
Nick Clemens
Created:
2017-03-03 15:02:27 UTC
Size:
2.32 KB
patch
obsolete
>From 6b4bbb16dd268c33fbed86a1c26bac4f4e503d89 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 >--- > 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 50a65d5..1c65711 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12972
:
60810
|
60864
|
60887