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

(-)a/C4/Circulation.pm (-7 / +12 lines)
Lines 1612-1618 sub GetBranchItemRule { Link Here
1612
=head2 AddReturn
1612
=head2 AddReturn
1613
1613
1614
  ($doreturn, $messages, $iteminformation, $borrower) =
1614
  ($doreturn, $messages, $iteminformation, $borrower) =
1615
      &AddReturn($barcode, $branch, $exemptfine, $dropbox);
1615
      &AddReturn($barcode, $branch, $exemptfine, $dropbox, $ignore_reserves);
1616
1616
1617
Returns a book.
1617
Returns a book.
1618
1618
Lines 1631-1636 overdue charges are applied and C<$dropbox> is true, the last charge Link Here
1631
will be removed.  This assumes that the fines accrual script has run
1631
will be removed.  This assumes that the fines accrual script has run
1632
for _today_.
1632
for _today_.
1633
1633
1634
=item C<$ignore_reserves> indicates that the check-in should not
1635
attempt to find reserves to full using this item.
1636
1634
=back
1637
=back
1635
1638
1636
C<&AddReturn> returns a list of four items:
1639
C<&AddReturn> returns a list of four items:
Lines 1684-1690 patron who last borrowed the book. Link Here
1684
=cut
1687
=cut
1685
1688
1686
sub AddReturn {
1689
sub AddReturn {
1687
    my ( $barcode, $branch, $exemptfine, $dropbox ) = @_;
1690
    my ( $barcode, $branch, $exemptfine, $dropbox, $ignore_reserves ) = @_;
1688
1691
1689
    if ($branch and not GetBranchDetail($branch)) {
1692
    if ($branch and not GetBranchDetail($branch)) {
1690
        warn "AddReturn error: branch '$branch' not found.  Reverting to " . C4::Context->userenv->{'branch'};
1693
        warn "AddReturn error: branch '$branch' not found.  Reverting to " . C4::Context->userenv->{'branch'};
Lines 1843-1853 sub AddReturn { Link Here
1843
1846
1844
    # find reserves.....
1847
    # find reserves.....
1845
    # if we don't have a reserve with the status W, we launch the Checkreserves routine
1848
    # if we don't have a reserve with the status W, we launch the Checkreserves routine
1846
    my ($resfound, $resrec);
1849
    my ( $resfound, $resrec );
1847
    ($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->{'itemnumber'} ) unless ( $item->{'wthdrawn'} );
1850
    unless ( $ignore_reserves ) {
1848
    if ($resfound) {
1851
        ( $resfound, $resrec ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} )  unless ( $item->{'wthdrawn'} );
1849
          $resrec->{'ResFound'} = $resfound;
1852
        if ($resfound) {
1850
        $messages->{'ResFound'} = $resrec;
1853
            $resrec->{'ResFound'} = $resfound;
1854
            $messages->{'ResFound'} = $resrec;
1855
        }
1851
    }
1856
    }
1852
1857
1853
    # update stats?
1858
    # 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 390-396 if ( $messages->{'ResFound'}) { Link Here
390
            borcnum        => $borr->{'cardnumber'},
391
            borcnum        => $borr->{'cardnumber'},
391
            debarred       => $borr->{'debarred'},
392
            debarred       => $borr->{'debarred'},
392
            gonenoaddress  => $borr->{'gonenoaddress'},
393
            gonenoaddress  => $borr->{'gonenoaddress'},
393
            barcode        => $barcode,
394
            destbranch     => $reserve->{'branchcode'},
394
            destbranch     => $reserve->{'branchcode'},
395
            borrowernumber => $reserve->{'borrowernumber'},
395
            borrowernumber => $reserve->{'borrowernumber'},
396
            itemnumber     => $reserve->{'itemnumber'},
396
            itemnumber     => $reserve->{'itemnumber'},
Lines 556-560 $template->param( Link Here
556
#    }
556
#    }
557
#}                                                                                                            
557
#}                                                                                                            
558
558
559
$template->param( barcode => $barcode );
560
559
# actually print the page!
561
# actually print the page!
560
output_html_with_http_headers $query, $cookie, $template->output;
562
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-5 / +21 lines)
Lines 299-309 $(document).ready(function () { Link Here
299
                <input type="submit" class="approve" value="Confirm hold" />
299
                <input type="submit" class="approve" value="Confirm hold" />
300
                <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();" />
300
                <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();" />
301
            [% END %]
301
            [% END %]
302
                <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
302
303
            [% FOREACH inputloo IN inputloop %]
303
            [% FOREACH inputloo IN inputloop %]
304
	<input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
304
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
305
	<input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
305
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
306
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
306
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
307
            [% END %]
307
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
308
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
308
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
309
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
309
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
310
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
Lines 311-316 $(document).ready(function () { Link Here
311
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
312
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
312
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
313
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
313
        </form>
314
        </form>
315
316
        <form method="post" action="returns.pl" class="ignore">
317
            [% FOREACH inputloo IN inputloop %]
318
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
319
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
320
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
321
            [% END %]
322
323
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
324
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
325
326
            <input type="hidden" name="barcode" value="[% barcode %]" />
327
            <input type="hidden" name="ignore_reserves" value="1" />
328
329
            <input type="submit" class="deny" value="Ignore" />
330
        </form>
314
	</div>
331
	</div>
315
    [% END %]
332
    [% END %]
316
[% ELSE %]
333
[% ELSE %]
317
- 

Return to bug 8292