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

(-)a/C4/Circulation.pm (+11 lines)
Lines 1146-1151 sub CanBookBeIssued { Link Here
1146
                    $needsconfirmation{'resreservedate'} = $res->{reservedate};
1146
                    $needsconfirmation{'resreservedate'} = $res->{reservedate};
1147
                    $needsconfirmation{'reserve_id'} = $res->{reserve_id};
1147
                    $needsconfirmation{'reserve_id'} = $res->{reserve_id};
1148
                }
1148
                }
1149
                elsif ( $restype eq "Processing" ) {
1150
                    # The item is determined hold being processed for someone else.
1151
                    $needsconfirmation{PROCESSED} = 1;
1152
                    $needsconfirmation{'resfirstname'} = $patron->firstname;
1153
                    $needsconfirmation{'ressurname'} = $patron->surname;
1154
                    $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
1155
                    $needsconfirmation{'resborrowernumber'} = $patron->borrowernumber;
1156
                    $needsconfirmation{'resbranchcode'} = $patron->branchcode;
1157
                    $needsconfirmation{'resreservedate'} = $res->{reservedate};
1158
                    $needsconfirmation{'reserve_id'} = $res->{reserve_id};
1159
                }
1149
            }
1160
            }
1150
        }
1161
        }
1151
    }
1162
    }
(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-1 / +3 lines)
Lines 70-76 sub do_checkout { Link Here
70
            } elsif ($confirmation eq 'RESERVED' and !C4::Context->preference("AllowItemsOnHoldCheckoutSIP")) {
70
            } elsif ($confirmation eq 'RESERVED' and !C4::Context->preference("AllowItemsOnHoldCheckoutSIP")) {
71
                $self->screen_msg("Item is reserved for another patron upon return.");
71
                $self->screen_msg("Item is reserved for another patron upon return.");
72
                $noerror = 0;
72
                $noerror = 0;
73
            } elsif ($confirmation eq 'RESERVE_WAITING' or $confirmation eq 'TRANSFERRED') {
73
            } elsif ($confirmation eq 'RESERVE_WAITING'
74
                      or $confirmation eq 'TRANSFERRED'
75
                      or $confirmation eq 'PROCESSED') {
74
               $debug and warn "Item is on hold for another patron.";
76
               $debug and warn "Item is on hold for another patron.";
75
               $self->screen_msg("Item is on hold for another patron.");
77
               $self->screen_msg("Item is on hold for another patron.");
76
               $noerror = 0;
78
               $noerror = 0;
(-)a/circ/branchtransfers.pl (-6 / +5 lines)
Lines 176-188 if ($found) { Link Here
176
176
177
    if ( $res->{'ResFound'} eq "Waiting" ) {
177
    if ( $res->{'ResFound'} eq "Waiting" ) {
178
        $waiting = 1;
178
        $waiting = 1;
179
    }
179
    } elsif ( $res->{'ResFound'} eq "Transferred" ) {
180
181
    if ( $res->{'ResFound'} eq "Transferred" ) {
182
        $hold_transferred = 1;
180
        $hold_transferred = 1;
183
    }
181
    } elsif ( $res->{'ResFound'} eq "Processing" ) {
184
182
        $hold_processed = 1;
185
    elsif ( $res->{'ResFound'} eq "Reserved" ) {
183
    } elsif ( $res->{'ResFound'} eq "Reserved" ) {
186
        $reserved  = 1;
184
        $reserved  = 1;
187
        $biblionumber = $res->{'biblionumber'};
185
        $biblionumber = $res->{'biblionumber'};
188
    }
186
    }
Lines 225-230 $template->param( Link Here
225
    reserved                => $reserved,
223
    reserved                => $reserved,
226
    waiting                 => $waiting,
224
    waiting                 => $waiting,
227
    transferred             => $hold_transferred,
225
    transferred             => $hold_transferred,
226
    processed               => $hold_processed,
228
    borrowernumber          => $borrowernumber,
227
    borrowernumber          => $borrowernumber,
229
    itemnumber              => $itemnumber,
228
    itemnumber              => $itemnumber,
230
    barcode                 => $barcode,
229
    barcode                 => $barcode,
(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 422-428 if (@$barcodes) { Link Here
422
        }
422
        }
423
    }
423
    }
424
424
425
    if ($question->{RESERVE_WAITING} or $question->{RESERVED} or $question->{TRANSFERRED}){
425
    if ($question->{RESERVE_WAITING} or $question->{RESERVED} or $question->{TRANSFERRED} or $question->{PROCESSING}){
426
        $template->param(
426
        $template->param(
427
            reserveborrowernumber => $question->{'resborrowernumber'},
427
            reserveborrowernumber => $question->{'resborrowernumber'},
428
            reserve_id => $question->{reserve_id},
428
            reserve_id => $question->{reserve_id},
(-)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 ) %]
53
                    [% IF ( waiting or transferred or processed ) %]
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 (-1 / +14 lines)
Lines 126-131 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 ) %]
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 %]
132
129
                                [% IF ( RESERVED ) %]
