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

(-)a/C4/Circulation.pm (-8 / +12 lines)
Lines 1415-1421 sub GetBranchItemRule { Link Here
1415
=head2 AddReturn
1415
=head2 AddReturn
1416
1416
1417
  ($doreturn, $messages, $iteminformation, $borrower) =
1417
  ($doreturn, $messages, $iteminformation, $borrower) =
1418
      &AddReturn($barcode, $branch, $exemptfine, $dropbox);
1418
      &AddReturn($barcode, $branch, $exemptfine, $dropbox, $ignore_reserves);
1419
1419
1420
Returns a book.
1420
Returns a book.
1421
1421
Lines 1434-1439 overdue charges are applied and C<$dropbox> is true, the last charge Link Here
1434
will be removed.  This assumes that the fines accrual script has run
1434
will be removed.  This assumes that the fines accrual script has run
1435
for _today_.
1435
for _today_.
1436
1436
1437
=item C<$ignore_reserves> indicates that the check-in should not
1438
attempt to find reserves to full using this item.
1439
1437
=back
1440
=back
1438
1441
1439
C<&AddReturn> returns a list of four items:
1442
C<&AddReturn> returns a list of four items:
Lines 1487-1493 patron who last borrowed the book. Link Here
1487
=cut
1490
=cut
1488
1491
1489
sub AddReturn {
1492
sub AddReturn {
1490
    my ( $barcode, $branch, $exemptfine, $dropbox ) = @_;
1493
    my ( $barcode, $branch, $exemptfine, $dropbox, $ignore_reserves ) = @_;
1491
1494
1492
    if ($branch and not GetBranchDetail($branch)) {
1495
    if ($branch and not GetBranchDetail($branch)) {
1493
        warn "AddReturn error: branch '$branch' not found.  Reverting to " . C4::Context->userenv->{'branch'};
1496
        warn "AddReturn error: branch '$branch' not found.  Reverting to " . C4::Context->userenv->{'branch'};
Lines 1644-1655 sub AddReturn { Link Here
1644
        }
1647
        }
1645
    }
1648
    }
1646
1649
1647
    # find reserves.....
1650
    my ( $resfound, $resrec );
1648
    # if we don't have a reserve with the status W, we launch the Checkreserves routine
1651
    unless ( $ignore_reserves ) {
1649
    my ($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
1652
        ( $resfound, $resrec ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
1650
    if ($resfound) {
1653
        if ($resfound) {
1651
          $resrec->{'ResFound'} = $resfound;
1654
            $resrec->{'ResFound'} = $resfound;
1652
        $messages->{'ResFound'} = $resrec;
1655
            $messages->{'ResFound'} = $resrec;
1656
        }
1653
    }
1657
    }
1654
1658
1655
    # update stats?
1659
    # update stats?
(-)a/circ/returns.pl (-2 / +4 lines)
Lines 171-176 my $messages; Link Here
171
my $issueinformation;
171
my $issueinformation;
172
my $itemnumber;
172
my $itemnumber;
173
my $barcode     = $query->param('barcode');
173
my $barcode     = $query->param('barcode');
174
my $ignore_reserves = $query->param('ignore_reserves');
174
my $exemptfine  = $query->param('exemptfine');
175
my $exemptfine  = $query->param('exemptfine');
175
my $dropboxmode = $query->param('dropboxmode');
176
my $dropboxmode = $query->param('dropboxmode');
176
my $dotransfer  = $query->param('dotransfer');
177
my $dotransfer  = $query->param('dotransfer');
Lines 216-222 if ($barcode) { Link Here
216
# save the return
217
# save the return
217
#
218
#
218
    ( $returned, $messages, $issueinformation, $borrower ) =
219
    ( $returned, $messages, $issueinformation, $borrower ) =
219
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode);     # do the return
220
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $ignore_reserves );     # do the return
220
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn');
221
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn');
221
    $homeorholdingbranchreturn ||= 'homebranch';
222
    $homeorholdingbranchreturn ||= 'homebranch';
222
223
Lines 400-406 if ( $messages->{'ResFound'}) { Link Here
400
            borcnum        => $borr->{'cardnumber'},
401
            borcnum        => $borr->{'cardnumber'},
401
            debarred       => $borr->{'debarred'},
402
            debarred       => $borr->{'debarred'},
402
            gonenoaddress  => $borr->{'gonenoaddress'},
403
            gonenoaddress  => $borr->{'gonenoaddress'},
403
            barcode        => $barcode,
404
            destbranch     => $reserve->{'branchcode'},
404
            destbranch     => $reserve->{'branchcode'},
405
            borrowernumber => $reserve->{'borrowernumber'},
405
            borrowernumber => $reserve->{'borrowernumber'},
406
            itemnumber     => $reserve->{'itemnumber'},
406
            itemnumber     => $reserve->{'itemnumber'},
Lines 625-629 $template->param( Link Here
625
#    }
625
#    }
626
#}                                                                                                            
626
#}                                                                                                            
627
627
628
$template->param( barcode => $barcode );
629
628
# actually print the page!
630
# actually print the page!
629
output_html_with_http_headers $query, $cookie, $template->output;
631
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-5 / +21 lines)
Lines 297-307 $(document).ready(function () { Link Here
297
                <input type="submit" class="approve" value="Confirm hold" />
297
                <input type="submit" class="approve" value="Confirm hold" />
298
                <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
298
                <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
299
            [% END %]
299
            [% END %]
300
                <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
300
301
            [% FOREACH inputloo IN inputloop %]
301
            [% FOREACH inputloo IN inputloop %]
302
	<input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
302
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
303
	<input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
303
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
304
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
304
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
305
            [% END %]
305
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
306
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
306
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
307
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
307
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
308
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
Lines 309-314 $(document).ready(function () { Link Here
309
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
310
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
310
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
311
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
311
        </form>
312
        </form>
313
314
        <form method="post" action="returns.pl" class="ignore">
315
            [% FOREACH inputloo IN inputloop %]
316
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
317
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
318
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
319
            [% END %]
320
321
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
322
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
323
324
            <input type="hidden" name="barcode" value="[% barcode %]" />
325
            <input type="hidden" name="ignore_reserves" value="1" />
326
327
            <input type="submit" class="deny" value="Ignore" />
328
        </form>
312
	</div>
329
	</div>
313
    [% END %]
330
    [% END %]
314
[% ELSE %]
331
[% ELSE %]
315
- 

Return to bug 8292