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 392-404 Circulation: Link Here
392
                  no: Disable
392
                  no: Disable
393
            - the on-site for all cases (Even if a user is debarred, etc.).
393
            - the on-site for all cases (Even if a user is debarred, etc.).
394
        -
394
        -
395
            - When a patron's checked out item is late,
395
            - When a patron's checked out item is overdue,
396
            - pref: OverduesBlockRenewing
396
            - pref: OverduesBlockRenewing
397
              type: choice
397
              type: choice
398
              choices:
398
              choices:
399
                  allow: allow renewing.
399
                  allow: allow renewing.
400
                  blockitem: block renewing only for this item.
400
                  blockitem: block renewing only for this item.
401
                  block: block renewing for all his items.
401
                  block: block renewing for all the patron's items.
402
        -
402
        -
403
            - If patron is restricted,
403
            - If patron is restricted,
404
            - pref: RestrictionBlockRenewing
404
            - 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 379-385 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
379
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1);
379
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1);
380
    is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1');
380
    is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1');
381
381
382
383
    # Items can't fill hold for reasons
382
    # Items can't fill hold for reasons
384
    ModItem({ notforloan => 1 }, $biblionumber, $itemnumber);
383
    ModItem({ notforloan => 1 }, $biblionumber, $itemnumber);
385
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
384
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
386
- 

Return to bug 8236