From 114b738466e1a1ab3ee9741b86a02c5560c69ed2 Mon Sep 17 00:00:00 2001
From: David Bourgault <dav.bour@gmail.com>
Date: Tue, 1 May 2018 14:03:52 -0400
Subject: [PATCH] Bug 20660: Return date override affects debarments in
 AddReturn

Re-did the patch to follow best practices.

TEST PLAN:
0. Apply first patch only
1. prove t/db_dependent/Circulation.t
2. Apply second patch
3. prove t/db_dependent/Circulation.t

prove should fail the first time and pass the second time.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit bf9527457fb31012b65514a36f8f4001157771b4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 C4/Circulation.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8e1bdc49fc..02bcfc0215 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1988,6 +1988,7 @@ sub AddReturn {
 
         if ( $issue and $issue->is_overdue ) {
         # fix fine days
+            $today = $return_date if $return_date;
             $today = $dropboxdate if $dropbox;
             my ($debardate,$reminder) = _debar_user_on_return( $patron_unblessed, $item, dt_from_string($issue->date_due), $today );
             if ($reminder){
-- 
2.39.5