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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-26 / +34 lines)
Lines 1-33 Link Here
1
[%- BLOCK account_type_description -%]
1
[%- BLOCK account_type_description -%]
2
    <span>
2
    <span>
3
    [%- IF account.credit_type_code -%]
3
    [%- IF account.credit_type_code -%]
4
        [%- SWITCH account.credit_type_code -%]
4
        [%- PROCESS credit_type_description credit_type = account.credit_type -%]
5
            [%- CASE 'PAYMENT'          -%]Payment
6
            [%- CASE 'WRITEOFF'         -%]Writeoff
7
            [%- CASE 'FORGIVEN'         -%]Forgiven
8
            [%- CASE 'CREDIT'           -%]Credit
9
            [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
10
            [%- CASE 'Refund'           -%]Refund
11
            [%- CASE                    -%][% account.credit_type.description | html %]
12
        [%- END -%]
13
    [%- ELSIF account.debit_type_code -%]
5
    [%- ELSIF account.debit_type_code -%]
14
       [%- SWITCH account.debit_type_code -%]
6
        [%- PROCESS debit_type_description debit_type = account.debit_type -%]
15
           [%- CASE 'ACCOUNT'          -%]Account creation fee
16
           [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
17
           [%- CASE 'LOST'             -%]Lost item
18
           [%- CASE 'MANUAL'           -%]Manual fee
19
           [%- CASE 'NEW_CARD'         -%]New card
20
           [%- CASE 'OVERDUE'          -%]Fine
21
           [%- CASE 'PROCESSING'       -%]Lost item processing fee
22
           [%- CASE 'RENT'             -%]Rental fee
23
           [%- CASE 'RENT_DAILY'       -%]Daily rental fee
24
           [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
25
           [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
26
           [%- CASE 'RESERVE'          -%]Hold fee
27
           [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
28
           [%- CASE 'Payout'           -%]Payout
29
           [%- CASE                    -%][% account.debit_type.description | html %]
30
       [%- END -%]
31
    [%- END -%]
7
    [%- END -%]
32
    [%- PROCESS account_status_description account=account -%]
8
    [%- PROCESS account_status_description account=account -%]
33
    </span>
9
    </span>
Lines 58-60 Link Here
58
        [%- CASE              -%]
34
        [%- CASE              -%]
59
    [%- END -%]
35
    [%- END -%]
60
[%- END -%]
36
[%- END -%]
37
38
[%- BLOCK debit_type_description -%]
39
    [%- SWITCH debit_type.code -%]
40
        [%- CASE 'ACCOUNT'          -%]Account creation fee
41
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
42
        [%- CASE 'LOST'             -%]Lost item
43
        [%- CASE 'MANUAL'           -%]Manual fee
44
        [%- CASE 'NEW_CARD'         -%]New card
45
        [%- CASE 'OVERDUE'          -%]Fine
46
        [%- CASE 'PROCESSING'       -%]Lost item processing fee
47
        [%- CASE 'RENT'             -%]Rental fee
48
        [%- CASE 'RENT_DAILY'       -%]Daily rental fee
49
        [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
50
        [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
51
        [%- CASE 'RESERVE'          -%]Hold fee
52
        [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
53
        [%- CASE 'Payout'           -%]Payout
54
        [%- CASE                    -%][% debit_type.description | html %]
55
    [%- END -%]
56
[%- END -%]
57
58
[%- BLOCK credit_type_description -%]
59
    [%- SWITCH credit_type.code -%]
60
        [%- CASE 'PAYMENT'          -%]Payment
61
        [%- CASE 'WRITEOFF'         -%]Writeoff
62
        [%- CASE 'FORGIVEN'         -%]Forgiven
63
        [%- CASE 'CREDIT'           -%]Credit
64
        [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
65
        [%- CASE 'Refund'           -%]Refund
66
        [%- CASE                    -%][% credit_type.description | html %]
67
    [%- END -%]
68
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +4 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
7
[% PROCESS 'accounts.inc' %]
8
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
10
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
8
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
Lines 46-52 Link Here
46
                                <label for="type">Credit type: </label>
49
                                <label for="type">Credit type: </label>
47
                                <select name="type" id="type">
50
                                <select name="type" id="type">
48
                                    [% FOREACH credit_type IN credit_types %]
51
                                    [% FOREACH credit_type IN credit_types %]
49
                                    <option value="[% credit_type.code | html %]">[% credit_type.description | html %]</option>
52
                                    <option value="[% credit_type.code | html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
50
                                    [% END %]
53
                                    [% END %]
51
                                </select>
54
                                </select>
52
                            </li>
55
                            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-3 / +5 lines)
Lines 4-9 Link Here
4
[% USE Price %]
4
[% USE Price %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
8
[% PROCESS 'accounts.inc' %]
9
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
11
<title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
9
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
Lines 56-64 Link Here
56
                                <select name="type" id="type">
59
                                <select name="type" id="type">
57
                                    [% FOREACH debit_type IN debit_types %]
60
                                    [% FOREACH debit_type IN debit_types %]
58
                                    [% IF debit_type.code == type %]
61
                                    [% IF debit_type.code == type %]
59
                                    <option value="[% debit_type.code | html %]" selected="selected">[% debit_type.description | html %]</option>
62
                                    <option value="[% debit_type.code | html %]" selected="selected">[%- PROCESS debit_type_description debit_type=debit_type -%]</option>
60
                                    [% ELSE %]
63
                                    [% ELSE %]
61
                                    <option value="[% debit_type.code | html %]">[% debit_type.description | html %]</option>
64
                                    <option value="[% debit_type.code | html %]">[%- PROCESS debit_type_description debit_type=debit_type -%]</option>
62
                                    [% END %]
65
                                    [% END %]
63
                                    [% END %]
66
                                    [% END %]
64
                                </select>
67
                                </select>
65
- 

Return to bug 26398