fix for bug 858 (no warning when issuing a reserved book)

diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index c023076..c7e314c 100755 (executable)
--- 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 fa45531..2b3a80b 100755 (executable)
--- 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/<br>/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 d8a8d62..65ce942 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
@@ -184,8 +184,11 @@
                                <p>Not an issue but a renewal</p>
                        <!-- /TMPL_IF -->       
                        <!-- TMPL_IF NAME="RESERVE_WAITING" -->
-                               <p>Reserve waiting</p>
-                       <!-- /TMPL_IF -->       
+                               <p>Reserve waiting for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="RESERVED" -->
+                               <p>Reserved by <!-- TMPL_VAR NAME="RESERVED" --></p>
+                       <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
                                <p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
                        <!-- /TMPL_IF -->