From 325e6947e3eb95a84a15a3e93e346b5a5cbd091f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 5 Jul 2017 17:11:24 -0300
Subject: [PATCH] Bug 17680: Fix conflict with bug 18651

$issue is now a Koha::Checkout, not a hashref

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 C4/Circulation.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8ee7e6e..6303c86 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1938,7 +1938,7 @@ sub AddReturn {
             eval {
                 my $issue_id = MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
                     $circControlBranch, $return_date, $borrower->{'privacy'} );
-                $issue->{issue_id} = $issue_id;
+                $issue->issue_id($issue_id);
             };
             unless ( $@ ) {
                 if ( ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) || $return_date ) {
-- 
2.7.4