From ee7a67863678b9f67762c89b949b8e35283cd4c9 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 19 Mar 2010 21:18:17 +0000 Subject: [PATCH] Fixes bug 4326: Items marked as returned yesterday Content-Type: text/plain; charset="utf-8" --- C4/Circulation.pm | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index d780189..7184789 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1476,10 +1476,12 @@ sub AddReturn { # case of a return of document (deal with issues and holdingbranch) if ($doreturn) { $borrower or warn "AddReturn without current borrower"; - my $circControlBranch = _GetCircControlBranch($item,$borrower); + my $circControlBranch; if ($dropbox) { - # don't allow dropbox mode to create an invalid entry in issues (issuedate > returndate) FIXME: actually checks eq, not gt - undef($dropbox) if ( $item->{'issuedate'} eq C4::Dates->today('iso') ); + # define circControlBranch only if dropbox mode is set + # don't allow dropbox mode to create an invalid entry in issues (issuedate > today) + # FIXME: check issuedate > returndate, factoring in holidays + $circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );; } if ($borrowernumber) { -- 1.5.6.5