From 0123118d49c08ac69070e025c7d543de28a3c1aa 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
---
 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 aee0a5e..9963c94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -108,7 +108,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&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% TransferWaitingAt %]&amp;op=slip'); this.form.submit();" />
     </form>
     [% END %]</div>
 [% END %]
@@ -186,7 +186,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&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% destbranch %]&amp;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 %]" />
@@ -294,7 +294,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&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+                <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% destbranch %]&amp;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 %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
-- 
1.8.3.2