From c78431b17da1127767e89bcaa1d994ec752ef70f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 20 Jan 2016 09:40:25 +0000
Subject: [PATCH] Bug 15560: Fix display of multiple item types in pending
 reserves report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Same fix as previous patch, but for item types.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 879ee53be7351d88cc16b370ada9953d6c96e805)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 circ/pendingreserves.pl                                     | 4 ++--
 .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index dfc4e8fd87..e03242a336 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -114,7 +114,7 @@ if ( $run_report ) {
                     ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
             items.holdingbranch as branch,
             GROUP_CONCAT(DISTINCT items.itype 
-                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
+                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
             GROUP_CONCAT(DISTINCT items.location 
                     ORDER BY items.itemnumber SEPARATOR '|') l_location,
             GROUP_CONCAT(DISTINCT items.itemcallnumber 
@@ -187,7 +187,7 @@ if ( $run_report ) {
                 count           => $data->{icount},
                 rcount          => $data->{rcount},
                 pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
-                itype           => $data->{l_itype},
+                itypes          => [split('\|', $data->{l_itype})],
                 locations       => [split('\|', $data->{l_location})],
             }
         );
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 5ec5fd18a0..e6f7323eea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -134,7 +134,11 @@ $(document).ready(function() {
         <td><p>[% reserveloo.itemcallnumber %]</p></td>
         <td><p>[% reserveloo.copyno %]</p></td>
         <td><p>[% reserveloo.enumchron %]</p></td>
-        <td>[% ItemTypes.GetDescription( reserveloo.itype ) %]</td>
+        <td>
+        [% FOREACH itype IN reserveloo.itypes %]
+            [% ItemTypes.GetDescription( itype ) %]
+        [% END %]
+        </td>
         <td>
         [% FOREACH loc IN reserveloo.locations %]
             [% AuthorisedValues.GetByCode('LOC', loc) %]<br>