---
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
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
