From 4f1718793cd38a313b48c639ea80a4cbe0846bb5 Mon Sep 17 00:00:00 2001 From: MJ Ray Date: Fri, 7 Sep 2012 18:29:39 +0100 Subject: [PATCH] enh bug 8740 Serials Claims should be exportable all at once Test plan: 1. Visit Serials: Claims and look at the vendor list drop-down 2. select All 3. click OK 4. export them all --- .../prog/en/modules/serials/claims.tt | 1 + serials/claims.pl | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index 399c933..d1370f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -184,6 +184,7 @@ ([% suploo.count %]) [% END %] + [% IF ( phone ) %]Phone: [% phone %][% END %] diff --git a/serials/claims.pl b/serials/claims.pl index e51148c..c0e7184 100755 --- a/serials/claims.pl +++ b/serials/claims.pl @@ -50,9 +50,11 @@ my ($template, $loggedinuser, $cookie) # supplierlist is returned in name order my $supplierlist = GetSuppliersWithLateIssues(); +my $allissues = 0; for my $s (@{$supplierlist} ) { $s->{count} = scalar GetLateOrMissingIssues($s->{id}, q{}, $order); - if ($supplierid && $s->{id} == $supplierid) { + $allissues += $s->{count}; + if ($supplierid && $s->{id} eq $supplierid) { $s->{selected} = 1; } } @@ -66,7 +68,11 @@ foreach (keys %{$letters}){ my $letter=((scalar(@letters)>1) || ($letters[0]->{name}||$letters[0]->{code})); my @missingissues; my @supplierinfo; -if ($supplierid) { +if ( $supplierid eq 'all' ) { + foreach my $s (@{$supplierlist} ) { + push(@missingissues,GetLateOrMissingIssues($s->{id},$serialid,$order)); + } +} elsif ($supplierid) { @missingissues = GetLateOrMissingIssues($supplierid,$serialid,$order); @supplierinfo=GetBookSeller($supplierid); } @@ -94,6 +100,7 @@ $template->param( bookselleremail => $supplierinfo[0]->{bookselleremail}, preview => $preview, missingissues => \@missingissues, + allissues => $allissues, supplierid => $supplierid, claimletter => $claimletter, supplierloop => \@supplierinfo, -- 1.7.2.5