From 1579972965abce8ae0898f85f89a4513baa55e0a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 22 Mar 2019 16:28:52 +0000 Subject: [PATCH] Bug 22563: Update lost handling to use accountline.status Signed-off-by: Martin Renvoize --- C4/Circulation.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5744cfce52..c037b63c5b 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2426,8 +2426,8 @@ sub _FixAccountForLostAndReturned { $credit->apply( { debits => $accountlines->reset } ); } - # Manually set the accounttype - $accountline->discard_changes->accounttype('LR'); + # Update the account status + $accountline->discard_changes->status('RETURNED'); $accountline->store; ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index c6f68d803a..9e290dcabf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -8,12 +8,11 @@ [%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%] [%- CASE 'A' -%]Account management fee [%- CASE 'M' -%]Sundry - [%- CASE 'LOST' -%]Lost item + [%- CASE 'LOST' -%]Lost item[%- PROCESS account_status_description account=account -%] [%- CASE 'W' -%]Writeoff[%- PROCESS account_status_description account=account -%] [%- CASE 'HE' -%]Hold waiting too long [%- CASE 'Rent' -%]Rental fee [%- CASE 'FOR' -%]Forgiven[%- PROCESS account_status_description account=account -%] - [%- CASE 'LR' -%]Lost item fee refund[%- PROCESS account_status_description account=account -%] [%- CASE 'PF' -%]Processing fee [%- CASE 'PAY' -%]Payment[%- PROCESS account_status_description account=account -%] [%- CASE 'WO' -%]Writeoff[%- PROCESS account_status_description account=account -%] 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 493c02e020..4fa773568a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -36,12 +36,11 @@ [% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%] [% CASE 'A' %]Account management fee [% CASE 'M' %]Sundry - [% CASE 'LOST' %]Lost item + [% CASE 'LOST' %]Lost item[%- PROCESS account_status_description account=account -%] [% CASE 'W' %]Writeoff[%- PROCESS account_status_description account=account -%] [% CASE 'HE' %]Hold waiting too long [% CASE 'Rent' %]Rental fee [% CASE 'FOR' %]Forgiven[%- PROCESS account_status_description account=account -%] - [% CASE 'LR' %]Lost item fee refund[%- PROCESS account_status_description account=account -%] [% CASE 'PF' %]Processing fee [% CASE 'PAY' %]Payment[%- PROCESS account_status_description account=account -%] [% CASE 'WO' %]Writeoff[%- PROCESS account_status_description account=account -%] -- 2.20.1