Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 8338: (QA follow-up) Clean up warning

Browse source 
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 <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2020-06-23 15:10:50 +01:00 committed by Jonathan Druart
parent 312b1c6887
commit dae82b191a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
C4/Circulation.pm
View file

@ -2060,7 +2060,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
@ -2461,15 +2461,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();
}
}
);