From 3cc7a90ddbae2fd683affb683646077011372eb1 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 4 Jun 2020 11:17:35 -0400
Subject: [PATCH] Bug 25552: Mark issue as returned if MarkLostItemsAsReturned,
 even if not charging a lost fee

Signed-off-by: Marti Fyerst <mfuerst@hmcpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 0e46d4017f310d6011ef66eb2611b6524dc4044c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 2dd76096f991ea4d91f97b7025a05c96edc56889)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 Koha/Checkout.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Koha/Checkout.pm b/Koha/Checkout.pm
index 9180bf4df7..955a961150 100644
--- a/Koha/Checkout.pm
+++ b/Koha/Checkout.pm
@@ -24,6 +24,7 @@ use Carp;
 use DateTime;
 use Try::Tiny;
 
+use C4::Circulation qw(MarkIssueReturned);
 use Koha::Checkouts::ReturnClaims;
 use Koha::Database;
 use Koha::DateUtils;
@@ -145,7 +146,13 @@ sub claim_returned {
                     $ClaimReturnedChargeFee eq 'charge'    ? 1
                 : $ClaimReturnedChargeFee eq 'no_charge' ? 0
                 :   $charge_lost_fee;    # $ClaimReturnedChargeFee eq 'ask'
-                C4::Circulation::LostItem( $self->itemnumber, 'claim_returned' ) if $charge_lost_fee;
+
+                if ( $charge_lost_fee ) {
+                    C4::Circulation::LostItem( $self->itemnumber, 'claim_returned' );
+                }
+                elsif ( C4::Context->preference( 'MarkLostItemsAsReturned' ) =~ m/claim_returned/ ) {
+                    C4::Circulation::MarkIssueReturned( $self->borrowernumber, $self->itemnumber, undef, $self->patron->privacy );
+                }
 
                 return $claim;
             }
-- 
2.20.1