133
                                [% IF ( RESERVED ) %]
130
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
134
                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
131
                                [% END %]
135
                                [% END %]
Lines 250-255 Link Here
250
                                        </p>
254
                                        </p>
251
                                    [% END %]
255
                                    [% END %]
252
256
257
                                    [% IF ( PROCESSED ) %]
258
                                        <p>
259
                                            <label for="cancelreserve">Cancel hold</label>
260
                                            <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" /><br />
261
                                            <label for="revertreserve">Revert In Processing status</label>
262
                                            <input type="radio" value="revert" name="cancelreserve" id="revertreserve" checked="checked"/>
263
                                        </p>
264
                                    [% END %]
265
253
                                    <input type="hidden" name="barcode" value="[% barcode | html %]" />
266
                                    <input type="hidden" name="barcode" value="[% barcode | html %]" />
254
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
267
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
255
                                    <input type="hidden" name="issueconfirmed" value="1" />
268
                                    <input type="hidden" name="issueconfirmed" value="1" />
Lines 280-286 Link Here
280
                                </form>
293
                                </form>
281
                            [% END # /IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
294
                            [% END # /IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
282
295
283
                            [% IF ( RESERVED or RESERVE_WAITING or TRANSFERRED ) %]
296
                            [% IF ( RESERVED or RESERVE_WAITING or TRANSFERRED or PROCESSING ) %]
284
                                <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
297
                                <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
285
                                    <input type="hidden" name="restoreduedatespec" />
298
                                    <input type="hidden" name="restoreduedatespec" />
286
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
299
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-2 / +4 lines)
Lines 150-155 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 %]
154
                      <li><i class="fa fa-li fa-warning"></i>This item is on hold and being processed for another patron.</li>
155
                  [% END %]
153
                  [% IF checkout_info.ISSUED_TO_ANOTHER %]
156
                  [% IF checkout_info.ISSUED_TO_ANOTHER %]
154
                      <li><i class="fa fa-li fa-warning"></i>This item is checked out to another patron.
157
                      <li><i class="fa fa-li fa-warning"></i>This item is checked out to another patron.
155
                    [% IF CAN_user_circulate_force_checkout %]
158
                    [% IF CAN_user_circulate_force_checkout %]
Lines 190-196 Link Here
190
                      </script>
193
                      </script>
191
                  [% END %]
194
                  [% END %]
192
195
193
                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED ) %] <!-- 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.PROCESSED ) %] <!-- arbitrary choice, revert the reserve is not possible-->
194
                      <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>
195
                  [% ELSIF checkout_info.RESERVED %]
198
                  [% ELSIF checkout_info.RESERVED %]
196
                      <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>
197
- 

Return to bug 25690