Bugzilla – Attachment 28609 Details for
Bug 12043
Popup when reserved item checked in at wrong branch should generate transfer slip
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12043 - Popup when reserved item checked in at wrong branch should generate transfer slip
Bug-12043---Popup-when-reserved-item-checked-in-at.patch (text/plain), 4.74 KB, created by
Jonathan Druart
on 2014-06-02 13:50:15 UTC
(
hide
)
Description:
Bug 12043 - Popup when reserved item checked in at wrong branch should generate transfer slip
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-06-02 13:50:15 UTC
Size:
4.74 KB
patch
obsolete
>From 3e0f740c1293dcb892f12163213f0516875e915c Mon Sep 17 00:00:00 2001 >From: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> >Date: Tue, 8 Apr 2014 14:24:56 +0200 >Subject: [PATCH] Bug 12043 - Popup when reserved item checked in at wrong > branch should generate transfer slip > >This patch corrects some wrong popups in Returns.tt handling transfers >of reserved items. > >Instead of using hold-transfer-slip.pl with param transfer=1 (which >seems to be silently ignored) it uses transfer-slip.pl with >itemnumber and destination branch, which allows for printing correct >slips. > >It also removes the non-used param $tranfer in hold-transfer-slip.pl. > >Test plan: >( see cases in bug description ) >1) Make a reservation on item with homebranch A to branch B >2) checkin item at its homebranch A >3) press 'Print slip and confirm transfer' >4) verify that slip uses template RESERVESLIP >5) apply patch >6) repeat steps 1-3 >7) verify that slip now uses template TRANSFERSLIP > >Signed-off-by: Nick Clemens <nick@quecheelibrary.org> >--- > circ/hold-transfer-slip.pl | 5 ----- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++--- > 2 files changed, 3 insertions(+), 8 deletions(-) > >diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl >index 8ae5d2a..0382090 100755 >--- a/circ/hold-transfer-slip.pl >+++ b/circ/hold-transfer-slip.pl >@@ -38,7 +38,6 @@ my $session = get_session($sessionID); > > my $biblionumber = $input->param('biblionumber'); > my $borrowernumber = $input->param('borrowernumber'); >-my $transfer = $input->param('transfer'); > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >@@ -68,7 +67,3 @@ $template->param( > ); > > output_html_with_http_headers $input, $cookie, $template->output; >- >- >- >- >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 72f9ee3..e02d15e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -161,7 +161,7 @@ $(document).ready(function () { > <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" /> > <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" /> > <input type="submit" class="approve" value="Confirm" /> >- <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" /> >+ <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% TransferWaitingAt %]&op=slip'); this.form.submit();" /> > </form> > [% END %]</div> > [% END %] >@@ -239,7 +239,7 @@ $(document).ready(function () { > > <form method="post" action="returns.pl" class="confirm"> > <input type="submit" class="approve" value="Confirm" /> >- <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" /> >+ <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% destbranch %]&op=slip'); this.form.submit();" /> > [% FOREACH inputloo IN inputloop %] > <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" /> > <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" /> >@@ -347,7 +347,7 @@ $(document).ready(function () { > <form method="post" action="returns.pl" class="confirm"> > [% IF ( transfertodo ) %] > <input type="submit" class="approve" value="Confirm hold and transfer" /> >- <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" /> >+ <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% destbranch %]&op=slip'); this.form.submit();" /> > [% ELSE %] > <input type="submit" class="approve" value="Confirm hold" /> > <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" /> >-- >2.0.0.rc2
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 12043
:
26896
|
28609
|
33563
|
33656