From 6ebce7c2cfad56cdaf0244607809464412a67d2d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 17 Feb 2016 16:32:03 +0100 Subject: [PATCH] Bug 15845: Renewal date in circulation.pl is not always correct and not even used MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If you have a patron category with a hard renewal date, the enrolllment period will be zero. You cannot calculate the renewal date as is done in the script currently. Even more, the renewaldate template var is not even used. Test plan: [1] Verify that checkin/checkout works as expected. [2] Git grep on renewaldate [3] Check the code in circulation.pl for "$renew" Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit 393308907ca332339d1be05ee99463dc783126d4) Signed-off-by: Julian Maurice --- circ/circulation.pl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index db4a653ed3..3b3d5ab0fd 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -279,13 +279,6 @@ if ($borrowernumber) { my ( $today_year, $today_month, $today_day) = Today(); my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'}; my ( $enrol_year, $enrol_month, $enrol_day) = split /-/, $borrower->{'dateenrolled'}; - # Renew day is calculated by adding the enrolment period to today - my ( $renew_year, $renew_month, $renew_day); - if ($enrol_year*$enrol_month*$enrol_day>0) { - ( $renew_year, $renew_month, $renew_day) = - Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day, - 0 , $borrower->{'enrolmentperiod'}); - } # if the expiry date is before today ie they have expired if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0 || Date_to_Days($today_year, $today_month, $today_day ) @@ -297,7 +290,6 @@ if ($borrowernumber) { noissues => ($force_allow_issue) ? 0 : "1", forceallow => $force_allow_issue, expired => "1", - renewaldate => "$renew_year-$renew_month-$renew_day", ); } # check for NotifyBorrowerDeparture -- 2.39.5