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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc (-10 lines)
Lines 1-10 Link Here
1
[% SWITCH account_offset.type %]
2
    [% CASE 'Credit Applied' %]Credit applied
3
    [% CASE 'Payment' %]Payment
4
    [% CASE 'Manual Credit' %]Manual credit
5
    [% CASE 'Manual Debit' %]Manual invoice
6
    [% CASE 'Lost Item' %]Lost item returned
7
    [% CASE 'Writeoff' %]Writeoff
8
    [% CASE 'Void Payment' %]Void payment
9
    [% CASE %][% account_offset.type | html %]
10
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (+39 lines)
Line 0 Link Here
1
[%- BLOCK account_type_description -%]
2
    [%- SWITCH account.accounttype -%]
3
        [%- CASE 'Pay'   -%]<span>Payment, thanks</span>
4
        [%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span>
5
        [%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span>
6
        [%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span>
7
        [%- CASE 'VOID'  -%]<span>Voided</span>
8
        [%- CASE 'N'     -%]<span>New card</span>
9
        [%- CASE 'F'     -%]<span>Fine</span>
10
        [%- CASE 'A'     -%]<span>Account management fee</span>
11
        [%- CASE 'M'     -%]<span>Sundry</span>
12
        [%- CASE 'L'     -%]<span>Lost item</span>
13
        [%- CASE 'W'     -%]<span>Writeoff</span>
14
        [%- CASE 'FU'    -%]<span>Accruing fine</span>
15
        [%- CASE 'HE'    -%]<span>Hold waiting too long</span>
16
        [%- CASE 'Rent'  -%]<span>Rental fee</span>
17
        [%- CASE 'FOR'   -%]<span>Forgiven</span>
18
        [%- CASE 'LR'    -%]<span>Lost item fee refund</span>
19
        [%- CASE 'PF'    -%]<span>Processing fee</span>
20
        [%- CASE 'PAY'   -%]<span>Payment</span>
21
        [%- CASE 'WO'    -%]<span>Writeoff</span>
22
        [%- CASE 'C'     -%]<span>Credit</span>
23
        [%- CASE 'CR'    -%]<span>Credit</span>
24
        [%- CASE         -%][% account.accounttype | html %]
25
    [%- END -%]
26
[%- END -%]
27
28
[%- BLOCK offset_type_description -%]
29
    [%- SWITCH account_offset.type -%]
30
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
31
        [%- CASE 'Payment'        -%]<span>Payment</span>
32
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
33
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
34
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
35
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
36
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
37
        [%- CASE                  -%][% account_offset.type | html %]
38
    [%- END -%]
39
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc (-24 lines)
Lines 1-24 Link Here
1
[% SWITCH account.accounttype %]
2
    [% CASE 'Pay' %]Payment, thanks
3
    [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
4
    [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
5
    [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
6
    [% CASE 'VOID' %]Voided
7
    [% CASE 'N' %]New card
8
    [% CASE 'F' %]Fine
9
    [% CASE 'A' %]Account management fee
10
    [% CASE 'M' %]Sundry
11
    [% CASE 'L' %]Lost item
12
    [% CASE 'W' %]Writeoff
13
    [% CASE 'FU' %]Accruing fine
14
    [% CASE 'HE' %]Hold waiting too long
15
    [% CASE 'Rent' %]Rental fee
16
    [% CASE 'FOR' %]Forgiven
17
    [% CASE 'LR' %]Lost item fee refund
18
    [% CASE 'PF' %]Processing fee
19
    [% CASE 'PAY' %]Payment
20
    [% CASE 'WO' %]Writeoff
21
    [% CASE 'C' %]Credit
22
    [% CASE 'CR' %]Credit
23
    [% CASE %][% account.accounttype | html %]
24
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-3 / +5 lines)
Lines 3-8 Link Here
3
[%- USE AuthorisedValues -%]
3
[%- USE AuthorisedValues -%]
4
[%- USE Branches -%]
4
[%- USE Branches -%]
5
5
6
[% PROCESS 'accounts.inc' %]
7
6
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
9
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
8
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
Lines 41-47 Link Here
41
                                <span title="[% accountline.date | html %]">[% accountline.date |$KohaDates %]</span>
43
                                <span title="[% accountline.date | html %]">[% accountline.date |$KohaDates %]</span>
42
                            </td>
44
                            </td>
43
                            <td>
45
                            <td>
44
                                [%- INCLUDE 'accounttype.inc' account => accountline -%]
46
                                [%- PROCESS account_type_description account=accountline -%]
45
                                [%- IF accountline.payment_type -%]
47
                                [%- IF accountline.payment_type -%]
46
                                    , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %]
48
                                    , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %]
47
                                [%- END =%]
49
                                [%- END =%]
Lines 109-120 Link Here
109
                                        <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td>
111
                                        <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td>
110
                                        <td>[% offset_accountline.amount | $Price %]</td>
112
                                        <td>[% offset_accountline.amount | $Price %]</td>
111
                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
113
                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
112
                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
114
                                        <td>[% PROCESS account_type_description account=offset_accountline %]</td>
113
                                        <td>[% offset_accountline.note | html %]</td>
115
                                        <td>[% offset_accountline.note | html %]</td>
114
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
116
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
115
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
117
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
116
                                        <td>[% ao.amount | $Price %]</td>
118
                                        <td>[% ao.amount | $Price %]</td>
117
                                        <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
119
                                        <td>[% PROCESS offset_type_description account_offset=ao %]</td>
118
                                        <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td>
120
                                        <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td>
119
                                    </tr>
121
                                    </tr>
120
                                [% END %]
122
                                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-1 / +4 lines)
Lines 8-13 Link Here
8
[% USE Price %]
8
[% USE Price %]
9
[% USE Branches %]
9
[% USE Branches %]
10
[% SET footerjs = 1 %]
10
[% SET footerjs = 1 %]
11
12
[% PROCESS 'accounts.inc' %]
13
11
[% INCLUDE 'doc-head-open.inc' %]
14
[% INCLUDE 'doc-head-open.inc' %]
12
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
15
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
13
[% INCLUDE 'doc-head-close.inc' %]
16
[% INCLUDE 'doc-head-close.inc' %]
Lines 61-67 Link Here
61
   <tr>
64
   <tr>
62
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
65
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
63
      <td>
66
      <td>
64
        [% INCLUDE 'accounttype.inc' accountline => account %]
67
        [% PROCESS account_type_description account=account %]
65
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
68
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
66
        [%- IF account.description %], [% account.description | html %][% END %]
69
        [%- IF account.description %], [% account.description | html %][% END %]
67
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
70
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-1 / +4 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Price %]
4
[% USE Price %]
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>Summary for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</title>
10
    <title>Summary for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</title>
8
    [% INCLUDE 'doc-head-close.inc' %]
11
    [% INCLUDE 'doc-head-close.inc' %]
Lines 109-115 Link Here
109
               <tr>
112
               <tr>
110
                  <td>[% account.date | $KohaDates %]</td>
113
                  <td>[% account.date | $KohaDates %]</td>
111
                  <td>
114
                  <td>
112
                      [% INCLUDE 'accounttype.inc' accountline => account %]
115
                      [% PROCESS account_type_description account=account %]
113
                      [%- IF account.payment_type %]
116
                      [%- IF account.payment_type %]
114
                          , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %]
