diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 6a5c935605..0ec36cef1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -38,6 +38,7 @@
+
-
@@ -57,7 +58,13 @@
Required
[% INCLUDE 'date-format.inc' %]
-
+
+ -
+
+
+
+
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 10d5dacc07..2b6f202134 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -69,6 +69,7 @@ my $issn = $query->param('issn');
my $branch = $query->param('branch');
my $date = $query->param('date');
$date = eval { dt_from_string( scalar $query->param('date') ) } if $date;
+my $showhistoricexpired = $query->param('showhistoryexpired');
if ($date) {
my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
@@ -93,20 +94,23 @@ if ($date) {
next if $subscription->{cannotedit};
my $expirationdate_dt = dt_from_string( $expirationdate, 'iso' );
+ my $today_dt = dt_from_string();
if ( DateTime->compare( $date, $expirationdate_dt ) == 1
+ && ( $showhistoricexpired || DateTime->compare( $expiration_dt, $today_dt ) == 1 )
&& ( !$branch || ( $subscription->{'branchcode'} eq $branch ) ) ) {
push @subscriptions_loop, $subscription;
}
}
- $template->param (
- title => $title,
- issn => $issn,
- numsubscription => scalar @subscriptions_loop,
- date => $date,
- subscriptions_loop => \@subscriptions_loop,
- "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
- searched => 1,
+ $template->param(
+ title => $title,
+ issn => $issn,
+ showhistoricexpired => $showhistoricexpired,
+ numsubscription => scalar @subscriptions_loop,
+ date => $date,
+ subscriptions_loop => \@subscriptions_loop,
+ "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
+ searched => 1,
);
}