From 41dcae67d049e5be03d4d11fa614993369da1fad Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 15 Oct 2012 08:15:13 -0400 Subject: [PATCH] Bug 8769 - Allow SIP2 return backdating Content-Type: text/plain; charset="utf-8" Patch based on code by Scott Kushner --- C4/Circulation.pm | 4 ++-- C4/SIP/ILS/Transaction/Checkin.pm | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 7485de5..a5b82b3 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1678,7 +1678,7 @@ patron who last borrowed the book. =cut sub AddReturn { - my ( $barcode, $branch, $exemptfine, $dropbox ) = @_; + my ( $barcode, $branch, $exemptfine, $dropbox, $return_date) = @_; if ($branch and not GetBranchDetail($branch)) { warn "AddReturn error: branch '$branch' not found. Reverting to " . C4::Context->userenv->{'branch'}; @@ -1775,7 +1775,7 @@ sub AddReturn { ); } } - MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'}); + MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, $return_date, $borrower->{'privacy'}); $messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash. } diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm index 47bd85d..2029a0b 100644 --- a/C4/SIP/ILS/Transaction/Checkin.pm +++ b/C4/SIP/ILS/Transaction/Checkin.pm @@ -46,13 +46,12 @@ sub new { sub do_checkin { my $self = shift; - my $branch = shift; - if (!$branch) { - $branch = 'SIP2'; - } + my $branch = shift || 'SIP2'; + my $return_date = shift; + my $barcode = $self->{item}->id; $debug and warn "do_checkin() calling AddReturn($barcode, $branch)"; - my ($return, $messages, $iteminformation, $borrower) = AddReturn($barcode, $branch); + my ($return, $messages, $iteminformation, $borrower) = AddReturn($barcode, $branch, undef, undef, $return_date); $self->alert(!$return); # ignoring messages: NotIssued, IsPermanent, WasLost, WasTransfered -- 1.7.2.5