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

(-)a/C4/Circulation.pm (-1 / +1 lines)
Lines 1149-1155 sub CanBookBeIssued { Link Here
1149
                }
1149
                }
1150
                elsif ( $restype eq "Processing" ) {
1150
                elsif ( $restype eq "Processing" ) {
1151
                    # The item is determined hold being processed for someone else.
1151
                    # The item is determined hold being processed for someone else.
1152
                    $needsconfirmation{PROCESSED} = 1;
1152
                    $needsconfirmation{PROCESSING} = 1;
1153
                    $needsconfirmation{'resfirstname'} = $patron->firstname;
1153
                    $needsconfirmation{'resfirstname'} = $patron->firstname;
1154
                    $needsconfirmation{'ressurname'} = $patron->surname;
1154
                    $needsconfirmation{'ressurname'} = $patron->surname;
1155
                    $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
1155
                    $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-1 / +1 lines)
Lines 76-82 sub do_checkout { Link Here
76
                next;
76
                next;
77
            } elsif ($confirmation eq 'RESERVE_WAITING'
77
            } elsif ($confirmation eq 'RESERVE_WAITING'
78
                      or $confirmation eq 'TRANSFERRED'
78
                      or $confirmation eq 'TRANSFERRED'
79
                      or $confirmation eq 'PROCESSED') {
79
                      or $confirmation eq 'PROCESSING') {
80
               $debug and warn "Item is on hold for another patron.";
80
               $debug and warn "Item is on hold for another patron.";
81
               $self->screen_msg("Item is on hold for another patron.");
81
               $self->screen_msg("Item is on hold for another patron.");
82
               $noerror = 0;
82
               $noerror = 0;
(-)a/circ/branchtransfers.pl (-1 / +1 lines)
Lines 224-230 $template->param( Link Here
224
    reserved                => $reserved,
224
    reserved                => $reserved,
225
    waiting                 => $waiting,
225
    waiting                 => $waiting,
226
    transferred             => $hold_transferred,
226
    transferred             => $hold_transferred,
227
    processed               => $hold_processed,
227
    processing              => $hold_processed,
228
    borrowernumber          => $borrowernumber,
228
    borrowernumber          => $borrowernumber,
229
    itemnumber              => $itemnumber,
229
    itemnumber              => $itemnumber,
230
    barcode                 => $barcode,
230
    barcode                 => $barcode,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-1 / +1 lines)
Lines 50-56 Link Here
50
                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
50
                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
51
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
51
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
52
                    <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
52
                    <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
53
                    [% IF ( waiting or transferred or processed ) %]
53
                    [% IF ( waiting or transferred or processing ) %]
54
                        <input type="hidden" name="barcode" value="[% barcode | html %]" />
54
                        <input type="hidden" name="barcode" value="[% barcode | html %]" />
55
                        <input type="hidden" name="request" value="KillWaiting" />
55
                        <input type="hidden" name="request" value="KillWaiting" />
56
                        <input type="submit" value="Cancel" />
56
                        <input type="submit" value="Cancel" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 126-132 Link Here
126
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]</li>
126
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]</li>
127
                                [% END %]
127
                                [% END %]
128
128
129
                                [% IF ( PROCESSED ) %]
129
                                [% IF ( PROCESSING ) %]
130
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is being processed for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]</li>
130
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is being processed for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]</li>
131
                                [% END %]
131
                                [% END %]
132
132
Lines 254-260 Link Here
254
                                        </p>
254
                                        </p>
255
                                    [% END %]
255
                                    [% END %]
256
256
257
                                    [% IF ( PROCESSED ) %]
257
                                    [% IF ( PROCESSING ) %]
258
                                        <p>
258
                                        <p>
259
                                            <label for="cancelreserve">Cancel hold</label>
259
                                            <label for="cancelreserve">Cancel hold</label>
260
                                            <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" /><br />
260
                                            <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" /><br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-3 / +2 lines)
Lines 150-156 Link Here
150
                  [% IF checkout_info.TRANSFERRED %]
150
                  [% IF checkout_info.TRANSFERRED %]
151
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold and being transferred to another patron.</li>
151
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold and being transferred to another patron.</li>
152
                  [% END %]
152
                  [% END %]
153
                  [% IF checkout_info.PROCESSED %]
153
                  [% IF checkout_info.PROCESSING %]
154
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold and being processed for another patron.</li>
154
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold and being processed for another patron.</li>
155
                  [% END %]
155
                  [% END %]
156
                  [% IF checkout_info.ISSUED_TO_ANOTHER %]
156
                  [% IF checkout_info.ISSUED_TO_ANOTHER %]
Lines 193-199 Link Here
193
                      </script>
193
                      </script>
194
                  [% END %]
194
                  [% END %]
195
195
196
                  [% 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.PROCESSED ) %] <!-- arbitrary choice, revert the reserve is not possible-->
196
                  [% 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-->
197
                      <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>
197
                      <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>
198
                  [% ELSIF checkout_info.RESERVED %]
198
                  [% ELSIF checkout_info.RESERVED %]
199
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>
199
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>
200
- 

Return to bug 25690