Attachment 87638 Details for Bug 22563 – Bug 22563: Update lost handling to use accountline.status

[patch] Bug 22563: Update lost handling to use accountline.status

Bug-22563-Update-lost-handling-to-use-accountlines.patch (text/plain), 3.89 KB, created by Martin Renvoize (ashimema) on 2019-04-09 16:30:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-04-09 16:30:39 UTC

Size: 3.89 KB

patch

obsolete

>From 1579972965abce8ae0898f85f89a4513baa55e0a Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <martin.renvoize@ptfs-europe.com>
>---
> 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

Actions: View | Diff | Splinter Review

Attachments on bug 22563: 86913 | 86914 | 87092 | 87093 | 87094 | 87637 | 87638 | 87639 | 87640 | 87641 | 87642 | 87801 | 87802 | 87803 | 87804 | 87805 | 87806 | 88279 | 88280 | 88281 | 88282 | 88283 | 88284 | 88285 | 88323 | 88324 | 88325 | 88326 | 88327 | 88328 | 88720 | 88721 | 88722 | 88723 | 88724 | 88725 | 89462 | 89463 | 89464 | 89465 | 89466 | 89467 | 90221 | 90222 | 90223 | 90224 | 90225 | 90226 | 90227 | 90307 | 90308 | 90309 | 90310 | 90311 | 90312 | 90330 | 90331 | 90332 | 90333 | 90334 | 90335 | 90632 | 90637 | 90667 | 91338 | 91339 | 91340 | 91341 | 91342 | 91343 | 91344 | 91345 | 91346 | 91347 | 91348