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 95bfcb8..5fb909d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -46,6 +46,7 @@
+
-
@@ -57,7 +58,13 @@
Required
[% INCLUDE 'date-format.inc' %]
-
+
+ -
+
+
+
+
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index e24210f..695b3c0 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -68,6 +68,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
my $title = $query->param('title');
my $issn = $query->param('issn');
my $date = format_date_in_iso($query->param('date'));
+my $showexpiredtoday = $query->param('showexpiredtoday');
if ($date) {
my @subscriptions = GetSubscriptions( $title, $issn );
@@ -78,10 +79,10 @@ if ($date) {
my $expirationdate = GetExpirationDate($subscriptionid);
$subscription->{expirationdate} = $expirationdate;
- next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
+ next if !$expirationdate || $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
next if $subscription->{closed};
if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
- Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
+ ( $showexpiredtoday || (Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today)))) {
$subscription->{expirationdate}=format_date($subscription->{expirationdate});
push @subscriptions_loop,$subscription;
}
@@ -90,6 +91,7 @@ if ($date) {
$template->param (
title => $title,
issn => $issn,
+ showexpiredtoday => $showexpiredtoday,
numsubscription => scalar @subscriptions_loop,
date => format_date($date),
subscriptions_loop => \@subscriptions_loop,