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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-2 / +2 lines)
Lines 399-411 Circulation: Link Here
399
                  no: Disable
399
                  no: Disable
400
            - the on-site for all cases (Even if a user is debarred, etc.).
400
            - the on-site for all cases (Even if a user is debarred, etc.).
401
        -
401
        -
402
            - When a patron's checked out item is late,
402
            - When a patron's checked out item is overdue,
403
            - pref: OverduesBlockRenewing
403
            - pref: OverduesBlockRenewing
404
              type: choice
404
              type: choice
405
              choices:
405
              choices:
406
                  allow: allow renewing.
406
                  allow: allow renewing.
407
                  blockitem: block renewing only for this item.
407
                  blockitem: block renewing only for this item.
408
                  block: block renewing for all his items.
408
                  block: block renewing for all the patron's items.
409
        -
409
        -
410
            - If patron is restricted,
410
            - If patron is restricted,
411
            - pref: RestrictionBlockRenewing
411
            - pref: RestrictionBlockRenewing
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
Lines 231-237 Link Here
231
                                                    [% ELSIF ( ISSUE.too_many ) %]
231
                                                    [% ELSIF ( ISSUE.too_many ) %]
232
                                                        Not renewable
232
                                                        Not renewable
233
                                                    [% ELSIF ( ISSUE.norenew_overdue ) %]
233
                                                    [% ELSIF ( ISSUE.norenew_overdue ) %]
234
                                                        Not allowed <span class="renewals">(overdue on a document)</span>
234
                                                        Not allowed <span class="renewals">(overdue)</span>
235
                                                    [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
235
                                                    [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
236
                                                        Automatic renewal
236
                                                        Automatic renewal
237
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
237
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
Lines 466-472 Link Here
466
                                                            [% END %]
466
                                                            [% END %]
467
                                                                <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
467
                                                                <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
468
                                                        [% ELSIF ( OVERDUE.norenew_overdue ) %]
468
                                                        [% ELSIF ( OVERDUE.norenew_overdue ) %]
469
                                                            Not allowed<span class="renewals">(overdue on a document)</span>
469
                                                            Not allowed<span class="renewals">(overdue)</span>
470
                                                        [% ELSIF ( OVERDUE.onreserve ) %]
470
                                                        [% ELSIF ( OVERDUE.onreserve ) %]
471
                                                            On hold
471
                                                            On hold
472
                                                        [% ELSE %]
472
                                                        [% ELSE %]
(-)a/t/db_dependent/Circulation.t (-2 lines)
Lines 362-368 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
362
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1);
362
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1);
363
    is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1');
363
    is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1');
364
364
365
  
366
    # Items can't fill hold for reasons
365
    # Items can't fill hold for reasons
367
    ModItem({ notforloan => 1 }, $biblionumber, $itemnumber);
366
    ModItem({ notforloan => 1 }, $biblionumber, $itemnumber);
368
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
367
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
369
- 

Return to bug 8236