From 7761e8c5ff27ad41a3327ccd18a8b6959596362b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr>
Date: Tue, 29 Dec 2015 10:44:44 +0100
Subject: [PATCH] Revert "Bug 15171: Display subscriptions which will expire in
 the future"

This reverts commit 7368075d1e3640396ed64a5ed342147a5d31fa22.

Fix test
---
 .../intranet-tmpl/prog/en/modules/serials/checkexpiration.tt | 2 +-
 serials/checkexpiration.pl                                   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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 f26f6201f2..95bfcb89fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -113,7 +113,7 @@
         </tr>
     [% END %]
     </table>
-[% ELSIF searched %]
+[% ELSE %]
     <p>No results for your query</p>
 [% END %]
 
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 3ccd03feee..e5abce18b0 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -50,7 +50,7 @@ use C4::Serials; # GetExpirationDate
 use C4::Output;
 use C4::Context;
 use C4::Dates qw/format_date format_date_in_iso/;
-use Date::Calc qw/Date_to_Days/;
+use Date::Calc qw/Today Date_to_Days/;
 
 my $query = new CGI;
 
@@ -81,7 +81,7 @@ if ($date) {
         next if $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) &&
-             ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
+			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
             $subscription->{expirationdate}=format_date($subscription->{expirationdate});
             push @subscriptions_loop,$subscription;
         }
@@ -94,7 +94,6 @@ if ($date) {
         date => format_date($date),
         subscriptions_loop => \@subscriptions_loop,
         "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
-        searched => 1,
     );
 }
 $template->param (
-- 
2.39.5