Bug 15171: Display subscriptions which will expire in the future

Since the form on the subscription check expiration page let the user choose an
expiration date > today, there is no sense to hide subscriptions which will expire in the future.

Test plan:
0/ Make sure you have at least subscription with an expiration date > today
1/ Start a seach on the check expiration page (serials/checkexpiration.pl)
with a date < today, = today and > today
=> The subscription won't never be displayed without this patch.
With this patch, it will.

Note that you will get a "No results for your query" message only if you
have search for something.

Followed testplan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

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 551338a..e41d5c3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -134,7 +134,7 @@
         </tr>
     [% END %]
     </table>
-[% ELSE %]
+[% ELSIF searched %]
     <p>No results for your query</p>
 [% END %]
 

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index c926814..11d1714 100755 (executable)
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -51,7 +51,7 @@ use C4::Branch;
 use C4::Output;
 use C4::Context;
 use C4::Dates qw/format_date format_date_in_iso/;
-use Date::Calc qw/Today Date_to_Days/;
+use Date::Calc qw/Date_to_Days/;
 
 my $query = new CGI;
 
@@ -90,7 +90,6 @@ if ($date) {
         }
         next if $subscription->{cannotedit};
         if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
-             Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) &&
              ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
             $subscription->{expirationdate}=format_date($subscription->{expirationdate});
             push @subscriptions_loop,$subscription;
@@ -104,6 +103,7 @@ if ($date) {
         date => format_date($date),
         subscriptions_loop => \@subscriptions_loop,
         "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+        searched => 1,
     );
 }