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

(-)a/circ/circulation.pl (-9 lines)
Lines 279-291 if ($borrowernumber) { Link Here
279
    my (  $today_year,   $today_month,   $today_day) = Today();
279
    my (  $today_year,   $today_month,   $today_day) = Today();
280
    my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'};
280
    my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'};
281
    my (  $enrol_year,   $enrol_month,   $enrol_day) = split /-/, $borrower->{'dateenrolled'};
281
    my (  $enrol_year,   $enrol_month,   $enrol_day) = split /-/, $borrower->{'dateenrolled'};
282
    # Renew day is calculated by adding the enrolment period to today
283
    my (  $renew_year,   $renew_month,   $renew_day);
284
    if ($enrol_year*$enrol_month*$enrol_day>0) {
285
        (  $renew_year,   $renew_month,   $renew_day) =
286
        Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
287
            0 , $borrower->{'enrolmentperiod'});
288
    }
289
    # if the expiry date is before today ie they have expired
282
    # if the expiry date is before today ie they have expired
290
    if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
283
    if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
291
        || Date_to_Days($today_year,     $today_month, $today_day  ) 
284
        || Date_to_Days($today_year,     $today_month, $today_day  ) 
Lines 297-303 if ($borrowernumber) { Link Here
297
            noissues => ($force_allow_issue) ? 0 : "1",
290
            noissues => ($force_allow_issue) ? 0 : "1",
298
            forceallow => $force_allow_issue,
291
            forceallow => $force_allow_issue,
299
            expired => "1",
292
            expired => "1",
300
            renewaldate => "$renew_year-$renew_month-$renew_day",
301
        );
293
        );
302
    }
294
    }
303
    # check for NotifyBorrowerDeparture
295
    # check for NotifyBorrowerDeparture
304
- 

Return to bug 15845