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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 279-285 Link Here
279
                        [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %]
279
                        [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %]
280
                        [%# Some additional checks should be added in the pl file %]
280
                        [%# Some additional checks should be added in the pl file %]
281
                        [% span_title = BLOCK %]
281
                        [% span_title = BLOCK %]
282
                          <span>Cannot cancel receipt of this order line because at least one reservation exists on the records.</span>
282
                          <span>Cannot cancel receipt of this order line because at least one hold exists on the records.</span>
283
                        [% END %]
283
                        [% END %]
284
                      [% END %]
284
                      [% END %]
285
                      <span title="[% span_title | collapse | html %]">
285
                      <span title="[% span_title | collapse | html %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-4 / +4 lines)
Lines 42-48 Link Here
42
    <table>
42
    <table>
43
        <caption>
43
        <caption>
44
            [% IF ( reserved ) %]
44
            [% IF ( reserved ) %]
45
                Reserve found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
45
                Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
46
            [% END %]
46
            [% END %]
47
            [% IF ( waiting ) %]
47
            [% IF ( waiting ) %]
48
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
48
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
Lines 54-62 Link Here
54
        <tr>
54
        <tr>
55
            <th>
55
            <th>
56
                [% IF ( reserved ) %]
56
                [% IF ( reserved ) %]
57
                        Set reserve to transit and transfer book to [% Branches.GetName( hold.branchcode ) | html %]:
57
                        Transfer item to [% Branches.GetName( hold.branchcode ) | html %]:
58
                [% END %]
58
                [% END %]
59
                [% IF ( waiting or transferred ) %]Cancel reservation and then attempt transfer: [% END %]
59
                [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %]
60
            </th>
60
            </th>
61
            <td>
61
            <td>
62
                <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
62
                <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
Lines 83-89 Link Here
83
        </tr>
83
        </tr>
84
            [% IF ( reserved ) %]
84
            [% IF ( reserved ) %]
85
                <tr>
85
                <tr>
86
                    <th>Cancel reservation and then attempt transfer:</th>
86
                    <th>Cancel hold and then attempt transfer:</th>
87
                    <td>
87
                    <td>
88
                        <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
88
                        <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
89
                            [% FOREACH trsfitemloo IN trsfitemloop %]
89
                            [% FOREACH trsfitemloo IN trsfitemloop %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +1 lines)
Lines 216-222 Link Here
216
                      </script>
216
                      </script>
217
                  [% END %]
217
                  [% END %]
218
218
219
                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] <!-- arbitrary choice, revert the reserve is not possible-->
219
                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] <!-- arbitrary choice, revert the hold is not possible-->
220
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li>
220
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li>
221
                  [% ELSIF checkout_info.RESERVED %]
221
                  [% ELSIF checkout_info.RESERVED %]
222
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>
222
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 624-630 Link Here
624
                                </div> <!-- /#item-transfer-modal -->
624
                                </div> <!-- /#item-transfer-modal -->
625
                            [% END # /IF transfer || needstransfer %]
625
                            [% END # /IF transfer || needstransfer %]
626
626
627
                            <!-- case of simple return no issue or transfer but with a reservation  -->
627
                            <!-- case of simple return no issue or transfer but with a hold  -->
628
                            [% IF ( reserved and !recalled and !waitingrecall ) %]
628
                            [% IF ( reserved and !recalled and !waitingrecall ) %]
629
                                <!-- reserved -->
629
                                <!-- reserved -->
630
                                <div id="hold-found2" class="modal fade audio-alert-action block">
630
                                <div id="hold-found2" class="modal fade audio-alert-action block">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +1 lines)
Lines 658-664 Link Here
658
                                                                [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %]
658
                                                                [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %]
659
                                                                    <span>Only pickup locations within the same hold group are allowed</span>
659
                                                                    <span>Only pickup locations within the same hold group are allowed</span>
660
                                                                [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %]
660
                                                                [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %]
661
                                                                    <span>No reserves are allowed on this item</span>
661
                                                                    <span>No holds are allowed on this item</span>
662
                                                                [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %]
662
                                                                [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %]
663
                                                                    <span>Library is not a pickup location</span>
663
                                                                    <span>Library is not a pickup location</span>
664
                                                                [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %]
664
                                                                [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-2 / +1 lines)
Lines 197-203 Link Here
197
197
198
                                [% UNLESS ( bibitemloo.holdable ) %]
198
                                [% UNLESS ( bibitemloo.holdable ) %]
199
                                    [% IF ( bibitemloo.ageRestricted ) %]
199
                                    [% IF ( bibitemloo.ageRestricted ) %]
200
                                        <div class="alert alert-warning">Sorry, you are too young to reserve this material.</div>
200
                                        <div class="alert alert-warning">Sorry, you are too young to hold this material.</div>
201
                                    [% END %]
201
                                    [% END %]
202
                                    [% IF ( bibitemloo.already_reserved ) %]
202
                                    [% IF ( bibitemloo.already_reserved ) %]
203
                                        <div class="alert alert-warning">You have already requested this title.</div>
203
                                        <div class="alert alert-warning">You have already requested this title.</div>
204
- 

Return to bug 30772