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

(-)a/C4/Circulation.pm (-4 / +5 lines)
Lines 1476-1485 sub AddReturn { Link Here
1476
    # case of a return of document (deal with issues and holdingbranch)
1476
    # case of a return of document (deal with issues and holdingbranch)
1477
    if ($doreturn) {
1477
    if ($doreturn) {
1478
        $borrower or warn "AddReturn without current borrower";
1478
        $borrower or warn "AddReturn without current borrower";
1479
		my $circControlBranch = _GetCircControlBranch($item,$borrower);
1479
		my $circControlBranch;
1480
        if ($dropbox) {
1480
        if ($dropbox) {
1481
            # don't allow dropbox mode to create an invalid entry in issues (issuedate > returndate) FIXME: actually checks eq, not gt
1481
            # define circControlBranch only if dropbox mode is set
1482
            undef($dropbox) if ( $item->{'issuedate'} eq C4::Dates->today('iso') );
1482
            # don't allow dropbox mode to create an invalid entry in issues (issuedate > today)
1483
            # FIXME: check issuedate > returndate, factoring in holidays
1484
            $circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );;
1483
        }
1485
        }
1484
1486
1485
        if ($borrowernumber) {
1487
        if ($borrowernumber) {
1486
- 

Return to bug 4326