From 6325f4cc83a6422f6ce7c2922b9077862efa50c9 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 9 Apr 2018 15:08:42 -0300
Subject: [PATCH] Bug 19287: Do not display buttons for biblio level holds

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 circ/pendingreserves.pl                       |  2 +-
 .../prog/en/modules/circ/pendingreserves.tt   | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 6f47a31572..5e6418b22c 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -177,7 +177,7 @@ my $strsth =
                     ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
             reserves.biblionumber,
             reserves.branchcode as l_branch,
-            items.itemnumber,
+            reserves.itemnumber,
             items.holdingbranch,
             items.homebranch,
             GROUP_CONCAT(DISTINCT items.itype 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index f56bd817d3..ccac35fd8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -36,7 +36,7 @@
                 [% CASE 'hold_cancelled' %]
                     <span>The hold has been correctly cancelled.</span>
                 [% CASE 'hold_placed_at_biblio_level' %]
-                    <span>The hold has been placed at biblio level. It is not possible to mark it as lost.</span>
+                    <span>The hold has been placed on biblio level. It is not possible to determine the item to mark as lost.</span>
                 [% CASE %]
                     [% m.code %]
                 [% END %]
@@ -120,16 +120,20 @@
             </form>
 
         [% IF Koha.Preference('CanMarkHoldsToPullAsLost') != 'do_not_allow' %]
-            <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
-                <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
-                [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %]
-                    <input type="hidden" name="op" value="mark_as_lost" />
-                    <input type="submit" value="Mark item as lost" />
-                [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %]
-                    <input type="hidden" name="op" value="mark_as_lost_and_notify" />
-                    <input type="submit" value="Mark item as lost and notify the patron" />
-                [% END %]
-            </form>
+            [% IF reserveloo.itemnumber %]
+                <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
+                    <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
+                    [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %]
+                        <input type="hidden" name="op" value="mark_as_lost" />
+                        <input type="submit" value="Mark item as lost" />
+                    [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %]
+                        <input type="hidden" name="op" value="mark_as_lost_and_notify" />
+                        <input type="submit" value="Mark item as lost and notify the patron" />
+                    [% END %]
+                </form>
+            [% ELSE %]
+                <span>Biblio level hold.</span>
+            [% END %]
         [% END %]
         </tr>
         [% END %]
-- 
2.39.5