From a48123c2131ba9f28f174e0cfc51807e1e42b9ad Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 23 Jun 2020 15:10:50 +0100 Subject: [PATCH] Bug 8338: (QA follow-up) Clean up warning This patch moves the accountline->store call below the FinesLog code such that we return the same 'thing' from _FixOverduesOnReturn as the other clauses of the routine. We also take the oportunity to clean up the warning thrown by an errant call to the routine such that we output the actual itemnumber rather than a HASH reference marker. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit dae82b191abb87b88e6f455179f5776ce04dc2b8) Signed-off-by: Lucas Gass --- C4/Circulation.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index f0bfcff1c3..1195e249c3 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2053,7 +2053,7 @@ sub AddReturn { # fix up the overdues in accounts... if ($borrowernumber) { my $fix = _FixOverduesOnReturn( $borrowernumber, $item->itemnumber, $exemptfine, 'RETURNED' ); - defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->itemnumber...) failed!"; # zero is OK, check defined + defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, ".$item->itemnumber."...) failed!"; # zero is OK, check defined if ( $issue and $issue->is_overdue($return_date) ) { # fix fine days @@ -2453,15 +2453,16 @@ sub _FixOverduesOnReturn { $credit->apply({ debits => [ $accountline ], offset_type => 'Forgiven' }); - $accountline->status('FORGIVEN'); - $accountline->store(); - if (C4::Context->preference("FinesLog")) { &logaction("FINES", 'MODIFY',$borrowernumber,"Overdue forgiven: item $item"); } + + $accountline->status('FORGIVEN'); + $accountline->store(); } else { $accountline->status($status); $accountline->store(); + } } ); -- 2.39.5