Bug5063: C4::Bookseller Changes

[koha.git] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index fa45330..e51148c 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# Parts Copyright 2010 Biblibre
+
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -22,7 +24,7 @@ use C4::Auth;
 use C4::Serials;
 use C4::Acquisition;
 use C4::Output;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSeller );
 use C4::Context;
 use C4::Letters;
 use C4::Branch;    # GetBranches GetBranchesLoop
@@ -35,15 +37,6 @@ my $claimletter = $input->param('claimletter');
 my $supplierid = $input->param('supplierid');
 my $suppliername = $input->param('suppliername');
 my $order = $input->param('order');
-my $supplierlist = GetSuppliersWithLateIssues();
-if ($supplierid) {
-    foreach my $s ( @{$supplierlist} ) {
-        if ($s->{id} == $supplierid ) {
-            $s->{selected} = 1;
-            last;
-        }
-    }
-}
 
 # open template first (security & userenv set here)
 my ($template, $loggedinuser, $cookie)
@@ -55,14 +48,13 @@ my ($template, $loggedinuser, $cookie)
             debug => 1,
             });
 
-my @suploop;
-for my $s ( sort {$a->{name} cmp $b->{name} } @$supplierlist ) {
-    my @list = GetLateOrMissingIssues($s, "", $order);
-    push @suploop, {
-        %$s,
-        count    => scalar(@list),
-        selected => $s->{id} == $supplierid,
-    };
+# supplierlist is returned in name order
+my $supplierlist = GetSuppliersWithLateIssues();
+for my $s (@{$supplierlist} ) {
+    $s->{count} = scalar  GetLateOrMissingIssues($s->{id}, q{}, $order);
+    if ($supplierid && $s->{id} == $supplierid) {
+        $s->{selected} = 1;
+    }
 }
 
 my $letters = GetLetters('claimissues');
@@ -96,7 +88,7 @@ if($op && $op eq 'preview'){
 $template->param('letters'=>\@letters,'letter'=>$letter);
 $template->param(
         order =>$order,
-        suploop => \@suploop,
+        suploop => $supplierlist,
         phone => $supplierinfo[0]->{phone},
         booksellerfax => $supplierinfo[0]->{booksellerfax},
         bookselleremail => $supplierinfo[0]->{bookselleremail},