# Copyright 2000-2002 Katipo Communications
# 2006 SAN-OP
# 2007-2010 BibLibre, Paul POULAIN
+# 2010 Catalyst IT
#
# This file is part of Koha.
#
my $exemptfine = $query->param('exemptfine');
my $dropboxmode = $query->param('dropboxmode');
my $dotransfer = $query->param('dotransfer');
+my $canceltransfer = $query->param('canceltransfer');
+my $dest = $query->param('dest');
my $calendar = C4::Calendar->new( branchcode => $userenv_branch );
#dropbox: get last open day (today - 1)
my $today = C4::Dates->new();
ModItemTransfer($transferitem, $userenv_branch, $tobranch);
}
+if ($canceltransfer){
+ $itemnumber=$query->param('itemnumber');
+ DeleteTransfer($itemnumber);
+ if($dest eq "ttr"){
+ print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
+ exit;
+ } else {
+ $template->param( transfercancelled => 1);
+ }
+}
+
# actually return book and prepare item table.....
if ($barcode) {
$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
$template->param(
waiting_holds => $waiting_holds,
holdsborrowernumber => $borrower->{'borrowernumber'},
+ holdsfirstname => $borrower->{'firstname'},
+ holdssurname => $borrower->{'surname'},
);
}
}
WrongTransfer => 1,
TransferWaitingAt => $messages->{'WrongTransfer'},
WrongTransferItem => $messages->{'WrongTransferItem'},
+ itemnumber => $itemnumber,
);
my $reserve = $messages->{'ResFound'};
my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
my $count = 0;
my @riloop;
+my $shelflocations = GetKohaAuthorisedValues('items.location','');
foreach ( sort { $a <=> $b } keys %returneditems ) {
my %ri;
if ( $count++ < $returned_counter ) {
$ri{ccode} = $biblio->{'ccode'};
$ri{itemnumber} = $biblio->{'itemnumber'};
$ri{barcode} = $bar_code;
+
+ $ri{location} = $biblio->{'location'};
+ my $shelfcode = $ri{'location'};
+ $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
+
}
else {
last;
<!-- Patron has waiting holds -->
[% IF ( waiting_holds ) %]
- <div class="dialog alert">
- <h3>Patron has [% waiting_holds %] hold(s) waiting for pickup.</h3>
- <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber %]">Checkout holds</a>.</p>
+ <div class="dialog message">
+ <h3>[% holdsfirstname %] [% holdssurname %] has [% waiting_holds %] hold(s) waiting for pickup.</h3>
+ <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber %]">Check out to this patron</a>.</p>
</div>
[% END %]
</div>
[% END %]
<!-- case of a mistake in transfer loop -->
-[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3>
+[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %] or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel Transfer</a></h3>
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
[% IF ( riloop ) %]
<h2>Checked-In items</h2>
<table>
- <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>
+ <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>
[% FOREACH riloo IN riloop %]
<tr>
[% riloo.itemtitle |html %]</a></td>
<td>[% riloo.itemauthor %]</td>
<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
+ <td>[% riloo.location %]</td>
<td>[% riloo.itemcallnumber %]</td>
<td>[% riloo.itemtype %] [% riloo.ccode %]</td>
<td>[% IF ( riloo.duedate ) %]