From 85c65785493bf5f95d5fed6bd0bc4b19a8b7bf5b 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.
---
 C4/Circulation.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 2deb367..0b0945d 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1985,6 +1985,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.7.4