@@ -, +, @@ --- C4/Circulation.pm | 8 +++++--- C4/SIP/ILS.pm | 2 +- C4/SIP/ILS/Transaction/Checkin.pm | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -1708,7 +1708,8 @@ patron who last borrowed the book. =cut sub AddReturn { - my ( $barcode, $branch, $exemptfine, $dropbox ) = @_; + my ( $barcode, $branch, $exemptfine, $dropbox, $return_date) = @_; +warn "AddReturn( $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'}; @@ -1779,7 +1780,8 @@ sub AddReturn { } # case of a return of document (deal with issues and holdingbranch) - my $today = DateTime->now( time_zone => C4::Context->tz() ); + my $today = dt_from_string( $return_date, 'iso' ); + if ($doreturn) { my $datedue = $issue->{date_due}; $borrower or warn "AddReturn without current borrower"; @@ -1819,7 +1821,7 @@ sub AddReturn { } MarkIssueReturned( $borrowernumber, $item->{'itemnumber'}, - $circControlBranch, '', $borrower->{'privacy'} ); + $circControlBranch, $return_date, $borrower->{'privacy'} ); # FIXME is the "= 1" right? This could be the borrower hash. $messages->{'WasReturned'} = 1; --- a/C4/SIP/ILS.pm +++ a/C4/SIP/ILS.pm @@ -181,7 +181,7 @@ sub checkin { $circ->item($item = new ILS::Item $item_id); if ($item) { - $circ->do_checkin($current_loc); + $circ->do_checkin($current_loc, $return_date); } else { $circ->alert(1); $circ->alert_type(99); --- a/C4/SIP/ILS/Transaction/Checkin.pm +++ a/C4/SIP/ILS/Transaction/Checkin.pm @@ -16,6 +16,7 @@ use C4::Circulation; use C4::Reserves qw( ModReserveAffect ); use C4::Items qw( ModItemTransfer ); use C4::Debug; +use Koha::DateUtils; use parent qw(ILS::Transaction); @@ -47,12 +48,26 @@ sub new { sub do_checkin { my $self = shift; my $branch = shift; + my $return_date = shift; if (!$branch) { $branch = 'SIP2'; } my $barcode = $self->{item}->id; + + $return_date = substr( $return_date, 0, 4 ) + . '-' + . substr( $return_date, 4, 2 ) + . '-' + . substr( $return_date, 6, 2 ) + . q{ } + . substr( $return_date, 12, 2 ) + . ':' + . substr( $return_date, 14, 2 ) + . ':' + . substr( $return_date, 16, 2 ); + $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 --