Attachment #4384 for bug #6467

View | Details | Raw Unified | Return to bug 6467
Collapse All | Expand All

Lines 537-542 if ($borrower) { Link Here

(-)a/circ/returns.pl (+6 lines)
537	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;	537	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
538	my $count = 0;	538	my $count = 0;
539	my @riloop;	539	my @riloop;
		540	my $shelflocations = GetKohaAuthorisedValues('items.location','');
540	foreach ( sort { $a <=> $b } keys %returneditems ) {	541	foreach ( sort { $a <=> $b } keys %returneditems ) {
541	my %ri;	542	my %ri;
542	if ( $count++ < $returned_counter ) {	543	if ( $count++ < $returned_counter ) {
Lines 575-580 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
575	$ri{ccode} = $biblio->{'ccode'};	576	$ri{ccode} = $biblio->{'ccode'};
576	$ri{itemnumber} = $biblio->{'itemnumber'};	577	$ri{itemnumber} = $biblio->{'itemnumber'};
577	$ri{barcode} = $bar_code;	578	$ri{barcode} = $bar_code;
		579
		580	$ri{location} = $biblio->{'location'};
		581	my $shelfcode = $ri{'location'};
		582	$ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
		583
578	}	584	}
579	else {	585	else {
580	last;	586	last;

Lines 396-402 function Dopop(link) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +2 lines)
396	[% IF ( riloop ) %]	396	[% IF ( riloop ) %]
397	<h2>Checked-In items</h2>	397	<h2>Checked-In items</h2>
398	<table>	398	<table>
399	<tr><th>Due Date</th><th>Title</th> <th>Author</th> <th>Barcode</th><th>Call Number</th><th>Type</th> <th>Patron</th><th>Note</th></tr>	399	<tr><th>Due Date</th><th>Title</th> <th>Author</th> <th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th> <th>Patron</th><th>Note</th></tr>
400		400
401	[% FOREACH riloo IN riloop %]	401	[% FOREACH riloo IN riloop %]
402	<tr>	402	<tr>
Lines 412-417 function Dopop(link) { Link Here
412	[% riloo.itemtitle \|html %]</a></td>	412	[% riloo.itemtitle \|html %]</a></td>
413	<td>[% riloo.itemauthor %]</td>	413	<td>[% riloo.itemauthor %]</td>
414	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>	414	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
		415	<td>[% riloo.location %]</td>
415	<td>[% riloo.itemcallnumber %]</td>	416	<td>[% riloo.itemcallnumber %]</td>
416	<td>[% riloo.itemtype %] [% riloo.ccode %]</td>	417	<td>[% riloo.itemtype %] [% riloo.ccode %]</td>
417	<td>[% IF ( riloo.duedate ) %]	418	<td>[% IF ( riloo.duedate ) %]
418	-

Return to bug 6467