View | Details | Raw Unified | Return to bug 15171
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-1 / +1 lines)
Lines 134-140 Link Here
134
        </tr>
134
        </tr>
135
    [% END %]
135
    [% END %]
136
    </table>
136
    </table>
137
[% ELSE %]
137
[% ELSIF searched %]
138
    <p>No results for your query</p>
138
    <p>No results for your query</p>
139
[% END %]
139
[% END %]
140
140
(-)a/serials/checkexpiration.pl (-3 / +2 lines)
Lines 51-57 use C4::Branch; Link Here
51
use C4::Output;
51
use C4::Output;
52
use C4::Context;
52
use C4::Context;
53
use C4::Dates qw/format_date format_date_in_iso/;
53
use C4::Dates qw/format_date format_date_in_iso/;
54
use Date::Calc qw/Today Date_to_Days/;
54
use Date::Calc qw/Date_to_Days/;
55
55
56
my $query = new CGI;
56
my $query = new CGI;
57
57
Lines 90-96 if ($date) { Link Here
90
        }
90
        }
91
        next if $subscription->{cannotedit};
91
        next if $subscription->{cannotedit};
92
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
92
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
93
             Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) &&
94
             ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
93
             ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
95
            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
94
            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
96
            push @subscriptions_loop,$subscription;
95
            push @subscriptions_loop,$subscription;
Lines 104-109 if ($date) { Link Here
104
        date => format_date($date),
103
        date => format_date($date),
105
        subscriptions_loop => \@subscriptions_loop,
104
        subscriptions_loop => \@subscriptions_loop,
106
        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
105
        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
106
        searched => 1,
107
    );
107
    );
108
}
108
}
109
109
110
- 

Return to bug 15171