From 3e0f740c1293dcb892f12163213f0516875e915c Mon Sep 17 00:00:00 2001 From: Benjamin Rokseth 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 --- 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 () { - + [% END %] [% END %] @@ -239,7 +239,7 @@ $(document).ready(function () {
- + [% FOREACH inputloo IN inputloop %] @@ -347,7 +347,7 @@ $(document).ready(function () { [% IF ( transfertodo ) %] - + [% ELSE %] -- 2.0.0.rc2