Bug 10855: Squash several fixes

[koha.git] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index dc55fad..ce560ae 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -4,30 +4,31 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Serials;
 use C4::Acquisition;
 use C4::Output;
-use C4::Bookseller qw( GetBookSeller );
 use C4::Context;
 use C4::Letters;
 use C4::Branch;    # GetBranches GetBranchesLoop
+use C4::Koha qw( GetAuthorisedValues );
+use Koha::AdditionalField;
 use C4::Csv qw( GetCsvProfiles );
 
 my $input = CGI->new;
@@ -57,6 +58,13 @@ for my $s (@{$supplierlist} ) {
     }
 }
 
+my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
+for my $field ( @$additional_fields ) {
+    if ( $field->{authorised_value_category} ) {
+        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
+    }
+}
+
 my $branchloop = GetBranchesLoop();
 
 my @serialnums=$input->param('serialid');
@@ -84,22 +92,17 @@ if (@serialnums) { # i.e. they have been flagged to generate claims
 my $letters = GetLetters({ module => 'claimissues' });
 
 my @missingissues;
-my @supplierinfo;
 if ($supplierid) {
     @missingissues = GetLateOrMissingIssues($supplierid);
-    @supplierinfo=GetBookSeller($supplierid);
 }
 
 $template->param(
         suploop => $supplierlist,
-        phone => $supplierinfo[0]->{phone},
-        booksellerfax => $supplierinfo[0]->{booksellerfax},
-        bookselleremail => $supplierinfo[0]->{bookselleremail},
         missingissues => \@missingissues,
         supplierid => $supplierid,
         claimletter => $claimletter,
-        supplierloop => \@supplierinfo,
         branchloop   => $branchloop,
+        additional_fields_for_subscription => $additional_fields,
         csv_profiles => C4::Csv::GetCsvProfiles( "sql" ),
         letters => $letters,
         (uc(C4::Context->preference("marcflavour"))) => 1