@@ -, +, @@
---
circ/pendingreserves.pl | 8 +++++++-
circ/view_holdsqueue.pl | 2 +-
circ/waitingreserves.pl | 2 ++
.../prog/en/modules/circ/pendingreserves.tt | 8 ++++++++
.../prog/en/modules/circ/view_holdsqueue.tt | 6 +++++-
.../prog/en/modules/circ/waitingreserves.tt | 8 ++++++++
6 files changed, 31 insertions(+), 3 deletions(-)
--- a/circ/pendingreserves.pl
+++ a/circ/pendingreserves.pl
@@ -134,13 +134,16 @@ if ( $run_report ) {
GROUP_CONCAT(DISTINCT reserves.branchcode
ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
items.holdingbranch as branch,
- items.itemcallnumber,
GROUP_CONCAT(DISTINCT items.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
ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber,
+ GROUP_CONCAT(DISTINCT items.enumchron
+ ORDER BY items.itemnumber SEPARATOR '
') l_enumchron,
+ GROUP_CONCAT(DISTINCT items.copynumber
+ ORDER BY items.itemnumber SEPARATOR '
') l_copynumber,
items.itemnumber,
notes,
notificationdate,
@@ -159,6 +162,7 @@ if ( $run_report ) {
WHERE
reserves.found IS NULL
$sqldatewhere
+ AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
AND issues.itemnumber IS NULL
AND reserves.priority <> 0
@@ -200,6 +204,8 @@ if ( $run_report ) {
holdingbranch => $data->{l_holdingbranch},
branch => $data->{l_branch},
itemcallnumber => $data->{l_itemcallnumber},
+ enumchron => $data->{l_enumchron},
+ copyno => $data->{l_copynumber},
notes => $data->{notes},
notificationdate => $data->{notificationdate},
reminderdate => $data->{reminderdate},
--- a/circ/view_holdsqueue.pl
+++ a/circ/view_holdsqueue.pl
@@ -81,7 +81,7 @@ sub GetHoldsQueueItems {
my $dbh = C4::Context->dbh;
my @bind_params = ();
- my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn
+ my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
FROM tmp_holdsqueue
JOIN biblio USING (biblionumber)
LEFT JOIN biblioitems USING (biblionumber)
--- a/circ/waitingreserves.pl
+++ a/circ/waitingreserves.pl
@@ -129,6 +129,8 @@ foreach my $num (@getreserves) {
$getreserv{'homebranch'} = $gettitle->{'homebranch'};
$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
+ $getreserv{'enumchron'} = $gettitle->{'enumchron'};
+ $getreserv{'copynumber'} = $gettitle->{'copynumber'};
if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
$getreserv{'dotransfer'} = 1;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -72,6 +72,12 @@ $.tablesorter.addParser({
Sort
[% reserveloo.holdingbranch %]
[% reserveloo.itemcallnumber %]
[% reserveloo.copyno %]
[% reserveloo.enumchron %]
[% reserveloo.itype %]
[% reserveloo.location %]