Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 15560: Fix display of multiple branches and locations in pending reserves report

Browse source 
The patches from bug 12152 broke the display on the pending reserves/
holds to pull report when items from multiple branches and with
multiple locations were displayed. The table cells were left empty.

To test:
- Add a record with at least 2 items from different locations and
  holdingbranches
- Open the 'holds to pull' report
- Verify all branches and locations show with their correct
  description

Signed-off-by: Natasha <tasham_8@hotmail.com>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Katrin Fischer 2016-01-20 01:46:14 +01:00 committed by Brendan Gallagher
parent 3430e554ca
commit 363cb9c02e
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
circ/pendingreserves.pl
View file

@ -97,7 +97,7 @@ if ( $run_report ) {
"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 '|') l_holdingbranch,
reserves.biblionumber,
reserves.branchcode,
GROUP_CONCAT(DISTINCT reserves.branchcode
@ -106,7 +106,7 @@ if ( $run_report ) {
GROUP_CONCAT(DISTINCT items.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 '|') l_location,
GROUP_CONCAT(DISTINCT items.itemcallnumber
ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
GROUP_CONCAT(DISTINCT items.enumchron
@ -167,7 +167,7 @@ if ( $run_report ) {
biblionumber => $data->{biblionumber},
statusw => ( $data->{found} eq "W" ),
statusf => ( $data->{found} eq "F" ),
holdingbranch => $data->{l_holdingbranch},
holdingbranches => [split('\|', $data->{l_holdingbranch})],,
branch => $data->{l_branch},
itemcallnumber => $data->{l_itemcallnumber},
enumchron => $data->{l_enumchron},
@ -178,7 +178,7 @@ if ( $run_report ) {
rcount => $data->{rcount},
pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
itype => $data->{l_itype},
location => $data->{l_location},
locations => [split('\|', $data->{l_location})],
}
);
}

12
koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
View file

@ -126,12 +126,20 @@ $(document).ready(function() {
<td>"</td>
<td>"</td>
[% END %]
<td>[% Branches.GetName ( reserveloo.holdingbranch ) %]</td>
<td>
[% FOREACH holdingbranch IN reserveloo.holdingbranches %]
[% Branches.GetName ( holdingbranch ) %]<br>
[% END %]
</td>
<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>[% AuthorisedValues.GetByCode('LOC', reserveloo.location) %]</td>
<td>
[% FOREACH loc IN reserveloo.locations %]
[% AuthorisedValues.GetByCode('LOC', loc) %]<br>
[% END %]
</td>
<td>
<span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>
[% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]