From 3521b99601d6739ea36ba2e79d807fdd49d44972 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 25 Mar 2019 13:29:13 -0400 Subject: [PATCH] Bug 22539: Always recalculate fines when a return date is specified Signed-off-by: Martin Renvoize --- C4/Circulation.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index d15e4709aa..cfc1aff243 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1837,6 +1837,7 @@ sub AddReturn { undef $branch; } $branch = C4::Context->userenv->{'branch'} unless $branch; # we trust userenv to be a safe fallback/default + my $return_date_specified = $return_date ? 1 : 0; $return_date //= dt_from_string(); my $messages; my $patron; @@ -1952,7 +1953,7 @@ sub AddReturn { MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy ); }; unless ( $@ ) { - if ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) { + if ( $return_date_specified || ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) ) { _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } ); } } else { -- 2.20.1