fix for 2181: Late Items in Red

[koha_fer] / circ / pendingreserves.pl

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index f8ac860..135cf07 100755 (executable)
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -116,7 +116,7 @@ my $strsth =
 "SELECT min(reservedate) as l_reservedate,
         reserves.borrowernumber as borrowernumber,
         GROUP_CONCAT(DISTINCT items.holdingbranch 
-                       ORDER BY items.itemnumber SEPARATOR '<br>') l_holdingbranch,
+                       ORDER BY items.itemnumber SEPARATOR '<br/>') l_holdingbranch,
         reserves.biblionumber,
         reserves.branchcode,
         GROUP_CONCAT(DISTINCT reserves.branchcode 
@@ -124,11 +124,11 @@ my $strsth =
         items.holdingbranch as branch,
         items.itemcallnumber,
         GROUP_CONCAT(DISTINCT items.itype 
-                       ORDER BY items.itemnumber SEPARATOR '<br>') l_itype,
+                       ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
         GROUP_CONCAT(DISTINCT items.location 
-                       ORDER BY items.itemnumber SEPARATOR '<br>') l_location,
+                       ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
         GROUP_CONCAT(DISTINCT items.itemcallnumber 
-                       ORDER BY items.itemnumber SEPARATOR '<br>') l_itemcallnumber,
+                       ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
         items.itemnumber,
         notes,
         notificationdate,
@@ -149,7 +149,6 @@ reserves.found IS NULL
 AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
 AND items.itemnumber NOT IN (SELECT itemnumber FROM issues)
 AND reserves.priority <> 0 
-AND reserves.itemnumber is NULL
 AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0
 ";
 # GROUP BY reserves.biblionumber allows only items that are not checked out, else multiples occur when 
@@ -259,6 +258,7 @@ $template->param(
     reserveloop        => \@reservedata,
     "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
     DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
+       dateformat    => C4::Context->preference("dateformat"),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;