X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fcheckexpiration.pl;h=aeebd2f5bc64de3cbc77b28554f969143b96302a;hb=d7363cd52335153b80f4092fa929c16d4cdc5101;hp=10d5dacc074cb17c447bd2c6509ddb1dae790e08;hpb=96cc447045f3f1d3702a3c69b36f596d88f38eda;p=srvgit

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 10d5dacc07..aeebd2f5bc 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('showhistoricexpired');
 
 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( $expirationdate_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,
     );
 }