From ce067a3c972f38b612feabbb9df7a1e7e81902e3 Mon Sep 17 00:00:00 2001
From: Johanna Raisa <johanna.raisa@gmail.com>
Date: Wed, 10 Jul 2019 10:30:38 +0300
Subject: [PATCH] Bug 23292: Use TransferSlip when transfering item which is on
 hold

Combining hold and transfer slips might get confusing for patrons. Those represent quite different things.
Hold slip could be used on self-service pickup for patrons and transfer slip has information for librarians.
There can also be data protection issue if same slip is used in both cases.

Test plan:
- Apply the patch
- Create hold for a record, define pickup branch different than your current branch.
- Check in an item from your branch.
- Click 'Print slip, transfer, and confirm'
- See that the slip is TRANSFERSLIP
- Change your branch same as hold's pickup branch
- Check in the item again.
- Click 'Print slip and confirm'
- See that the slip is now HOLD_SLIP

Sponsored-by: Koha-Suomi Oy
---
 installer/data/mysql/en/mandatory/sample_notices.sql    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index 6d676e73e6..950a1d55bc 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -107,7 +107,7 @@ Date due: <<issues.date_due>><br />
 </checkedout>', 1),
 ('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
 
-<h3> Transfer to/Hold in <<branches.branchname>></h3>
+<h3> Hold in <<branches.branchname>></h3>
 
 <h3><<borrowers.surname>>, <<borrowers.firstname>></h3>
 
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 42d7a19089..b3d31aee66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -501,7 +501,7 @@
                                                         <button type="submit" class="btn btn-default approve">
                                                             <i class="fa fa-check"></i> Confirm hold and transfer
                                                         </button>
-                                                        <button type="submit" class="btn btn-default print">
+                                                        <button type="submit" class="btn btn-default print-transfer-slip">
                                                             <i class="fa fa-print"></i> Print slip, transfer, and confirm
                                                         </button>
                                                     [% ELSE %]
@@ -894,6 +894,10 @@
                 Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]');
             });
 
+            $(".print-transfer-slip").on('click', function(e) {
+                Dopop('transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% destbranch | html %]&amp;op=slip');
+            });
+
             [% IF print_slip %]
                 Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]&amp;itemnumber=[% itemnumber | html %]');
             [% END %]
-- 
2.17.1