From 1424addcc22f44b84921d9cd46bc72e64a6a1b0e Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 18 Nov 2004 10:32:39 +0000 Subject: [PATCH] fix for bug 858 (no warning when issuing a reserved book) --- C4/Circulation/Circ2.pm | 1 + circ/circulation.pl | 1 - koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm index c023076c6b..c7e314c586 100755 --- a/C4/Circulation/Circ2.pm +++ b/C4/Circulation/Circ2.pm @@ -766,6 +766,7 @@ sub canbookbeissued { my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; $needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)"; + CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); } elsif ($restype eq "Reserved") { # The item is on reserve for someone else. my ($resborrower, $flags)=getpatroninformation($env, $resbor,0); diff --git a/circ/circulation.pl b/circ/circulation.pl index fa4553149e..2b3a80b376 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -319,7 +319,6 @@ sub patrontable { my $flag; my $color=''; foreach $flag (sort keys %$flags) { - warn $flag; # my @itemswaiting=''; $flags->{$flag}->{'message'}=~s/\n/
/g; if ($flags->{$flag}->{'noissues'}) { diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl index d8a8d62136..65ce942a6a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl @@ -184,8 +184,11 @@

Not an issue but a renewal

-

Reserve waiting

- +

Reserve waiting for

+ + +

Reserved by

+

Item issued to . Return & issue?

-- 2.39.5