Don't pass a Dropbox Branch to MarkIssueReturned if we aren't in dropbox mode.
---
C4/Circulation.pm | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index d780189..dc44f52 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1476,14 +1476,16 @@ 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 $dropbox_Branch = _GetCircControlBranch($item,$borrower);
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') );
+ } else {
+ undef($dropbox_Branch); # Dont need this set
}
if ($borrowernumber) {
- MarkIssueReturned($borrowernumber, $item->{'itemnumber'},
$circControlBranch);
+ MarkIssueReturned($borrowernumber, $item->{'itemnumber'},
$dropbox_Branch);
$messages->{'WasReturned'} = 1; # FIXME is the "= 1" right?
This could be the borrower hash.
}
--
1.6.3.3
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
