From bd36131eda5da7a2706e34bfb6567cdcffc5e2b7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 18 Apr 2019 08:45:54 +0100 Subject: [PATCH] Bug 22563: (follow-up) Items LOST should not be RETURNED Up until now we marked lost items as returned in the accountlines, now we have the oportunity to mark these distinctly with an appropriate status we should. Test Plan 1) Find an overdue with fines 2) Ensure you are not forgiving fines when an item is marked as lost 3) Mark the item as lost 4) Confirm the Fine is given a status of 'Lost' Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall --- C4/Circulation.pm | 18 ++++++++++++------ .../prog/en/includes/accounts.inc | 1 + .../bootstrap/en/includes/account-table.inc | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 8f72407717..5ac7a0f411 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2031,7 +2031,7 @@ sub AddReturn { # fix up the overdues in accounts... if ($borrowernumber) { - my $fix = _FixOverduesOnReturn( $borrowernumber, $item->itemnumber, $exemptfine ); + my $fix = _FixOverduesOnReturn( $borrowernumber, $item->itemnumber, $exemptfine, 'RETURNED' ); defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->itemnumber...) failed!"; # zero is OK, check defined if ( $issue and $issue->is_overdue ) { @@ -2315,7 +2315,7 @@ sub _debar_user_on_return { =head2 _FixOverduesOnReturn - &_FixOverduesOnReturn($borrowernumber, $itemnumber, $exemptfine); + &_FixOverduesOnReturn($borrowernumber, $itemnumber, $exemptfine, $status); C<$borrowernumber> borrowernumber @@ -2323,12 +2323,14 @@ C<$itemnumber> itemnumber C<$exemptfine> BOOL -- remove overdue charge associated with this issue. +C<$status> ENUM -- reason for fix [ RETURNED, RENEWED, LOST, FORGIVEN ] + Internal function =cut sub _FixOverduesOnReturn { - my ( $borrowernumber, $item, $exemptfine ) = @_; + my ( $borrowernumber, $item, $exemptfine, $status ) = @_; unless( $borrowernumber ) { warn "_FixOverduesOnReturn() not supplied valid borrowernumber"; return; @@ -2337,6 +2339,10 @@ sub _FixOverduesOnReturn { warn "_FixOverduesOnReturn() not supplied valid itemnumber"; return; } + unless( $status ) { + warn "_FixOverduesOnReturn() not supplied valid status"; + return; + } my $schema = Koha::Database->schema; @@ -2377,7 +2383,7 @@ sub _FixOverduesOnReturn { &logaction("FINES", 'MODIFY',$borrowernumber,"Overdue forgiven: item $item"); } } else { - $accountline->status('RETURNED'); + $accountline->status($status); } return $accountline->store(); @@ -2868,7 +2874,7 @@ sub AddRenewal { if ( C4::Context->preference('CalculateFinesOnReturn') && $issue->is_overdue ) { _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed } ); } - _FixOverduesOnReturn( $borrowernumber, $itemnumber ); + _FixOverduesOnReturn( $borrowernumber, $itemnumber, undef, 'RENEWED' ); # If the due date wasn't specified, calculate it by adding the # book's loan length to today's date or the current due date @@ -3713,7 +3719,7 @@ sub LostItem{ if ( my $borrowernumber = $issues->{borrowernumber} ){ my $patron = Koha::Patrons->find( $borrowernumber ); - my $fix = _FixOverduesOnReturn($borrowernumber, $itemnumber, C4::Context->preference('WhenLostForgiveFine'), 0); # 1, 0 = exemptfine, no-dropbox + my $fix = _FixOverduesOnReturn($borrowernumber, $itemnumber, C4::Context->preference('WhenLostForgiveFine'), 'LOST'); defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $itemnumber...) failed!"; # zero is OK, check defined if (C4::Context->preference('WhenLostChargeReplacementFee')){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index dfce02b6fe..e221af6525 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -44,6 +44,7 @@ [%- CASE 'REPLACED' -%] (Replaced) [%- CASE 'FORGIVEN' -%] (Forgiven) [%- CASE 'VOID' -%] (Voided) + [%- CASE 'LOST' -%] (Lost) [%- CASE -%] [%- END -%] [%- END -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 549e9459f2..230ff9c435 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -150,6 +150,7 @@ [%- CASE 'REPLACED' -%] (Replaced) [%- CASE 'FORGIVEN' -%] (Forgiven) [%- CASE 'VOID' -%] (Voided) + [%- CASE 'LOST' -%] (Lost) [%- CASE -%] [%- END -%] [%- END -%] -- 2.22.0