@@ -, +, @@ to relevant sysprefs --NOTE-- The following renewals must be completed in Circulation->Renew the AllowRenewalLimitOverride and AllowRenewalIfOtherItemsAvaliable preferences are both set to 'Don't allow' Try to renew an item (with item level hold on it) which belongs to a biblio with only one item. Note the only button in the yellow message box displayed is 'Continue without renewing' Try to renew an item (this time with a 'Next Available' hold on the record) which belongs to a biblio with only one item. Note the only button in the yellow message box displayed is 'Continue without renewing' Try to renew an item (with item level hold on it) which belongs to a biblio with multiple available items of it in the catalogue. Note only the 'Continue without renewing' button is displayed Try to renew an item (this time with a 'Next Available' hold on the record) which belongs to a biblio with multiple available items of it in the catalogue. Note only the 'Continue without renewing' button is displayed AllowRenewalIfOtherItemsAvaliable system preferences to 'Allow' is displayed in the yellow message box displayed is 'Continue without renewing' displayed (because the hold is for that specific item) yellow message box is not displayed repeat steps 3-6, and note that only the 'Continue without renewing' button is displayed to 'Allow' and AllowRenewalLimitOverride syspref to 'Don't Allow', and repeat steps 3-5 and note only the 'Continue without renewal' button is displayed. no yellow warning box. --- C4/Circulation.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -861,7 +861,7 @@ sub CanBookBeIssued { $patron->borrowernumber, $item_object->itemnumber, ); - if ( $CanBookBeRenewed == 0 ) { # no more renewals allowed + if ( $CanBookBeRenewed == 0 ) { # no more renewals allowed if ( $renewerror eq 'onsite_checkout' ) { $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1; } @@ -2690,7 +2690,7 @@ sub CanBookBeRenewed { my ( $reserve_found, $reserve, undef ) = C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers ); - warn $reserve_found; + if ($reserve_found) { push( @borrowernumbers, $reserve->{borrowernumber} ); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -112,10 +112,9 @@ [% ELSIF error == "on_reserve" %] -

This item is on hold for another patron.

- [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 )%] + + + [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 ) %] +
+ + + + +
+ [% END %] + [% ELSIF error == "patron_restricted" %]

[% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) is currently restricted.

--