Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index 97f52ae..2ed81b8 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -25,10 +25,9 @@ use C4::Acquisition;
 use C4::Output;
 use C4::Context;
 use C4::Letters;
-use C4::Branch;    # GetBranches GetBranchesLoop
 use C4::Koha qw( GetAuthorisedValues );
 
-use Koha::AdditionalField;
+use Koha::AdditionalFields;
 use Koha::CsvProfiles;
 
 my $input = CGI->new;
@@ -58,14 +57,7 @@ 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 $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription', searchable => 1 } );
 
 my @serialnums=$input->multi_param('serialid');
 if (@serialnums) { # i.e. they have been flagged to generate claims
@@ -82,7 +74,7 @@ if (@serialnums) { # i.e. they have been flagged to generate claims
         if ( $err->{error} eq "no_email" ) {
             $template->param( error_claim => 'no_vendor_email' );
         } elsif ( $err->{error} =~ m|Bad or missing From address| ) {
-            $template->param( error_claim => 'no_loggedin_user_email' );
+            $template->param( error_claim => 'bad_or_missing_sender' );
         }
     } else {
         $template->param( info_claim => 1 );
@@ -105,9 +97,8 @@ $template->param(
         missingissues => \@missingissues,
         supplierid => $supplierid,
         claimletter => $claimletter,
-        branchloop   => $branchloop,
         additional_fields_for_subscription => $additional_fields,
-        csv_profiles => [ Koha::CsvProfiles->search({ type => 'sql' }) ],
+        csv_profiles => [ Koha::CsvProfiles->search({ type => 'sql', used_for => 'late_issues' }) ],
         letters => $letters,
         (uc(C4::Context->preference("marcflavour"))) => 1
         );