Attachment #87093 for bug #22563

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

Lines 2425-2432 sub _FixAccountForLostAndReturned { Link Here

(-)a/C4/Circulation.pm (-2 / +2 lines)
2425	$credit->apply( { debits => $accountlines->reset } );	2425	$credit->apply( { debits => $accountlines->reset } );
2426	}	2426	}
2427		2427
2428	# Manually set the accounttype	2428	# Update the account status
2429	$accountline->discard_changes->accounttype('LR');	2429	$accountline->discard_changes->status('RETURNED');
2430	$accountline->store;	2430	$accountline->store;
2431		2431
2432	ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } );	2432	ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } );




        [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'A'       -%]<span>Account management fee</span>
        [%- CASE 'M'       -%]<span>Sundry</span>
        [%- CASE 'LOST'    -%]<span>Lost item[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'W'       -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
        [%- CASE 'Rent'    -%]<span>Rental fee</span>
        [%- CASE 'FOR'     -%]<span>Forgiven[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'LR'      -%]<span>Lost item fee refund[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'PF'      -%]<span>Processing fee</span>
        [%- CASE 'PAY'     -%]<span>Payment[%- PROCESS account_status_description account=account -%]</span>
        [%- CASE 'WO'      -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>




                                            [%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%]
                                            [%- CASE 'A'       -%]Account management fee
                                            [%- CASE 'M'       -%]Sundry
                                            [%- 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 -%]
- 

Return to bug 22563

Lines 116-127 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-3 / +1 lines)
116	[%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%]	116	[%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%]
117	[%- CASE 'A' -%]Account management fee	117	[%- CASE 'A' -%]Account management fee
118	[%- CASE 'M' -%]Sundry	118	[%- CASE 'M' -%]Sundry
119	[%- CASE 'LOST' -%]Lost item	119	[%- CASE 'LOST' -%]Lost item[%- PROCESS account_status_description account=account -%]
120	[%- CASE 'W' -%]Writeoff[%- PROCESS account_status_description account=account -%]	120	[%- CASE 'W' -%]Writeoff[%- PROCESS account_status_description account=account -%]
121	[%- CASE 'HE' -%]Hold waiting too long	121	[%- CASE 'HE' -%]Hold waiting too long
122	[%- CASE 'Rent' -%]Rental fee	122	[%- CASE 'Rent' -%]Rental fee
123	[%- CASE 'FOR' -%]Forgiven[%- PROCESS account_status_description account=account -%]	123	[%- CASE 'FOR' -%]Forgiven[%- PROCESS account_status_description account=account -%]
124	[%- CASE 'LR' -%]Lost item fee refund[%- PROCESS account_status_description account=account -%]
125	[%- CASE 'PF' -%]Processing fee	124	[%- CASE 'PF' -%]Processing fee
126	[%- CASE 'PAY' -%]Payment[%- PROCESS account_status_description account=account -%]	125	[%- CASE 'PAY' -%]Payment[%- PROCESS account_status_description account=account -%]
127	[%- CASE 'WO' -%]Writeoff[%- PROCESS account_status_description account=account -%]	126	[%- CASE 'WO' -%]Writeoff[%- PROCESS account_status_description account=account -%]
128	-

Lines 8-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-2 / +1 lines)
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>