MT3801: Serials not received issues cannot be claimed

waiting issues which where planned for an old date were not "claimable"
This also fixes a bug from commit

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>

diff --git a/C4/Serials.pm b/C4/Serials.pm
index f274b18..40ff3b6 100644 (file)
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -91,8 +91,8 @@ the array is in name order
 
 sub GetSuppliersWithLateIssues {
     my $dbh   = C4::Context->dbh;
-    my $query = q|
-    SELECT DISTINCT aqbooksellerid as id, aqbooksellers.name as name
+    my $query = qq|
+        SELECT DISTINCT id, name
     FROM            subscription
     LEFT JOIN       serial ON serial.subscriptionid=subscription.subscriptionid
     LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id

diff --git a/serials/claims.pl b/serials/claims.pl
index 249cf85..fa45330 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -56,13 +56,12 @@ my ($template, $loggedinuser, $cookie)
             });
 
 my @suploop;
-for ( sort {$supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist ) {
-    my ($count, @dummy) = GetLateOrMissingIssues($_, "", $order);
+for my $s ( sort {$a->{name} cmp $b->{name} } @$supplierlist ) {
+    my @list = GetLateOrMissingIssues($s, "", $order);
     push @suploop, {
-        id       => $_,
-        name     => $supplierlist{$_},
-        count    => $count,
-        selected => $_ == $supplierid,
+        %$s,
+        count    => scalar(@list),
+        selected => $s->{id} == $supplierid,
     };
 }