created old_issues and old_reserves tables

[koha_fer] / reserve / request.pl

diff --git a/reserve/request.pl b/reserve/request.pl
index d0fea98..6db6309 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -34,6 +34,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Reserves;
 use C4::Biblio;
+use C4::Items;
 use C4::Koha;
 use C4::Circulation;
 use C4::Dates qw/format_date/;
@@ -355,7 +356,7 @@ foreach my $biblioitemnumber (@biblioitemnumbers) {
         }
 
     # FIXME: move this to a pm
-    my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W' AND cancellationdate IS NULL");
+    my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W'");
     $sth2->execute($item->{ReservedForBorrowernumber},$item->{itemnumber});
     while (my $wait_hashref = $sth2->fetchrow_hashref) {
         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
@@ -435,7 +436,7 @@ my $default = C4::Context->userenv->{branch};
 my @values;
 my %label_of;
 
-foreach my $branchcode ( keys %{$branches} ) {
+foreach my $branchcode (sort keys %{$branches} ) {
     push @values, $branchcode;
     $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
 }