diff --git a/circ/returns.pl b/circ/returns.pl
index d0f2590850..d72ca6d05e 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -8,6 +8,7 @@ use CGI;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
+use C4::Print;
use C4::Reserves2;
my %env;
@@ -28,8 +29,6 @@ my $printer = $query->param("printer");
($branch) || ($branch=$query->cookie('branch')) ;
($printer) || ($printer=$query->cookie('printer')) ;
-my $request=$query->param('request');
-
#
# Some code to handle the error if there is no branch or printer setting.....
@@ -65,31 +64,36 @@ foreach ($query->param) {
# Collect a few messages here...
my $messagetext='';
+my $reservetext='';
############
# Deal with the requests....
-if ($request eq "KillWaiting") {
+if ($query->param('resbarcode')) {
my $item = $query->param('itemnumber');
my $borrnum = $query->param('borrowernumber');
- CancelReserve(0, $item, $borrnum);
- $messagetext .= "Reserve Cancelled
";
-}
-if ($request eq "SetWaiting") {
- my $item = $query->param('itemnumber');
- my $borrnum = $query->param('borrowernumber');
- my $barcode2 = $query->param('barcode2');
+ my $resbarcode = $query->param('resbarcode');
my $tobranchcd = ReserveWaiting($item, $borrnum);
- my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $barcode2, 1);
- $messagetext .= "Item should now be waiting at branch: $branches->{$tobranchcd}->{'branchname'}
";
-}
-if ($request eq 'KillReserved'){
- my $biblio = $query->param('biblionumber');
- my $borrnum = $query->param('borrowernumber');
- warn "In Kill Reserved";
- CancelReserve($biblio, 0, $borrnum);
- $messagetext .= "Reserve Cancelled
";
-}
+ my $branchname = $branches->{$tobranchcd}->{'branchname'};
+ my ($borr) = getpatroninformation(\%env, $borrnum);
+ my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
+ my $number = "{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}";
+ if ($tobranchcd ne $branch) {
+ my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
+ $reservetext .= <<"EOF";
+Item marked Waiting:
+ Item needs to be transfered to $branchname
+to be picked up by $name ($number).
+
+EOF
+ }
+ my ($iteminfo) = getiteminformation(\%env, $item);
+ printreserve(\%env, $branchname, $borr, $iteminfo);
+}
my $iteminformation;
@@ -167,10 +171,8 @@ $ritext
EOF
-my $reservefoundtext;
if ($messages->{'ResFound'}) {
my $res = $messages->{'ResFound'};
- my $reservetext;
my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
@@ -178,64 +180,34 @@ if ($messages->{'ResFound'}) {
if ($res->{'ResFound'} eq "Waiting") {
$reservetext = <<"EOF";
Item marked Waiting:
- Item is marked waiting at $branchname for $name ($number).
-
-| Cancel reservation: |
-
-
- |
-| Back to returns: |
-
- |
+
EOF
}
if ($res->{'ResFound'} eq "Reserved") {
$reservetext = <<"EOF";
Reserved found: for $name ($number).
+
EOF
}
+}
+my $reservefoundtext;
+if ($reservetext) {
$reservefoundtext = <<"EOF";