The contract field Cancellation Deadline will be now calculated even when the Auto-Renewal field is set to No.