Update release notes for 26.05.01 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

.codespell-ignore

@@ -1,7 +1,6 @@
 ser
 thes
 nam
-rovider
 fo
 isnt
 wither
@@ -18,3 +17,12 @@ theses
 rouge
 connexion
 falsy
+aas
+carmel
+checkin
+laf
+lamba
+plack
+prfile
+requestor
+vai

C4/Auth_with_shibboleth.pm

@@ -312,7 +312,7 @@ Create some metadata for your koha instance (if you're in a single instance setu
 
 =item 2.
 
-Swap metadata with your Identidy Provider (IdP)
+Swap metadata with your Identify Provider (IdP)
 
 =item 3.
 
@@ -365,7 +365,7 @@ Note: The minimum you need here is a <matchpoint> block, containing a valid colu
 
 It should be as simple as that; you should now be able to login via shibboleth in the opac.
 
-If you need more help configuring your B<S>ervice B<P>rovider to authenticate against a chosen B<Id>entity B<P>rovider then it might be worth taking a look at the community wiki L<page|https://wiki.koha-community.org/wiki/Shibboleth_Configuration>
+If you need more help configuring your B<S>ervice B<P>rovider to authenticate against a chosen B<Id>entity B<P>rovider then it might be worth taking a look at the community wiki L<page|https://wiki.koha-community.org/wiki/Shibboleth_Configuration>  # codespell:ignore
 
 =head1 FUNCTIONS
 

C4/Context.pm

@@ -52,6 +52,10 @@ use Koha::Config::SysPrefs;
 use Koha::Config;
 use Koha::Database;
 
+# NOTE: The below list should match the corresponding options in the .pref file
+# for CSVDelimiter
+use constant ALLOWED_CSV_DELIMITERS => ( ';', 'tabulation', ',', '/', '\\', '#' );
+
 =head1 NAME
 
 C4::Context - Maintain and manipulate the context of a Koha script
@@ -485,6 +489,13 @@ sub delete_preference {
 
 sub csv_delimiter {
     my ( $self, $value ) = @_;
+
+    # Validate input against allowed delimiters
+    if ($value) {
+        my %allowed = map { $_ => 1 } ALLOWED_CSV_DELIMITERS;
+        $value = undef unless $allowed{$value};
+    }
+
     my $delimiter = $value || $self->preference('CSVDelimiter') || ',';
     $delimiter = "\t" if $delimiter eq 'tabulation';
     return $delimiter;

C4/Creators/Lib.pm

@@ -272,7 +272,7 @@ ADD_LAYOUTS:
 
 This function returns an arrayref whose elements are hashes containing all profiles upon success and 1 upon failure. Errors are logged
 to the Apache log. Two parameters are accepted. The first limits the field(s) returned. This parameter should be string of comma separated
-fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valid SQL 'WHERE' filter.
 
 NOTE: Do not pass in the keyword 'WHERE.'
 
@@ -320,7 +320,7 @@ sub get_all_image_names {
 
 This function returns an arrayref whose elements are hashes containing the batch_ids of current batches along with the item count
 for each batch upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+One parameter is accepted which limits the records returned based on a string containing a valid SQL 'WHERE' filter.
 
 NOTE: Do not pass in the keyword 'WHERE.'
 
@@ -352,7 +352,7 @@ sub get_batch_summary {
 
 This function returns an arrayref whose elements are hashes containing the label_ids of current labels along with the item count
 for each label upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+One parameter is accepted which limits the records returned based on a string containing a valid SQL 'WHERE' filter.
 
 NOTE: Do not pass in the keyword 'WHERE.'
 
@@ -405,7 +405,7 @@ sub get_label_summary {
 
 This function returns an arrayref whose elements are hashes containing the label_ids of current cards along with the item count
 for each card upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+One parameter is accepted which limits the records returned based on a string containing a valid SQL 'WHERE' filter.
 
 NOTE: Do not pass in the keyword 'WHERE.'
 

C4/Reports.pm

@@ -51,8 +51,8 @@ This will return a list of all the available delimiters.
 sub GetDelimiterChoices {
     my $default = C4::Context->preference('CSVDelimiter');
 
-    # NOTE: The below list should match the corresponding options in the .pref file
-    my @dels = ( ';', 'tabulation', ',', '/', '\\', '#' );
+    # Use the centralized list of allowed delimiters from C4::Context
+    my @dels = C4::Context::ALLOWED_CSV_DELIMITERS;
 
     return {
         values  => \@dels,

C4/Reserves.pm

@@ -1,7 +1,7 @@
 package C4::Reserves;
 
 # Copyright 2000-2002 Katipo Communications
-#           2006 SAN Ouest Provence
+#           2006 SAN Ouest Provence  # codespell:ignore
 #           2007-2010 BibLibre Paul POULAIN
 #           2011 Catalyst IT
 #
@@ -110,10 +110,10 @@ This modules provides some functions to deal with reservations.
   - priority >0      : then the reserve is at 1st stage, and not yet affected to any item.
              =0      : then the reserve is being dealt
   - found : NULL         : means the patron requested the 1st available, and we haven't chosen the item
-            T(ransit)    : the reserve is linked to an item but is in transit to the pickup branch
-            W(aiting)    : the reserve is linked to an item, is at the pickup branch, and is waiting on the hold shelf
-            F(inished)   : the reserve has been completed, and is done
-            P(rocessing) : reserved item has been returned using self-check machine and reserve needs to be confirmed
+            T (Transit)    : the reserve is linked to an item but is in transit to the pickup branch
+            W (Waiting)    : the reserve is linked to an item, is at the pickup branch, and is waiting on the hold shelf
+            F (Finished)   : the reserve has been completed, and is done
+            P (Processing) : reserved item has been returned using self-check machine and reserve needs to be confirmed
                            by librarian before notice is send and status changed to waiting.
                            Applicable only if HoldsNeedProcessingSIP system preference is set.
   - itemnumber : empty : the reserve is still unaffected to an item

C4/SocialData.pm

@@ -110,7 +110,7 @@ sub update_data {
             $i++;
         }
     }
-    say "$i data insered or updated";
+    say "$i data inserted or updated";
 }
 
 =head2 get_report

C4/Utils/DataTables/VirtualShelves.pm

@@ -16,7 +16,7 @@ sub search {
     my $start    = $params->{start};
     my $length   = $params->{length};
 
-    # If not logged in user, be carreful and set the borrowernumber to 0
+    # If not logged in user, be careful and set the borrowernumber to 0
     # to prevent private lists lack
     my $loggedinuser = C4::Context->userenv->{'number'} || 0;
 

Koha.pm

@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "26.05.00.000";
+$VERSION = "26.05.01.000";
 
 sub version {
     return $VERSION;

Koha/ClassSortRule.pm

@@ -23,7 +23,7 @@ use base qw(Koha::Object);
 
 =head1 NAME
 
-Koha::ClassSortRule Koha Classfication Sorting Rule Object class
+Koha::ClassSortRule Koha Classification Sorting Rule Object class
 
 =head1 API
 

Koha/ClassSource.pm

@@ -26,7 +26,7 @@ my $cache = Koha::Caches->get_instance();
 
 =head1 NAME
 
-Koha::ClassSource - Koha Classfication Source Object class
+Koha::ClassSource - Koha Classification Source Object class
 
 =head1 API
 

Koha/ClassSplitRule.pm

@@ -25,7 +25,7 @@ use base qw(Koha::Object);
 
 =head1 NAME
 
-Koha::ClassSplitRule Koha Classfication Splitting Rule Object class
+Koha::ClassSplitRule Koha Classification Splitting Rule Object class
 
 =head1 API
 

Koha/Devel/CI/IncrementalRuns.pm

@@ -140,6 +140,7 @@ sub get_files_to_test {
             @koha_commit_history;
             if ($last_build_commit) {
                 @files = @{ from_json( read_file("$self->{git_repo_dir}/$self->{test_dir}/$last_build_commit") ) };
+                @files = grep { $dev_files->get_filetype($_) eq $filetype } @files;
                 @files = $dev_files->remove_exceptions( \@files, $filetype );
                 push @files, $dev_files->ls_files( $filetype, "$last_build_commit HEAD" );
             } else {

Koha/EDI.pm

@@ -1603,7 +1603,7 @@ Koha::EDI
      Returns 1 on success undef on error
 
      Most usual cause of error is a line with no or incorrect budget codes
-     which woild cause order creation to abort
+     which would cause order creation to abort
      If other correct lines exist these are processed and the erroneous line os logged
 
 =head2 title_level_class

Koha/Edifact.pm

@@ -414,7 +414,7 @@ Edifact - Edifact message handler
 
 =head2 service_string_advice
 
-  Examines the Service String Advice returns 1 if the default separartors are in use
+  Examines the Service String Advice returns 1 if the default separators are in use
   undef otherwise
 
 =head2 segmentize

Koha/Edifact/Order.pm

@@ -149,7 +149,7 @@ sub interchange_header {
     $hdr .= $self->interchange_control_reference();
     $hdr .= $separator;
 
-    # Recipents reference password not usually used in edifact
+    # Recipients reference password not usually used in edifact
     $hdr .= q{+ORDERS};        # application reference
 
     #Edifact does not usually include the following

Koha/Exceptions/Patron.pm

@@ -21,7 +21,7 @@ use Exception::Class (
     },
     'Koha::Exceptions::Patron::FailedDeleteAnonymousPatron' => {
         isa         => 'Koha::Exceptions::Patron',
-        description => "Deleting patron failed, AnonymousPatron is not deleteable"
+        description => "Deleting patron failed, AnonymousPatron is not deletable"
     },
     'Koha::Exceptions::Patron::FailedDeleteProtectedPatron' => {
         isa         => 'Koha::Exceptions::Patron',

Koha/FrameworkPlugin.pm

@@ -56,7 +56,7 @@ Koha::FrameworkPlugin - Facilitate use of plugins in MARC/items editor
 
     This object support two code styles:
     - In the new style, the plugin returns a hashref with a builder and a
-      launcher key pointing to two anynomous subroutines.
+      launcher key pointing to two anonymous subroutines.
     - In the old style, the builder is subroutine plugin_javascript and the
       launcher is subroutine plugin. For each plugin the routines are
       redefined.

Koha/Item/Templates.pm

@@ -31,7 +31,7 @@ Koha::Item::Templates - Koha Item Template Object set class
 
 =head3 get_available
 
-Returns a hashref with keys 'owned' and 'shared' pointing to Koha::Item::Templats objects
+Returns a hashref with keys 'owned' and 'shared' pointing to Koha::Item::Templates objects
 representing templates owned by the user or shared to the user respectivetly.
 
 =cut

Koha/Objects.pm

@@ -374,7 +374,7 @@ sub empty {
 
 Koha::Objects->reset();
 
-resets iteration so the next call to next() will start agein
+resets iteration so the next call to next() will start again
 with the first object in a set.
 
 =cut

Koha/Patron/Restriction/Type.pm

@@ -55,7 +55,7 @@ sub delete {
             my $default = Koha::Patron::Restriction::Types->find( { is_default => 1 } )->code;
 
             # We can't use Koha objects here because Koha::Patron::Debarments
-            # is not a Koha object. So we'll do it old skool
+            # is not a Koha object. So we'll do it old school
             my $rows = C4::Context->dbh->do(
                 "UPDATE borrower_debarments SET type = ? WHERE type = ?",
                 undef, ( $default, $self->code )

Koha/Patrons/Import.pm

@@ -594,7 +594,7 @@ LINE: while ( my $borrowerline = <$handle> ) {
 
  my @csvcolumns = $self->prepare_columns({headerrow => $borrowerline, keycol => \%csvkeycol, errors => \@errors, });
 
-Returns an array of all column key and populates a hash of colunm key positions.
+Returns an array of all column key and populates a hash of column key positions.
 
 =cut
 

Koha/REST/V1/ERM/EHoldings/Titles/Local.pm

@@ -22,6 +22,7 @@ use Mojo::Base 'Mojolicious::Controller';
 use Koha::ERM::EHoldings::Titles;
 use Koha::BackgroundJob::CreateEHoldingsFromBiblios;
 use Koha::BackgroundJob::ImportKBARTFile;
+use Koha::SearchEngine::Indexer;
 
 use Scalar::Util qw( blessed );
 use Try::Tiny    qw( catch try );
@@ -95,6 +96,11 @@ sub add {
                 my $title = Koha::ERM::EHoldings::Title->new_from_api($body)
                     ->store( { create_linked_biblio => $create_linked_biblio } );
 
+                if ($create_linked_biblio) {
+                    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
+                    $indexer->index_records( $title->biblio_id, "specialUpdate", "biblioserver" );
+                }
+
                 $title->resources($resources);
 
                 my @extended_attributes =
@@ -161,6 +167,11 @@ sub update {
 
                 $title->set_from_api($body)->store( { create_linked_biblio => $create_linked_biblio } );
 
+                if ($create_linked_biblio) {
+                    my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
+                    $indexer->index_records( $title->biblio_id, "specialUpdate", "biblioserver" );
+                }
+
                 $title->resources($resources);
                 my @extended_attributes =
                     map { { 'id' => $_->{field_id}, 'value' => $_->{value} } } @{$extended_attributes};

Koha/Schema/Result/ReportsDictionary.pm

@@ -75,7 +75,7 @@ SQL snippet for us in reports
   is_nullable: 1
   size: 6
 
-Koha module this definition is for Circulation, Catalog, Patrons, Acquistions, Accounts)
+Koha module this definition is for (Circulation, Catalog, Patrons, Acquisitions, Accounts)
 
 =cut
 
@@ -117,8 +117,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-01-21 13:39:29
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7r8vJ2yWD3yQCyri+uNSRw
+# Created by DBIx::Class::Schema::Loader v0.07051 @ 2026-06-11 18:54:31
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NEd9fYq1gJ8G+SvtDIF8Ng
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration

Koha/SearchEngine/Elasticsearch.pm

@@ -58,6 +58,7 @@ use Search::Elasticsearch::Role::Cxn;
 }
 
 use Try::Tiny qw( catch try );
+use JSON::PP  ();
 use YAML::XS;
 
 use List::Util qw( sum0 );
@@ -272,6 +273,15 @@ sub get_elasticsearch_mappings {
             $mappings->{properties}{'match-heading'}             = _get_elasticsearch_field_config( 'search', 'text' );
             $mappings->{properties}{'subject-heading-thesaurus'} = _get_elasticsearch_field_config( 'search', 'text' );
         }
+
+        # Disable date and numeric detection to prevent Elasticsearch from
+        # auto-detecting field types in marc_data_array. Without this, a
+        # subfield value that looks like a date (e.g. "2024-01-15") causes
+        # ES to lock that subfield to type "date", and subsequent non-date
+        # values fail to index. (Bug 42485)
+        $mappings->{date_detection}    = JSON::PP::false;
+        $mappings->{numeric_detection} = JSON::PP::false;
+
         $all_mappings{ $self->index } = $mappings;
     }
     $self->sort_fields( \%{ $sort_fields{ $self->index } } );

Koha/SearchEngine/Elasticsearch/QueryBuilder.pm

@@ -609,7 +609,7 @@ our $koha_to_index_name = {
 };
 
 # Note that sears and aat map to 008/11 values here
-# but don't appear in C4/Headin/MARC21 thesaurus
+# but don't appear in C4/Heading/MARC21 thesaurus
 # because they don't have values in controlled field indicators
 # https://www.loc.gov/marc/authority/ad008.html
 our $thesaurus_to_value = {

Koha/Suggestion.pm

@@ -103,8 +103,12 @@ sub store {
 
             my $toaddress;
             if ( $emailpurchasesuggestions eq "BranchEmailAddress" ) {
+
+                # can be undef for branch=any suggestions
                 my $library = $result->library;
-                $toaddress = $library->inbound_email_address;
+                if ( $library && $library->inbound_email_address ) {
+                    $toaddress = $library->inbound_email_address;
+                }
             } elsif ( $emailpurchasesuggestions eq "KohaAdminEmailAddress" ) {
                 $toaddress = C4::Context->preference('ReplytoDefault')
                     || C4::Context->preference('KohaAdminEmailAddress');

acqui/addorderiso2709.pl

@@ -176,7 +176,7 @@ if ( $op eq "" ) {
     #import selected lines
     $template->param( 'basketno' => $cgiparams->{'basketno'} );
 
-    # Budget_id is mandatory for adding an order, we just add a default, the user needs to modify this aftewards
+    # Budget_id is mandatory for adding an order, we just add a default, the user needs to modify this afterwards
     my $budgets = GetBudgets();
     if ( scalar @$budgets == 0 ) {
         die "No budgets defined, can't continue";

admin/aqbudgetperiods.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2008 BibLibre, BibLibre, Paul POULAIN
-#                SAN Ouest Provence
+#                SAN Ouest Provence  # codespell:ignore
 #
 # This file is part of Koha.
 #

admin/check_parent_total.pl

@@ -91,7 +91,7 @@ else {
 
 # FIXME - we really need a better way to do this consistently
 # and across the board, be it bigints, Math::FixedPoint, a
-# modernized version of Math::Curency that isn't tied to the system
+# modernized version of Math::Currency that isn't tied to the system
 # locale, or something else.
 $total                 = sprintf( "%.2f", $total );
 $sub_unalloc           = sprintf( "%.2f", $sub_unalloc );

admin/smtp_servers.pl

@@ -107,6 +107,51 @@ if ( $op eq 'cud-add' ) {
             reason => 'invalid_id'
             };
     }
+} elsif ( $op eq 'cud-test_email' ) {
+    my $smtp_server_id = $input->param('smtp_server_id');
+    my $smtp_server;
+
+    $smtp_server = Koha::SMTP::Servers->find($smtp_server_id)
+        unless !$smtp_server_id;
+
+    if ($smtp_server) {
+        my $test_email_address = C4::Context->preference('KohaAdminEmailAddress');
+        my $smtp_transport     = $smtp_server->transport;
+
+        my $params = {
+            to        => $test_email_address,
+            from      => $test_email_address,
+            sender    => $test_email_address,
+            subject   => "Koha SMTP Test",
+            text_body => "Email is working."
+        };
+
+        my $email = Koha::Email->create($params);
+
+        try {
+            $email->send_or_die( { transport => $smtp_transport } );
+            push @messages,
+                {
+                type => 'message',
+                code => 'success_on_test'
+                };
+        } catch {
+            push @messages,
+                {
+                type => 'alert',
+                code => 'error_on_test'
+                };
+        };
+
+    } else {
+        push @messages,
+            {
+            type   => 'alert',
+            code   => 'error_on_test',
+            reason => 'invalid_id'
+            };
+    }
+    $op = 'list';
 } elsif ( $op eq 'cud-edit_save' ) {
 
     my $smtp_server_id = $input->param('smtp_server_id');

cataloguing/value_builder/EXAMPLE.pl

@@ -23,7 +23,7 @@ use C4::Auth   qw( get_template_and_user );
 use C4::Output qw( output_html_with_http_headers );
 
 # Example of framework plugin new style.
-# It should define and return at least one and normally two anynomous
+# It should define and return at least one and normally two anonymous
 # subroutines in a hash ref.
 # REQUEST: If you copy this code to construct a new plugin, please REMOVE
 # all comments copied from this file.

docs/teams.yaml

@@ -1565,30 +1565,31 @@ team:
     qa_manager:
       name: Martin Renvoize
     qa:
+      - name: Jonathan Druart
+      - name: Andrew Fuerste-Henry
       - name: Marcel de Rooy
       - name: Martin Renvoize
-      - name: Jonathan Druart
+      - name: Kyle M Hall
+      - name: Paul Derscheid
       - name: Laura Escamilla
       - name: Lucas Gass
-      - name: Tomás Cohen Arazi
-      - name: Lisette Scheer
       - name: Nick Clemens
-      - name: Paul Derscheid
-      - name: Emily Lamancusa
-      - name: David Cook
-      - name: Matt Blenkinsop
-      - name: Andrew Fuerste-Henry
-      - name: Brendan Lawlor
-      - name: Pedro Amorim
-      - name: Kyle M Hall
-      - name: Aleisha Amohia
-      - name: David Nind
-      - name: Baptiste Wojtkowski
-      - name: Jan Kissig
       - name: Katrin Fischer
+      - name: Baptiste Wojtkowski
+      - name: David Cook
+      - name: Lisette Scheer
+      - name: Emily Lamancusa
+      - name: Jan Kissig
       - name: Thomas Klausner
-      - name: Julian Maurice
+      - name: Brendan Lawlor
+      - name: David Nind
+      - name: Tomás Cohen Arazi
+      - name: Pedro Amorim
       - name: Owen Leonard
+      - name: John Vinke
+      - name: Matt Blenkinsop
+      - name: Alex Carver
+      - name: Victor Grousset
     documentation:
       name: David Nind
     documentation_team:
@@ -1671,3 +1672,82 @@ team:
       name: David Nind
     newsletter:
       name: Michael Kuhn
+  26.11:
+    manager:
+      name: Pedro Amorim
+    manager_assistants:
+      - name: Tomás Cohen Arazi
+      - name: Martin Renvoize
+    maintainer:
+      - version: 26.05
+        name: Lucas Gass
+      - version: 25.11
+        name: Baptiste Wojtkowski
+      - version: 25.05
+        name: "Wainui Witika-Park (Catalyst IT)"
+      - version: 24.11
+        name: Fridolin Somers
+    maintainer_assistants:
+      - version: 26.05
+        name: Jacob O'Mara
+      - version: 25.05
+        name: Alex Buckley & Aleisha Amohia (Catalyst IT)
+    qa_manager:
+      name: Lisette Scheer
+    qa:
+      - name: Lucas Gass
+      - name: Laura Escamilla
+      - name: Kyle M Hall
+      - name: Baptiste Wojtkowski
+      - name: Victor Grousset
+      - name: David Cook
+      - name: Andrew Fuerste-Henry
+      - name: Brendan Lawlor
+      - name: Thomas Klausner
+      - name: Paul Derscheid
+      - name: Jan Kissig
+      - name: Jacob O'Mara
+      - name: Nick Clemens
+      - name: Tomás Cohen Arazi
+      - name: Marcel de Rooy
+      - name: Emily Lamancusa
+      - name: Aleisha Amohia
+      - name: Martin Renvoize
+      - name: David Nind
+    security_manager:
+      - name: David Cook
+    te:
+      - area: Elasticsearch/OpenSearch
+        name: Fridolin Somers
+      - area: SIP2
+        name: Kyle M Hall
+      - area: EDI
+        name: Kyle M Hall
+      - area: POS
+        name: Martin Renvoize
+    bugwrangler:
+      - name: Michaela Sieber
+      - name: Laura Escamilla
+    documentation:
+      name: Aude Charillon
+    documentation_team:
+      - name: Caroline Cyr La Rose
+      - name: David Nind
+      - name: Philip Orr
+    meeting_facilitator:
+      - name: Paul Derscheid
+    ktd:
+      - name: Tomás Cohen Arazi
+      - name: Jonathan Druart
+    wiki:
+      - name: Thomas Dukleth
+      - name: George Williams
+    website:
+      - name: Lawrence O'Regan-Lloyd
+    newsletter:
+      name: Michael Kuhn
+    social_media:
+      name: David Nind
+    accessibility_advocates:
+      - name: Laura Escamilla
+      - name: Brendan Lawlor

installer/data/mysql/db_revs/240600014.pl

@@ -4,7 +4,7 @@ use Koha::Installer::Output qw(say_warning say_success say_info);
 return {
     bug_number  => "33363",
     description =>
-        "Split suggestions_manage into three separate permissions for creating, updating, and deleting suggetions",
+        "Split suggestions_manage into three separate permissions for creating, updating, and deleting suggestions",
     up => sub {
         my ($args) = @_;
         my ( $dbh, $out ) = @$args{qw(dbh out)};

installer/data/mysql/db_revs/251200059.pl

@@ -28,9 +28,17 @@ return {
             }, undef, $local_number_map_id
             );
 
-            my $index_name = $Koha::SearchEngine::Elasticsearch::BIBLIOS_INDEX;
-            my $indexer    = Koha::SearchEngine::Elasticsearch::Indexer->new( { index => $index_name } );
-            $indexer->update_mappings();
+            # We do want to update the mappings in the DB in case ES gets switched on
+            # but just skip the ES engine update if ES not enabled
+            my $searchengine =
+                $dbh->selectrow_array(q|SELECT value FROM systempreferences WHERE variable = 'SearchEngine'|);
+            if ( $searchengine eq 'Elasticsearch' ) {
+                my $index_name = $Koha::SearchEngine::Elasticsearch::BIBLIOS_INDEX;
+                my $indexer    = Koha::SearchEngine::Elasticsearch::Indexer->new( { index => $index_name } );
+                $indexer->update_mappings();
+            } else {
+                say $out "ES disabled, mappings not updated";
+            }
             say $out "Updated ES mappings to make local-number sortable";
         } elsif ( !defined $local_number_map_id ) {
             say_warning( $out, "No mapping defined for local-number" );

installer/data/mysql/db_revs/260500001.pl

@@ -0,0 +1,21 @@
+use Modern::Perl;
+use Koha::Installer::Output qw(say_warning say_success say_info);
+
+return {
+    bug_number  => "42764",
+    description => "Fix typo in reports_dictionary.report_area column comment",
+    up          => sub {
+        my ($args) = @_;
+        my ( $dbh, $out ) = @$args{qw(dbh out)};
+
+        $dbh->do(
+            q{
+            ALTER TABLE `reports_dictionary`
+            MODIFY COLUMN `report_area` varchar(6) DEFAULT NULL
+                COMMENT 'Koha module this definition is for (Circulation, Catalog, Patrons, Acquisitions, Accounts)'
+        }
+        );
+
+        say_success( $out, "Fixed typo in reports_dictionary.report_area column comment" );
+    },
+};

installer/data/mysql/db_revs/260501000.pl

@@ -0,0 +1,7 @@
+use Modern::Perl;
+
+return {
+    bug_number  => undef,
+    description => 'Koha 26.05.01 release',
+    up          => sub { },
+    }

installer/data/mysql/en/mandatory/sample_notices.yml

@@ -1996,7 +1996,7 @@ tables:
             - " <tr></tr>"
             - " <tr>"
             - "    <th colspan=\"2\" class=\"centerednames\">"
-            - "        <h2><u>Refund Payout Receipt</u></h2>"
+            - "        <h2><u>Refund payout receipt</u></h2>"
             - "    </th>"
             - " </tr>"
             - " <tr></tr>"

installer/data/mysql/kohastructure.sql

@@ -5804,7 +5804,7 @@ CREATE TABLE `reports_dictionary` (
   `date_created` datetime DEFAULT NULL COMMENT 'date and time this definition was created',
   `date_modified` datetime DEFAULT NULL COMMENT 'date and time this definition was last modified',
   `saved_sql` mediumtext DEFAULT NULL COMMENT 'SQL snippet for us in reports',
-  `report_area` varchar(6) DEFAULT NULL COMMENT 'Koha module this definition is for Circulation, Catalog, Patrons, Acquistions, Accounts)',
+  `report_area` varchar(6) DEFAULT NULL COMMENT 'Koha module this definition is for (Circulation, Catalog, Patrons, Acquisitions, Accounts)',
   PRIMARY KEY (`id`),
   KEY `dictionary_area_idx` (`report_area`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css

@@ -341,3 +341,9 @@ fieldset {
 #cataloguing_additem_itemlist {
 	overflow : visible !important;
 }
+
+@media print {
+    .no-print {
+        display: none;
+    }
+}

koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc

@@ -430,7 +430,7 @@
                               render: function (data, type, row, meta) {
                                   let node = "";
                                   let item_type_description = row._strings.item_type_id ? row._strings.item_type_id.str : row.item_type_id;
-                                  if (Koha.prefs.noItemTypeImages) {
+                                  if (!Koha.prefs.noItemTypeImages) {
                                       let image_location = item_type_image_locations[row.item_type_id];
                                       node += image_location ? '<img class="itemtype-image" src="%s" alt="" /> '.format(escape_str(image_location), escape_str(item_type_description), escape_str(item_type_description)) : "";
                                   }

koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc

@@ -78,12 +78,12 @@
                         [% CASE 'sort1' %]
                             <li>
                                 <label>Sort 1:</label>
-                                [% PROCESS 'av-build-dropbox.inc' no_id => 1, name="sort1_filter", category="Bsort1", empty=1, size = 20 %]
+                                [% PROCESS 'av-build-dropbox.inc' no_id => 1, name="sort1_filter", default="", category="Bsort1", empty=1, size = 20 %]
                             </li>
                         [% CASE 'sort2' %]
                             <li>
                                 <label>Sort 2:</label>
-                                [% PROCESS 'av-build-dropbox.inc' no_id => 1, name="sort2_filter", category="Bsort2", empty=1, size = 20 %]
+                                [% PROCESS 'av-build-dropbox.inc' no_id => 1, name="sort2_filter", default="", category="Bsort2", empty=1, size = 20 %]
                             </li>
                         [% CASE 'search_field' %]
                             <li> [% INCLUDE patron_fields_dropdown %] </li>

koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc

@@ -6,12 +6,11 @@
         [% Koha.Preference('IntranetSlipPrinterJS') | $raw %]
     [% ELSE %]
         let autoprint = true;
-        $( window ).load(function() {
+        window.addEventListener('load', function() {
             window.print();
             window.onafterprint = function () {
                 window.close();
             }
-            setTimeout('window.close()', 1000); //Hack from Chrome < 63
         });
     [% END %]
 </script>

koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

@@ -896,7 +896,7 @@
             <li> The <a href="http://www.myacpl.org/">Athens County Public Libraries</a>, Ohio, USA (MARC sponsorship, documentation, template maintenance)</li>
             <li> <a href="http://www.emn.fr">EMN (Ecole des Mines de Nantes)</a>, France (Suggestions, Stats wizards and improved LDAP sponsorship) </li>
             <li> <a href="http://www.mines-paristech.fr">Mines Paristech (previously Ecole Nationale Supérieure des Mines de Paris)</a>, France (bibliographic frameworks, MARC authorities, OPAC basket, Serials sponsorship) </li>
-            <li> <a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a>, France (Koha 3.0 enhancements to patrons and holds modules) </li>
+            <li> <a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a>, France (Koha 3.0 enhancements to patrons and holds modules) [%# codespell:ignore provence %]</li>
             <li> The <a href="http://ccfls.org">Crawford County Federated Library System</a>, PA, USA (Koha 3.0 Zebra Integration sponsorship)</li>
             <li> The <a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a>, OH, USA (Koha 3.0 beta testing)</li>
             <li> The <a href="http://library.neu.edu.tr">Near East University</a>, Cyprus</li>

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

@@ -126,16 +126,20 @@
                             [% IF edifact_enabled && edifact_messages.size > 0 %]
                                 [% SET quote_messages = [] %]
                                 [% SET order_messages = [] %]
+                                [% SET ordrsp_messages = [] %]
                                 [% FOR message IN edifact_messages %]
                                     [% IF message.message_type == 'QUOTE' %]
                                         [% quote_messages.push(message) %]
                                     [% ELSIF message.message_type == 'ORDERS' %]
                                         [% order_messages.push(message) %]
+                                    [% ELSIF message.message_type == 'ORDRSP' %]
+                                        [% ordrsp_messages.push(message) %]
                                     [% END %]
                                 [% END %]
 
-                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
-                                    <!-- Both quote and order messages exist -->
+                                [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %]
+                                [% IF total_messages > 1 %]
+                                    <!-- Multiple messages exist - show dropdown -->
                                     <div class="btn-group">
                                         <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button>
                                         <ul class="dropdown-menu">
@@ -153,6 +157,13 @@
                                                     </a>
                                                 </li>
                                             [% END %]
+                                            [% FOR message IN ordrsp_messages %]
+                                                <li>
+                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
+                                                        <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %])
+                                                    </a>
+                                                </li>
+                                            [% END %]
                                         </ul>
                                     </div>
                                 [% ELSIF quote_messages.size > 0 %]
@@ -169,6 +180,13 @@
                                             <i class="fa fa-shopping-cart"></i> View EDIFACT order
                                         </button>
                                     </div>
+                                [% ELSIF ordrsp_messages.size > 0 %]
+                                    <!-- Only order response messages exist -->
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
+                                            <i class="fa fa-reply"></i> View EDIFACT order response
+                                        </button>
+                                    </div>
                                 [% END %]
                             [% END %]
 
@@ -338,16 +356,20 @@
                             [% IF edifact_enabled && edifact_messages.size > 0 %]
                                 [% SET quote_messages = [] %]
                                 [% SET order_messages = [] %]
+                                [% SET ordrsp_messages = [] %]
                                 [% FOR message IN edifact_messages %]
                                     [% IF message.message_type == 'QUOTE' %]
                                         [% quote_messages.push(message) %]
                                     [% ELSIF message.message_type == 'ORDERS' %]
                                         [% order_messages.push(message) %]
+                                    [% ELSIF message.message_type == 'ORDRSP' %]
+                                        [% ordrsp_messages.push(message) %]
                                     [% END %]
                                 [% END %]
 
-                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
-                                    <!-- Both quote and order interchanges exist -->
+                                [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %]
+                                [% IF total_messages > 1 %]
+                                    <!-- Multiple messages exist - show dropdown -->
                                     <div class="btn-group">
                                         <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button>
                                         <ul class="dropdown-menu">
@@ -365,10 +387,17 @@
                                                     </a>
                                                 </li>
                                             [% END %]
+                                            [% FOR message IN ordrsp_messages %]
+                                                <li>
+                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
+                                                        <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %])
+                                                    </a>
+                                                </li>
+                                            [% END %]
                                         </ul>
                                     </div>
                                 [% ELSIF quote_messages.size > 0 %]
-                                    <!-- Only quote interchanges exist -->
+                                    <!-- Only quote messages exist -->
                                     <div class="btn-group">
                                         <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
                                             <i class="fa fa-quote-left"></i> View EDIFACT quote
@@ -381,6 +410,13 @@
                                             <i class="fa fa-shopping-cart"></i> View EDIFACT order
                                         </button>
                                     </div>
+                                [% ELSIF ordrsp_messages.size > 0 %]
+                                    <!-- Only order response messages exist -->
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
+                                            <i class="fa fa-reply"></i> View EDIFACT order response
+                                        </button>
+                                    </div>
                                 [% END %]
                             [% END %]
                         [% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt

@@ -128,7 +128,7 @@
                             orderable: true,
                             render: function (data, type, row, meta) {
                                 let rendered = "";
-                                if (row.type == "QUOTE" || row.type == "ORDERS") {
+                                if (row.type == "QUOTE" || row.type == "ORDERS" || row.type == "ORDRSP") {
                                     if (row.basket_id) {
                                         rendered = '<a href="/cgi-bin/koha/acqui/basket.pl?basketno=' + row.basket_id + '">' + _("Basket") + ": " + row.basket_id + "</a>";
                                     }

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt

@@ -72,7 +72,7 @@
 
             [% IF edifact_errors.size > 0 %]
                 <div class="alert alert-warning">
-                    <h4><i class="fa fa-exclamation-triangle"></i> Processing Errors</h4>
+                    <h4><i class="fa fa-exclamation-triangle"></i> Processing errors</h4>
                     <ul>
                         [% FOREACH error IN edifact_errors %]
                             <li>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt

@@ -327,7 +327,7 @@
             <fieldset class="rows" id="match_checks">
                 <h4>Required match checks</h4>
                 [% IF ( edit_matching_rule ) %]
-                    [% SET p_style = matchpoints ? 'display:none;' : 'display:block;' %]
+                    [% SET p_style = matchchecks ? 'display:none;' : 'display:block;' %]
                     <p id="addMatchCheck" style="[% p_style | html %]">
                         <a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a></p
                     >

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref

@@ -99,7 +99,7 @@ Cataloging:
               choices:
                   1: specific item
                   0: bibliographic record
-            - as the authoritative item type (for determining circulation and fine rules, for displaying an item type icon on either opac detail or results page, etc).
+            - as the authoritative item type (for determining circulation and fine rules, for displaying an item type icon on either OPAC detail or results page, etc).
         -
             - Map the MARC subfields
             - pref: itemcallnumber
@@ -278,7 +278,7 @@ Cataloging:
             - pref: OpacSuppressionByIPRange
               class: short
             - (Leave blank if not used. Define a range like <code>192.168.</code>.)
-            - <br />Redirect the opac detail page for suppressed records to
+            - <br />Redirect the OPAC detail page for suppressed records to
             - pref: OpacSuppressionRedirect
               choices:
                   1: "an explanatory page ('This record is blocked')."

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref

@@ -369,7 +369,7 @@ Circulation:
                   now: the current date
             - . For automatic renewals see <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutomaticRenewalPeriodBase">AutomaticRenewalPeriodBase.</a>
         -
-            - When renewing checkouts automaticaly, base the new due date on
+            - When renewing checkouts automatically, base the new due date on
             - pref: AutomaticRenewalPeriodBase
               choices:
                   date_due: the old due date of the checkout

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref

@@ -83,7 +83,7 @@ Enhanced content:
         -
             - Access Novelist Select using user profile
             - pref: NovelistSelectProfile
-            - on the opac
+            - on the OPAC
         -
             - Access Novelist Select using user profile
             - pref: NovelistSelectStaffProfile

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref

@@ -32,7 +32,7 @@ Tools:
             - Include the stylesheet at
             - pref: AllNoticeStylesheet
               class: url
-            - on notices regarless of message transport type. (This should be a complete URL, starting with <code>http://</code>.)
+            - on notices regardless of message transport type. (This should be a complete URL, starting with <code>http://</code>.)
         -
             - "Include the following CSS on all notices regardless of message transport:"
             - pref: AllNoticeCSS

koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt

@@ -60,10 +60,14 @@
             [% SWITCH m.code %]
             [% CASE 'error_on_update' %]
                 <span>An error occurred trying to open the server for editing. The passed ID is invalid.</span>
+            [% CASE 'error_on_test' %]
+                <span>Failed to send test email.</span>
             [% CASE 'error_on_insert' %]
                 <span>An error occurred when adding the server. The library already has an SMTP server set.</span>
             [% CASE 'success_on_update' %]
                 <span>Server updated successfully.</span>
+            [% CASE 'success_on_test' %]
+                <span>Test email sent successfully to <em>KohaAdminEmailAddress</em>.</span>
             [% CASE 'success_on_insert' %]
                 <span>Server added successfully.</span>
             [% CASE %]
@@ -435,6 +439,13 @@
                                 encodeURIComponent(row.name.escapeHtml()) +
                                 '"><i class="fa fa-trash-can" aria-hidden="true"></i> ' +
                                 _("Delete") +
+                                "</a>" +
+                                "\n";
+                            result +=
+                                '<a class="btn btn-default btn-xs submit-form-link" role="button" href="#" data-action="/cgi-bin/koha/admin/smtp_servers.pl" data-method="post" data-op="cud-test_email" data-smtp_server_id="' +
+                                encodeURIComponent(row.smtp_server_id) +
+                                '"><i class="fa fa-check-square" aria-hidden="true"></i> ' +
+                                _("Send test email") +
                                 "</a>";
                             return result;
                         },

koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt

@@ -72,7 +72,7 @@
                 <legend>Merge reference</legend>
                 <ol>
                     <li class="radio"
-                        ><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1"
+                        ><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" class="change_framework" data-framework="[% frameworkcode1 | html %]" /><label for="mergereference1"
                             >[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %][% subtitl1 | html %][% END %] (<a
                                 href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]"
                                 title="MARC"
@@ -83,7 +83,7 @@
                         ></li
                     >
                     <li class="radio"
-                        ><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2"
+                        ><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" class="change_framework" data-framework="[% frameworkcode2 | html %]" /><label for="mergereference2"
                             >[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %][% subtitl2 | html %][% END %] (<a
                                 href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | uri %]"
                                 title="MARC"
@@ -146,7 +146,7 @@
     [% Asset.js("js/authorities.js") | $raw %]
     [% Asset.js("js/merge-record.js") | $raw %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        // When submiting the form
+        // When submitting the form
             function mergeformsubmit() {
                 $('#tabs').remove();
             }
@@ -166,11 +166,15 @@
             if( $("#tabs .tab-pane.active").length < 1 ){
                 $("#tabs a:first").tab("show");
             }
+            $(".change_framework").on("click", function () {
+                let framework = $(this).data("framework");
+                changeFramework(framework);
+            });
         });
 
 
         function changeFramework(fw) {
-            $("#Frameworks").val(fw);
+            $("#frameworkcode").val(fw);
         }
     </script>
 [% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt

@@ -1250,7 +1250,7 @@
                     </div>
                     <div class="modal-footer">
                         <button type="submit" class="btn btn-primary">Submit</button>
-                        <button class="btn btn-default" data-bs-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
                     </div>
                 </form>
             </div>

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt

@@ -297,7 +297,7 @@
                 </div>
                 <!-- /.page-section -->
             [% ELSE %]
-                <div class="alert alert-info" id="searchresult-breeding"> [% tx("No reservoir search results for '{query}'", {query = query}) | html %] </div>
+                <div class="alert alert-info"> [% tx("No reservoir search results for '{query}'", {query = query}) | html %] </div>
             [% END # /IF breeding_loop %]
         </div>
         <!-- /#searchresult-breeding -->

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt

@@ -131,7 +131,7 @@
                                 [% END %]
                             [% END %]
                             [% IF can_be_edited %]
-                                [% tr_class.push = 'editable' %]
+                                [% tr_class.push('editable') %]
                             [% END %]
                             <tr id="row[% item.itemnumber | html %]" class="[% tr_class.join(' ') | html %]" title="[% tr_title | html %]">
                                 [% UNLESS can_be_edited %]

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt

@@ -286,7 +286,7 @@
                 return missing;
             }
 
-            // When submiting the form
+            // When submitting the form
             function mergeformsubmit() {
                 var missing = check_mandatory();
                 var alert_msg = '';

koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt

@@ -167,7 +167,7 @@
                 <span>To be staged ([% to_be_staged.count | html %])</span>
             [% END %]
             [% WRAPPER tab_item tabname= "staged-and-ready" bt_active = staged_and_ready_active %]
-                <span>Staged & ready ([% staged_and_ready.count | html %])</span>
+                <span>Staged and ready ([% staged_and_ready.count | html %])</span>
             [% END %]
             [% WRAPPER tab_item tabname= "patron-is-outside" bt_active = patron_is_outside_active %]
                 <span>Patron is outside ([% patron_outside.count | html %])</span>

koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt

@@ -59,7 +59,7 @@
             </div>
         [% END %]
 
-        <form name="payForm" id="payForm" method="post" action="/cgi-bin/koha/pos/pay.pl">
+        <form name="payForm" id="payForm" method="post" action="/cgi-bin/koha/pos/pay.pl" [% IF Koha.Preference('FinePaymentAutoPopup') %]target="_blank"[% END %]>
             [% INCLUDE 'csrf-token.inc' %]
             <input type="hidden" name="op" value="cud-pay" />
             <div class="row">
@@ -240,11 +240,6 @@
     </div>
 </div>
 
-[% IF payment_id && Koha.Preference('FinePaymentAutoPopup') %]
-    <!-- Automatic Print Receipt -->
-    <a id="printReceipt" style="display: none" href="#"></a>
-[% END %]
-
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'format_price.inc' %]
     [% INCLUDE 'datatables.inc' %]
@@ -522,17 +517,22 @@
                             })
                             .appendTo("#payForm");
                     });
+
+                    if (Koha.prefs.FinePaymentAutoPopup) {
+                        // Form submits to new tab; reset this page for the next transaction
+                        setTimeout(function () {
+                            sale_kohaTable.api().clear().draw();
+                            $("#tendered").val("");
+                            $("#paid").val(zero_formatted);
+                            $("#change").html(zero_formatted);
+                            $(':input[name="change"]').val(zero_formatted);
+                            checked = false;
+                        }, 0);
+                    }
+
                     return true;
                 }
             });
-
-            if (payment_id && Koha.prefs.FinePaymentAutoPopup) {
-                $("#printReceipt").click(function () {
-                    var win = window.open(`/cgi-bin/koha/pos/printreceipt.pl?action=print&accountlines_id=${payment_id}&tendered=${tendered}&change=${change}`, "_blank");
-                    win.focus();
-                });
-                $("#printReceipt").click();
-            }
         });
     </script>
 [% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt

@@ -38,8 +38,41 @@
     [% END %]
 </div>
 
+[% IF error_msg %]
+    <div class="alert alert-danger">
+        <p>[% error_msg | html %]</p>
+        <button id="close-window" class="btn btn-secondary" onclick="window.close();"> [% t("Close") | html %] </button>
+    </div>
+[% ELSE %]
+    <div class="no-print" style="margin-top: 20px; text-align: center;">
+        <button id="print-receipt" class="btn btn-primary"> <i class="fa fa-print"></i> [% t("Print receipt") | html %] </button>
+        <button id="close-window" class="btn btn-secondary" onclick="window.close();"> [% t("Close") | html %] </button>
+    </div>
+[% END %]
+
 [% MACRO jsinclude BLOCK %]
-    [% INCLUDE 'slip-print.inc' #printThenClose %]
+    <script nonce="[% Koha.CSPNonce | $raw %]">
+        [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
+            [% Koha.Preference('IntranetSlipPrinterJS') | $raw %]
+        [% ELSE %]
+            function doPrint() {
+                window.print();
+            }
+
+            window.onafterprint = () => {
+                window.close();
+            };
+
+            window.addEventListener('load', () => {
+                if ( [% autoprint | html %] == 1 ) {
+                    doPrint();
+                }
+            });
+
+            document.getElementById('print-receipt')
+                .addEventListener('click', doPrint);
+        [% END %]
+    </script>
 [% END %]
 
 [% INCLUDE 'intranet-bottom.inc' %]

koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt

@@ -247,7 +247,7 @@
                         <a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql" class="btn btn-primary">Create report from SQL</a>
                     [% END %]
 
-                    <h2>Reports Dictionary</h2>
+                    <h2>Reports dictionary</h2>
                     <p>Use the reports dictionary to define custom criteria to use in your reports</p>
                     <a href="/cgi-bin/koha/reports/dictionary.pl?op=list" class="btn btn-primary">View dictionary</a>
                 [% END # /IF (start) %]
@@ -1636,25 +1636,25 @@
                 [% IF ( errors ) %]
                     <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
                         <div class="alert alert-warning">
-                            <strong>The following error was encountered:</strong><br />
+                            <h1>The following error was encountered:</h1>
                             [% FOREACH error IN errors %]
                                 [% IF ( error.duplicate_running_report ) %]
-                                    This report is already running. Please wait for it to finish before running it again.
+                                    <p>This report is already running. Please wait for it to finish before running it again.</p>
                                 [% ELSIF ( error.total_running_reports_limit_exceeded ) %]
-                                    You have too many reports running at the moment. Please wait for some of them to finish before running this report again.
+                                    <p>You have too many reports running at the moment. Please wait for some of them to finish before running this report again.</p>
                                 [% ELSIF ( error.sqlerr ) %]
-                                    This report contains the SQL keyword <strong>[% error.sqlerr | html %]</strong>.<br />
-                                    Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed.<br />
-                                    Please return to the &quot;Saved Reports&quot; screen and delete this report or retry creating a new one.
+                                    <p>This report contains an SQL keyword: <strong>[% error.sqlerr | html %]</strong>. </p>
+                                    <p>Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed.</p>
+                                    <p>Please delete this report or retry creating a new one.</p>
                                 [% ELSIF ( error.queryerr ) %]
-                                    <span>The database returned the following error:</span> <br />
-                                    [% error.queryerr | html %]<br />Please check the log for further details.
+                                    <h2>SQL error:</h2>
+                                    <p>[% error.queryerr | html %]</p>
+                                    <p>Please check the log for further details.</p>
                                 [% ELSIF ( error.cache_expiry ) %]
-                                    Please select a cache expiry less than 30 days.
+                                    <p>Please select a cache expiry less than 30 days.</p>
                                 [% ELSIF ( error.passworderr ) %]
-                                    The column selection in this report includes a password field.<br />
-                                    The report cannot be executed due to security risks.<br />
-                                    Please edit this report and ensure no password columns have been selected.
+                                    <p>The column selection in this report includes a password field.</p>
+                                    <p>The report cannot be executed due to security risks. Please edit this report and ensure no password columns have been selected.</p>
                                 [% ELSE %]
 
                                 [% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt

@@ -606,7 +606,7 @@
                                     <label for="branchcode">Library:</label>
                                     <select name="branchcode" id="branchcode">
                                         <option value="">Any</option>
-                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => suggestion.branchcode ) %]
+                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => suggestion.branchcode || default_branch ) %]
                                     </select>
                                 </li>
                                 <li> [% PROCESS funds_dropdown %] </li>

koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt

@@ -349,7 +349,7 @@
             });
         });
     </script>
-    [% IF ( show ) %]
+    [% IF op == 'cud-action' %]
         [%- # Loop over fields which may have plugin JavaScript -%]
         [%- UNLESS (too_many_items_process) -%]
             [%- FOREACH subfield IN subfields -%]

koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt

@@ -220,7 +220,7 @@
                                 <input type="hidden" name="item_action" value="ignore" />
                             [% END %]
                         </ol>
-                        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Apply different matching rules" /></fieldset>
+                        <fieldset class="action"><input type="submit" class="btn btn-secondary" value="Apply different matching rules" /></fieldset>
                     </fieldset>
                 </form>
                 <div>
@@ -256,7 +256,7 @@
                             </fieldset>
                         [% END %]
                         <fieldset class="action">
-                            <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
+                            <input type="submit" class="btn btn-primary" name="mainformsubmit" value="Import this batch into the catalog" />
                         </fieldset>
                     </form>
                     <!-- /#import_batch_form -->

koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt

@@ -15,7 +15,7 @@
                 "dt_shelfname":
                     "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% d.shelfnumber | html %]'>[% d.shelfname | html | $To %]</a>",
                 "dt_count":
-                    "[% tnx('{count} item', '{count} items', count, { count = d.count }) | $raw %]",
+                    "[% tnx('{count} item', '{count} items', d.count, { count = d.count }) | $raw %]",
                 "dt_is_shared":
                     "[% IF d.public %]<span>Public</span>[% ELSIF d.is_shared %]<span>Shared</span>[% ELSE %]<span>Private</span>[% END %]",
                 "dt_owner":

koha-tmpl/intranet-tmpl/prog/js/browser.js

@@ -6,7 +6,7 @@ KOHA.browser = function (searchid, biblionumber) {
     var me = this;
 
     if (!searchid) {
-        // We are generating a clean numeric datetime representation so we can easily compare them using the default javascript lexigraphic sorter.
+        // We are generating a clean numeric datetime representation so we can easily compare them using the default javascript lexicographic sorter.
         searchid = "scs_" + new Date().getTime(); // scs for Staff Client Search
     }
     me.searchid = searchid;

koha-tmpl/intranet-tmpl/prog/js/cataloging.js

@@ -330,7 +330,7 @@ function CloneField(index, hideMarc, advancedMARCEditor) {
                 // do nothing if label does not exist.
             }
 
-            // setting its '+' and '-' buttons
+            // setting its '+', '-' and 'buttonDot' buttons
             try {
                 var anchors = divs[i].getElementsByTagName("a");
                 for (var j = 0; j < anchors.length; j++) {
@@ -352,6 +352,13 @@ function CloneField(index, hideMarc, advancedMARCEditor) {
                                 divs[i].getAttribute("id") +
                                 "'); return false;"
                         );
+                    } else if (
+                        anchors[j].getAttribute("id").match(/^buttonDot/)
+                    ) {
+                        anchors[j].setAttribute(
+                            "id",
+                            anchors[j].getAttribute("id") + new_key
+                        );
                     }
                 }
             } catch (e) {
@@ -843,12 +850,12 @@ $(document).ready(function () {
     // We use delegated event handlers here so that dynamically added elements
     // (like when cloning a field or a subfield) respond to these events
     // without having to re-attach events manually
-    $(".marc_editor").on(
+    $(".marc_editor, .item_edit_form").on(
         "click",
         ".tag_editor.framework_plugin",
         callClickPluginEventHandler
     );
-    $(".marc_editor").on(
+    $(".marc_editor, .item_edit_form").on(
         "focusin focusout change mousedown mouseup keydown keyup",
         "input.input_marceditor.framework_plugin",
         callPluginEventHandler

koha-tmpl/intranet-tmpl/prog/js/datatables.js

@@ -1251,6 +1251,7 @@ function _dt_save_restore_state(table_settings, external_filter_nodes = {}) {
         }
 
         state = _dt_force_visibility(table_settings, this.api(), state);
+        state.start = 0;
 
         return state;
     };

koha-tmpl/intranet-tmpl/prog/js/fetch/http-client.js

@@ -80,7 +80,8 @@ class HttpClient {
                             let json = JSON.parse(text);
                             message =
                                 json.error ||
-                                json.errors.map(e => e.message).join("\n") ||
+                                json.errors?.map(e => e.message).join("\n") ||
+                                json.message ||
                                 json;
                         } else {
                             message = response.statusText;

koha-tmpl/intranet-tmpl/prog/js/holds.js

@@ -1387,17 +1387,17 @@ async function load_patron_holds_table(biblio_id, split_data) {
                                     select += '" disabled="disabled">';
                                     selected = " selected='selected' ";
                                     value = "T";
-                                    desc = "In transit";
+                                    desc = __("In transit");
                                 } else if (data == i && row.status == "P") {
                                     select += '" disabled="disabled">';
                                     selected = " selected='selected' ";
                                     value = "P";
-                                    desc = "In processing";
+                                    desc = __("In processing");
                                 } else if (data == i && row.status == "W") {
                                     select += '" disabled="disabled">';
                                     selected = " selected='selected' ";
                                     value = "W";
-                                    desc = "Waiting";
+                                    desc = __("Waiting");
                                 } else if (data == i && !row.status) {
                                     select += '">';
                                     selected = " selected='selected' ";
@@ -1426,13 +1426,19 @@ async function load_patron_holds_table(biblio_id, split_data) {
                         } else {
                             if (row.status == "T") {
                                 select +=
-                                    '" disabled="disabled"><option value="T" selected="selected">In transit</option></select>';
+                                    '" disabled="disabled"><option value="T" selected="selected">' +
+                                    __("In transit") +
+                                    "</option></select>";
                             } else if (row.status == "P") {
                                 select +=
-                                    '" disabled="disabled"><option value="P" selected="selected">In processing</option></select>';
+                                    '" disabled="disabled"><option value="P" selected="selected">' +
+                                    __("In processing") +
+                                    "</option></select>";
                             } else if (row.status == "W") {
                                 select +=
-                                    '" disabled="disabled"><option value="W" selected="selected">Waiting</option></select>';
+                                    '" disabled="disabled"><option value="W" selected="selected">' +
+                                    __("Waiting") +
+                                    "</option></select>";
                             } else {
                                 if (
                                     HoldsSplitQueue !== "nothing" &&
@@ -1476,7 +1482,9 @@ async function load_patron_holds_table(biblio_id, split_data) {
                         let buttons =
                             '<a class="hold-arrow move-hold ' +
                             table_class +
-                            '" title="Move hold up" href="#" data-move-hold="up" data-priority="' +
+                            '" title="' +
+                            __("Move hold up") +
+                            '" href="#" data-move-hold="up" data-priority="' +
                             row.priority +
                             '" reserve_id="' +
                             row.hold_id +
@@ -1484,7 +1492,9 @@ async function load_patron_holds_table(biblio_id, split_data) {
                         buttons +=
                             '<a class="hold-arrow move-hold ' +
                             table_class +
-                            '" title="Move hold to top" href="#" data-move-hold="top" data-priority="' +
+                            '" title="' +
+                            __("Move hold to top") +
+                            '" href="#" data-move-hold="top" data-priority="' +
                             row.priority +
                             '" reserve_id="' +
                             row.hold_id +
@@ -1492,7 +1502,9 @@ async function load_patron_holds_table(biblio_id, split_data) {
                         buttons +=
                             '<a class="hold-arrow move-hold ' +
                             table_class +
-                            '" title="Move hold to bottom" href="#" data-move-hold="bottom" data-priority="' +
+                            '" title="' +
+                            __("Move hold to bottom") +
+                            '" href="#" data-move-hold="bottom" data-priority="' +
                             row.priority +
                             '" reserve_id="' +
                             row.hold_id +
@@ -1500,7 +1512,9 @@ async function load_patron_holds_table(biblio_id, split_data) {
                         buttons +=
                             '<a class="hold-arrow move-hold ' +
                             table_class +
-                            '" title="Move hold down" href="#" data-move-hold="down" data-priority="' +
+                            '" title="' +
+                            __("Move hold down") +
+                            '" href="#" data-move-hold="down" data-priority="' +
                             row.priority +
                             '" reserve_id="' +
                             row.hold_id +

koha-tmpl/intranet-tmpl/prog/js/job_progress.js

@@ -47,5 +47,9 @@ function updateProgress(job_id, callbacks) {
                 updateProgress(job_id, callbacks);
             }, 1 * 1000);
         }
+    }).fail(function () {
+        setTimeout(function () {
+            updateProgress(job_id, callbacks);
+        }, 1 * 1000);
     });
 }

koha-tmpl/intranet-tmpl/prog/js/patron-format.js

@@ -20,6 +20,7 @@
                 "</span>";
         }
 
+        let name;
         var firstname = escape_str(patron.firstname);
         var preferred_name = escape_str(patron.preferred_name);
         var surname = escape_str(patron.surname);

koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue

@@ -59,7 +59,7 @@ export default {
                     name: "can_be_edited",
                     type: "checkbox",
                     label: $__("Can be edited"),
-                    value: false,
+                    defaultValue: false,
                 },
             ],
         });

koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/RequestingAgencyResource.vue

@@ -110,7 +110,7 @@ export default {
                 },
                 {
                     name: "securityCode",
-                    label: $__("Security Code"),
+                    label: $__("Security code"),
                     required: true,
                     type: "text",
                     hideIn: ["List"],

koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/SupplyingResource.vue

@@ -166,8 +166,8 @@ export default {
                                 <thead>
                                     <tr>
                                         <th>${$__("Barcode")}</th>
-                                        <th>${$__("Home Library")}</th>
-                                        <th>${$__("Holding Library")}</th>
+                                        <th>${$__("Home library")}</th>
+                                        <th>${$__("Holding library")}</th>
                                         <th>${$__("Action")}</th>
                                     </tr>
                                 </thead>
@@ -175,7 +175,7 @@ export default {
 
                         result.forEach(item => {
                             const barcode =
-                                item.external_id || $__("No Barcode");
+                                item.external_id || $__("No barcode");
                             const home_library =
                                 item.home_library_id?.name ||
                                 item.home_library_id ||
@@ -937,14 +937,14 @@ export default {
             resourceAttrs: [
                 {
                     name: "iso18626_request_id",
-                    label: $__("Supplying Agency Request ID"),
+                    label: $__("Supplying agency request ID"),
                     type: "text",
                     hideIn: ["Form"],
                     group: $__("Request details"),
                 },
                 {
                     name: "iso18626_requesting_agency_id",
-                    label: $__("Requesting Agency"),
+                    label: $__("Requesting agency"),
                     type: "relationshipSelect",
                     showElement: {
                         type: "text",
@@ -997,7 +997,7 @@ export default {
                 },
                 {
                     name: "requestingAgencyRequestId",
-                    label: $__("Requesting Agency Request ID"),
+                    label: $__("Requesting agency request ID"),
                     type: "text",
                     hideIn: ["List", "Form"],
                     group: $__("Request details"),

koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/ModuleDashboard.vue

@@ -4,7 +4,7 @@
             <p>
                 {{ $__("Customize your dashboard by adding widgets.") }}
                 <a href="#" id="open-widget-picker" @click="toggleWidgetPicker">
-                    {{ $__("Open Widget Picker") }}
+                    {{ $__("Open widget picker") }}
                 </a>
             </p>
         </div>

koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/Widgets/ILLRequests.vue

@@ -13,7 +13,7 @@
                     type="button"
                     @click="visitOldILLModule"
                 >
-                    {{ $__("Visit ILL requests (previously ILL Module)") }}
+                    {{ $__("Visit ILL requests (previously ILL module)") }}
                 </button>
             </div>
         </template>
@@ -157,10 +157,10 @@ export default {
         const baseWidget = useBaseWidget(
             {
                 id: "ILLRequests",
-                name: $__("ILL Requests"),
+                name: $__("ILL requests"),
                 icon: "fa fa-download",
                 description: $__(
-                    "Show ILL requests that need action. It filters requests by status and library. Provides a button to visit the ILL requests (previously ILL Module). This widget is configurable."
+                    "Show ILL requests that need action. It filters requests by status and library. Provides a button to visit the ILL requests (previously ILL module). This widget is configurable."
                 ),
                 loading: false,
                 settings: settings,

koha-tmpl/intranet-tmpl/prog/js/vue/components/ShowElement.vue

@@ -216,7 +216,7 @@ export default {
                 return baseElement.accessNestedProperty(valueKey, resource);
             }
             const displayValue = attr.format(resource[valueKey], resource);
-            if (displayValue == "Invalid Date") {
+            if (displayValue == "Invalid date") {
                 return "";
             }
             return displayValue || "";

koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js

@@ -36,7 +36,7 @@ import {
  * @param {Boolean} resourceConfig.table.addAdditionalFilters - A flag to indicate whether to add filters to the list component for the datatable.
  * @param {Object} resourceConfig.table.filters - The table filters for the resource. Follows the format for the resourceAttrs parameter.
  * @param {Function} resourceConfig.afterResourceFetch - A function to call after the resource is fetched. This can be used to edit resource data or fetch additional data
- * @param {Boolean} resourceConfig.embedded - A flag to indicate whether the resource is actually being used as a child component of another resource e.g. embedding a list of agreeements into EBSCO package agreements
+ * @param {Boolean} resourceConfig.embedded - A flag to indicate whether the resource is actually being used as a child component of another resource e.g. embedding a list of agreements into EBSCO package agreements
  * @param {String} resourceConfig.extendedAttributesResourceType - The resource type for extended attributes, if applicable.
  * @param {String} resourceConfig.extendedAttributesFieldGroup - The field group that you would like the additional fields to be displayed in.
  * @param {Function} resourceConfig.defaultToolbarButtons - A function to amend default buttons in the toolbar.

koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss

@@ -1,3 +1,12 @@
+@use "~@fortawesome/fontawesome-free/scss/variables" with (
+    // koha-tmpl/opac-tmpl/lib/fontawesome/webfonts
+    $font-path: "../../lib/fontawesome/webfonts"
+);
+@use "~@fortawesome/fontawesome-free/scss/fontawesome";
+@use "~@fortawesome/fontawesome-free/scss/fa" as fa;
+@use "~@fortawesome/fontawesome-free/scss/solid" as fa-solid;
+@use "~@fortawesome/fontawesome-free/scss/brands" as fa-brands;
+
 /* Bootstrap variable customizations */
 
 :root {
@@ -357,7 +366,7 @@ textarea,
     &::before {
         color: #4466AE;
         display: inline-block;
-        font-family: "Font Awesome 6 Free";
+        font-family: "Font Awesome 7 Free";
         padding-right: .5em;
     }
 
@@ -423,7 +432,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility::before {
     color: #C00;
     content: "\f00d";
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -438,7 +447,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility:hover::before
     color: #538200;
     content: "\f00c";
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -462,7 +471,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility.active:hover:
     color: #C00;
     content: "\f00d";
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -476,7 +485,7 @@ div.dt-button-collection button.dt-button.buttons-columnVisibility.active::befor
     color: $base-theme-color;
     content: "\f00c";
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -500,7 +509,7 @@ div.dt-button-collection button.dt-button.buttons-print:hover {
 div.dt-button-collection button.dt-button.buttons-html5:not( .disabled )::before {
     color: #222BAC;
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -521,7 +530,7 @@ div.dt-button-collection button.dt-button.buttons-print:not( .disabled )::before
     color: #222BAC;
     content: "\f02f";
     display: inline-block;
-    font-family: "Font Awesome 6 Free";
+    font-family: "Font Awesome 7 Free";
     margin-right: .5em;
     width: 1em;
 }
@@ -664,7 +673,7 @@ div.dt-container .dt-length {
         &::before,
         &::after {
             display: inline-block;
-            font-family: "Font Awesome 6 Free";
+            font-family: "Font Awesome 7 Free";
             width: 1em;
         }
     }
@@ -879,7 +888,7 @@ table {
                     &.dt-orderable-desc span.dt-column-order::after,
                     &.dt-ordering-desc span.dt-column-order::after {
                         display: block;
-                        font-family: "Font Awesome 6 Free";
+                        font-family: "Font Awesome 7 Free";
                         font-size: 1rem;
                         line-height: .5rem;
                     }

koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss

@@ -381,7 +381,7 @@
                 &::before {
                     content: "\f0da";
                     display: inline-block;
-                    font-family: "Font Awesome 6 Free";
+                    font-family: "Font Awesome 7 Free";
                     width: 1em;
                 }
             }
@@ -407,7 +407,7 @@
         &::before {
             content: "\f0d7";
             display: inline-block;
-            font-family: "Font Awesome 6 Free";
+            font-family: "Font Awesome 7 Free";
             width: 1em;
         }
     }

koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss

@@ -496,6 +496,7 @@ th {
         margin: 0 2px;
         padding: 2px 4px;
         text-shadow: 1px 0 1px rgba( 0, 0, 0, .25 );
+        width: 1.6em;
 
         &.rsssearchicon {
             font-size: 70%;
@@ -1906,7 +1907,7 @@ nav {
     .facet-toggle::before {
         color: #5A5A5A;
         content: "\f0da";
-        font-family: "Font Awesome 6 Free";
+        font-family: "Font Awesome 7 Free";
         font-size: 90%;
         line-height: 1.5em;
         padding: 0 0.35em 0 0;
@@ -1923,7 +1924,7 @@ nav {
         color: #5A5A5A;
         content: "\f0c8";
         cursor: default;
-        font-family: "Font Awesome 6 Free";
+        font-family: "Font Awesome 7 Free";
         font-size: 50%;
         line-height: 1.5em;
         padding: .7em 1em 0 0;
@@ -2715,7 +2716,7 @@ $star-selected: #EDB867;
         white-space: nowrap;
 
         span,a {
-            font: normal normal normal 20px/1 "Font Awesome 6 Free";
+            font: normal normal normal 20px/1 "Font Awesome 7 Free";
             -webkit-font-smoothing: antialiased;
             margin-right: 2px;
             text-decoration: none;

koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc

@@ -4,7 +4,7 @@
     <input type="hidden" name="op" value="cud-pay" />
     [% IF ( ACCOUNT_LINES ) %]
         <table class="table table-bordered table-striped finestable" id="finestable">
-            <caption class="sr-only">Your charges</caption>
+            <caption class="visually-hidden">Your charges</caption>
             <thead>
                 <tr>
                     [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc

@@ -19,7 +19,7 @@
     var flatpickr_timeformat_string = [% IF Koha.Preference('TimeFormat') == '12hr' %]"G:i K"[% ELSE %]"H:i"[% END %];
     var flatpickr_timeformat = [% IF Koha.Preference('TimeFormat') == '12hr' %]false[% ELSE %]true[% END %];
     var flatpickr_dateformat_string = "";
-    var delimter = "";
+    var delimiter = "";
     var altinput_dateformat = "";
     switch ( dateformat_pref ){
         case "us":

koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc

@@ -85,8 +85,5 @@
 [% Asset.js('js/i18n.js') | $raw %]
 [% Asset.js('js/stores.js') | $raw %]
 
-[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
-[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
-[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
 [% PROCESS 'html_helpers.inc' %]
 [% KohaPlugins.get_plugins_opac_head | $raw %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc

@@ -81,7 +81,7 @@
                         [% CASE 'Languages' %]
                             <a [% attrs | $raw %] id="facet-languages">Languages</a>
                         [% CASE %]
-                            <a [% attrs | $raw %] id="facet-[% facets_loo.type_link_value | html %]">[% facets_loo.type_id | html %]</a>
+                            <a [% attrs | $raw %] id="facet-[% facets_loo.type_link_value | html %]">[% facets_loo.label | html %]</a>
                         [% END %]
                         <div class="facet-collapse collapse show" id="[% facets_loo.type_id | html %]_collapse">
                             <ul>

koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc

@@ -26,8 +26,8 @@
             [% END %]
             [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
                 [% IF ( PAGE_NUMBER.highlight ) %]
-                    <li class="page-item active" aria-current="active">
-                        <a class="page-link" href="#" aria-label="Current page: Page [% PAGE_NUMBER.pg | html %]" aria-current="true">[% PAGE_NUMBER.pg | html %]</a>
+                    <li class="page-item active">
+                        <a class="page-link" href="#" aria-label="Current page: Page [% PAGE_NUMBER.pg | html %]" aria-current="page">[% PAGE_NUMBER.pg | html %]</a>
                     </li>
                 [% ELSE %]
                     <li class="page-item">

koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc

@@ -7,7 +7,7 @@
                 [%- IF ( starting_location ) %]<span>Shelving location:</span> [%- starting_location | html -%][% END -%]
                 [%- IF ( starting_homebranch && starting_ccode ) %],[% END %]
                 [%- IF ( starting_ccode ) %]<span>Collection: [%- starting_ccode | html -%]</span>[% END -%]
-                <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]" class="close_shelf">Close shelf browser <span class="sr-only">(Hides shelf browser)</span></a>
+                <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]" class="close_shelf">Close shelf browser <span class="visually-hidden">(Hides shelf browser)</span></a>
             </h2>
 
             <table class="table" role="presentation ">

koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc

@@ -174,7 +174,7 @@
 
 <fieldset>
     <legend>Picture</legend>
-    <label for="graphics-type" class="sr-only">Graphics type</label>
+    <label for="graphics-type" class="visually-hidden">Graphics type</label>
     <select id="graphics-type" name="limit" class="subtype">
         <option value="">Any</option>
         <option value="Graphics-type:a">collage</option>
@@ -188,7 +188,7 @@
         <option value="Graphics-type:k">technical drawing</option>
         <option value="Graphics-type:z">other non-projected graphic type</option>
     </select>
-    <label for="graphics-support" class="sr-only">Graphics support</label>
+    <label for="graphics-support" class="visually-hidden">Graphics support</label>
     <select id="graphics-support" name="limit" class="subtype">
         <option value="">Any</option>
         <option value="Graphics-support:a">canvas</option>

koha-tmpl/opac-tmpl/bootstrap/en/includes/user-star-ratings.inc

@@ -16,7 +16,7 @@
         </div>
     </div>
 
-    <label class="sr-only" for="star_rating-[% item.itemnumber | html %]">star rating</label>
+    <label class="visually-hidden" for="star_rating-[% item.itemnumber | html %]">star rating</label>
     <select class="star_rating" id="star_rating-[% item.itemnumber | html %]" name="rating" autocomplete="off" data-biblionumber="[% item.biblionumber | html %]" data-context="rating-[% item.itemnumber | html %]">
         [% IF ( rating_avg_int == 0 ) %]
             <option value="" selected="selected"></option>

koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt

@@ -6,7 +6,7 @@
     <h2>Clubs currently enrolled in</h2>
 
     <table id="clubs-table-enrolled" class="table table-bordered table-striped">
-        <caption class="sr-only">Clubs</caption>
+        <caption class="visually-hidden">Clubs</caption>
         <thead>
             <tr>
                 <th class="all">Name</th>

koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt

@@ -6,7 +6,7 @@
 
 <div class="container-fluid">
     <form method="get" id="patron-enrollment-form">
-        <legend class="sr-only">Enrollment</legend>
+        <legend class="visually-hidden">Enrollment</legend>
         <input type="hidden" name="id" value="[% club.id | html %]" />
         <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
         <fieldset class="rows">

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt

@@ -48,7 +48,7 @@
 
                             <div id="labeledmarc">
                                 <table id="marc" class="table table-bordered table-striped">
-                                    <caption class="sr-only">MARC details</caption>
+                                    <caption class="visually-hidden">MARC details</caption>
                                     [% FOREACH tab0X IN tab0XX %]
                                         <tr><th colspan="2">[% tab0X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab0X.subfield %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt

@@ -288,7 +288,7 @@
                     [% ELSE %]
                         <h1>Logging on to the catalog has not been enabled by the library.</h1>
                         <ul>
-                            <li>To report this error, you can email the Koha Administrator. <a href="mailto:[% Koha.Preference( 'KohaAdminEmailAddress' ) | uri %]">Email</a></li>
+                            <li>To report this error, you can email the Koha administrator. <a href="mailto:[% Koha.Preference( 'KohaAdminEmailAddress' ) | uri %]">Email</a></li>
                             <li>Use top menu bar to navigate to another part of Koha.</li>
                         </ul>
                     [% END # / IF opacuserlogin %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt

@@ -63,7 +63,7 @@
                     [% IF ( total ) %]
                         <div class="searchresults">
                             <table class="table table-bordered table-striped">
-                                <caption class="sr-only">Authority search results</caption>
+                                <caption class="visually-hidden">Authority search results</caption>
                                 <thead>
                                     <tr>
                                         <th>Authorized headings</th>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt

@@ -138,7 +138,7 @@
                                 [% ELSE %]
                                     [% check_title = BIBLIO_RESULT.biblionumber %]
                                 [% END %]
-                                <label for="bib[% BIBLIO_RESULT.biblionumber | html %]" class="sr-only">[% check_title | html %]</label>
+                                <label for="bib[% BIBLIO_RESULT.biblionumber | html %]" class="visually-hidden">[% check_title | html %]</label>
                                 <h2>
                                     <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
                                     [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]
@@ -338,7 +338,7 @@
                     [% ELSE %]
                         <form action="/cgi-bin/koha/opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form">
                             <table id="itemst" class="table table-bordered table-striped">
-                                <caption class="sr-only">Items in your cart</caption>
+                                <caption class="visually-hidden">Items in your cart</caption>
                                 <thead>
                                     <tr>
                                         <th class="noprint no-sort">&nbsp;</th>
@@ -357,7 +357,7 @@
                                                 [% ELSE %]
                                                     [% check_title = BIBLIO_RESULT.biblionumber %]
                                                 [% END %]
-                                                <label for="bib[% BIBLIO_RESULT.biblionumber | html %]" class="sr-only">[% check_title | html %]</label>
+                                                <label for="bib[% BIBLIO_RESULT.biblionumber | html %]" class="visually-hidden">[% check_title | html %]</label>
                                                 <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
                                             </td>
                                             <td>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt

@@ -43,7 +43,7 @@
                         <h1>Browse search</h1>
 
                         <form method="get">
-                            <legend class="sr-only">Browse search</legend>
+                            <legend class="visually-hidden">Browse search</legend>
                             <div class="form-row">
                                 <div class="col">
                                     <label for="browse-searchterm">Search for:</label>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt

@@ -58,7 +58,7 @@
                                         [% END %]
                                         <li style="list-style-type: none;">
                                             <table class="table table-bordered table-striped">
-                                                <caption class="sr-only">Items in catalog</caption>
+                                                <caption class="visually-hidden">Items in catalog</caption>
                                                 <tr>
                                                     [% FOREACH LEVEL_LOO IN LEVEL_LOOP %]
                                                         <td>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt

@@ -62,7 +62,7 @@
                     [% IF ( course_reserves ) %]
                         <div class="rows">
                             <table id="course-items-table" class="table table-bordered table-striped table-condensed">
-                                <caption class="sr-only">Courses</caption>
+                                <caption class="visually-hidden">Courses</caption>
                                 <thead>
                                     <tr>
                                         <th class="anti-the">Title</th>