117
                          , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %]
115
                      [% END %]
118
                      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-1 / +4 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE Price %]
6
[% USE Price %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
9
[% PROCESS 'accounts.inc' %]
10
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Print receipt for [% patron.cardnumber | html %]</title>
12
<title>Print receipt for [% patron.cardnumber | html %]</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
Lines 51-57 Link Here
51
<tr class="highlight">
54
<tr class="highlight">
52
      <td>[% account.date | $KohaDates %]</td>
55
      <td>[% account.date | $KohaDates %]</td>
53
      <td>
56
      <td>
54
        [% INCLUDE 'accounttype.inc' account => account %]
57
        [% PROCESS account_type_description account=account %]
55
        [%- IF account.description %], [% account.description | html %][% END %]
58
        [%- IF account.description %], [% account.description | html %][% END %]
56
      </td>
59
      </td>
57
      <td>[% account.note | html %]</td>
60
      <td>[% account.note | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-2 / +4 lines)
Lines 5-10 Link Here
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% USE Price %]
6
[% USE Price %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
9
[% PROCESS 'accounts.inc' %]
10
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Print receipt for [% patron.cardnumber | html %]</title>
12
<title>Print receipt for [% patron.cardnumber | html %]</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
Lines 51-57 Link Here
51
<tr class="highlight">
54
<tr class="highlight">
52
      <td>[% account.date | $KohaDates%]</td>
55
      <td>[% account.date | $KohaDates%]</td>
53
       <td>
56
       <td>
54
        [% INCLUDE 'accounttype.inc' account => account %]
57
        [% PROCESS account_type_description account=account %]
55
        [%- IF account.description %], [% account.description | html %][% END %]
58
        [%- IF account.description %], [% account.description | html %][% END %]
56
      </td>
59
      </td>
57
      <td>[% account.note | html %]</td>
60
      <td>[% account.note | html %]</td>
58
- 

Return to bug 21715