@@ -, +, @@ renew date 1) prove t/db_dependent/Circulation.t --- C4/Circulation.pm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -4457,23 +4457,12 @@ sub _CanBookBeAutoRenewed { } } - if ( defined $issuing_rule->{norenewalbefore} - and $issuing_rule->{norenewalbefore} ne "" ) { - if ( GetSoonestRenewDate($patron->id, $item->id) > dt_from_string()) { - return "auto_too_soon"; - } else { - return "ok"; - } - } - - # Fallback for automatic renewals: - # If norenewalbefore is undef, don't renew before due date. - my $now = dt_from_string; - if ( $now >= dt_from_string( $issue->date_due, 'sql' ) ){ - return "ok"; - } else { + if ( GetSoonestRenewDate( $patron->id, $item->id ) > dt_from_string() ) + { return "auto_too_soon"; } + + return "ok"; } sub _item_denied_renewal { --