View | Details | Raw Unified | Return to bug 22563
Collapse All | Expand All

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 2426-2433 sub _FixAccountForLostAndReturned { Link Here
2426
        $credit->apply( { debits => $accountlines->reset } );
2426
        $credit->apply( { debits => $accountlines->reset } );
2427
    }
2427
    }
2428
2428
2429
    # Manually set the accounttype
2429
    # Update the account status
2430
    $accountline->discard_changes->accounttype('LR');
2430
    $accountline->discard_changes->status('RETURNED');
2431
    $accountline->store;
2431
    $accountline->store;
2432
2432
2433
    ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } );
2433
    ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-2 / +1 lines)
Lines 8-19 Link Here
8
        [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
8
        [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
9
        [%- CASE 'A'       -%]<span>Account management fee</span>
9
        [%- CASE 'A'       -%]<span>Account management fee</span>
10
        [%- CASE 'M'       -%]<span>Sundry</span>
10
        [%- CASE 'M'       -%]<span>Sundry</span>
11
        [%- CASE 'LOST'    -%]<span>Lost item</span>
11
        [%- CASE 'LOST'    -%]<span>Lost item[%- PROCESS account_status_description account=account -%]</span>
12
        [%- CASE 'W'       -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
12
        [%- CASE 'W'       -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
13
        [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
13
        [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
14
        [%- CASE 'Rent'    -%]<span>Rental fee</span>
14
        [%- CASE 'Rent'    -%]<span>Rental fee</span>
15
        [%- CASE 'FOR'     -%]<span>Forgiven[%- PROCESS account_status_description account=account -%]</span>
15
        [%- CASE 'FOR'     -%]<span>Forgiven[%- PROCESS account_status_description account=account -%]</span>
16
        [%- CASE 'LR'      -%]<span>Lost item fee refund[%- PROCESS account_status_description account=account -%]</span>
17
        [%- CASE 'PF'      -%]<span>Processing fee</span>
16
        [%- CASE 'PF'      -%]<span>Processing fee</span>
18
        [%- CASE 'PAY'     -%]<span>Payment[%- PROCESS account_status_description account=account -%]</span>
17
        [%- CASE 'PAY'     -%]<span>Payment[%- PROCESS account_status_description account=account -%]</span>
19
        [%- CASE 'WO'      -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
18
        [%- CASE 'WO'      -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-3 / +1 lines)
Lines 36-47 Link Here
36
                        [% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%]
36
                        [% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%]
37
                        [% CASE 'A' %]Account management fee
37
                        [% CASE 'A' %]Account management fee
38
                        [% CASE 'M' %]Sundry
38
                        [% CASE 'M' %]Sundry
39
                        [% CASE 'LOST' %]Lost item
39
                        [% CASE 'LOST' %]Lost item[%- PROCESS account_status_description account=account -%]
40
                        [% CASE 'W' %]Writeoff[%- PROCESS account_status_description account=account -%]
40
                        [% CASE 'W' %]Writeoff[%- PROCESS account_status_description account=account -%]
41
                        [% CASE 'HE' %]Hold waiting too long
41
                        [% CASE 'HE' %]Hold waiting too long
42
                        [% CASE 'Rent' %]Rental fee
42
                        [% CASE 'Rent' %]Rental fee
43
                        [% CASE 'FOR' %]Forgiven[%- PROCESS account_status_description account=account -%]
43
                        [% CASE 'FOR' %]Forgiven[%- PROCESS account_status_description account=account -%]
44
                        [% CASE 'LR' %]Lost item fee refund[%- PROCESS account_status_description account=account -%]
45
                        [% CASE 'PF' %]Processing fee
44
                        [% CASE 'PF' %]Processing fee
46
                        [% CASE 'PAY' %]Payment[%- PROCESS account_status_description account=account -%]
45
                        [% CASE 'PAY' %]Payment[%- PROCESS account_status_description account=account -%]
47
                        [% CASE 'WO' %]Writeoff[%- PROCESS account_status_description account=account -%]
46
                        [% CASE 'WO' %]Writeoff[%- PROCESS account_status_description account=account -%]
48
- 

Return to bug 22563