From: Owen Leonard <[email protected]>
The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.
I wonder if this line was supposed to catch this problem:
Line 233: if ( $warning_year*$warning_month*$warning_day==0
This patch adds "!$borrower->{'dateexpiry'} ||" to that line.
Signed-off-by: Nicole C. Engard <[email protected]>
---
circ/circulation.pl | 4 ++--
.../prog/en/modules/circ/circulation.tt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8c359b1..c34db54 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -230,7 +230,7 @@ if ($borrowernumber) {
0 , $borrower->{'enrolmentperiod'});
}
# if the expiry date is before today ie they have expired
- if ( $warning_year*$warning_month*$warning_day==0
+ if ( !$borrower->{'dateexpiry'} ||
$warning_year*$warning_month*$warning_day==0
|| Date_to_Days($today_year, $today_month, $today_day )
> Date_to_Days($warning_year, $warning_month, $warning_day) )
{
@@ -238,7 +238,7 @@ if ($borrowernumber) {
$template->param(
flagged => "1",
noissues => "1",
- expired => format_date($borrower->{dateexpiry}),
+ expired => "1",
renewaldate => format_date("$renew_year-$renew_month-$renew_day")
);
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index afa6ec5..d2f6405 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -554,7 +554,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF ( expired ) %]
<li><span class="circ-hlt">Expiration:</span> Patron's
card has expired.
- Patron's card expired on [% expiry %] <a
href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber
%]&cardnumber=[% cardnumber
%]&destination=circ&reregistration=y">Renew</a> or <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[%
borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>
+ [% IF ( expiry ) %]Patron's card expired on [% expiry
%][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[%
borrowernumber %]&cardnumber=[% cardnumber
%]&destination=circ&reregistration=y">Renew</a> or <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[%
borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>
</li>
[% END %]
--
1.7.2.3
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
