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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-4 / +4 lines)
Lines 1-16 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
        [%- PROCESS credit_type_description credit_type = account.credit_type -%]
4
        [%- PROCESS credit_type_description credit_type_code = account.credit_type_code -%]
5
    [%- ELSIF account.debit_type_code -%]
5
    [%- ELSIF account.debit_type_code -%]
6
        [%- PROCESS debit_type_description debit_type = account.debit_type -%]
6
        [%- PROCESS debit_type_description debit_type_code = account.debit_type_code -%]
7
    [%- END -%]
7
    [%- END -%]
8
    [%- PROCESS account_status_description account=account -%]
8
    [%- PROCESS account_status_description account=account -%]
9
    </span>
9
    </span>
10
[%- END -%]
10
[%- END -%]
11
11
12
[%- BLOCK debit_type_description -%]
12
[%- BLOCK debit_type_description -%]
13
    [%- SWITCH debit_type.code -%]
13
    [%- SWITCH debit_type_code -%]
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
15
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
15
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
16
        [%- CASE 'LOST'             -%]Lost item
16
        [%- CASE 'LOST'             -%]Lost item
Lines 30-36 Link Here
30
[%- END -%]
30
[%- END -%]
31
31
32
[%- BLOCK credit_type_description -%]
32
[%- BLOCK credit_type_description -%]
33
    [%- SWITCH credit_type.code -%]
33
    [%- SWITCH credit_type_code -%]
34
        [%- CASE 'PAYMENT'      -%]Payment
34
        [%- CASE 'PAYMENT'      -%]Payment
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-7 / +3 lines)
Lines 16-21 Link Here
16
<body id="cash_register_stats" class="rep">
16
<body id="cash_register_stats" class="rep">
17
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'cat-search.inc' %]
18
[% INCLUDE 'cat-search.inc' %]
19
[% INCLUDE 'accounts.inc' %]
19
20
20
<div id="breadcrumbs">
21
<div id="breadcrumbs">
21
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
22
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
Lines 158-170 Link Here
158
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
159
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
159
                <td>[% loopresul.branchname | html %]</td>
160
                <td>[% loopresul.branchname | html %]</td>
160
                <td>[% loopresul.date | $KohaDates %]</td>
161
                <td>[% loopresul.date | $KohaDates %]</td>
161
                <td>
162
                <td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
162
                    [% IF loopresul.credit_type == "ACT" %]
163
                <td>[% PROCESS account_type_description account=loopresul %]</td>
163
                        <span>All payments to the library</span>
164
                    [% ELSE %]
165
                        [%- PROCESS account_type_description account=loopresul -%]
166
                    [% END %]
167
                </td>
168
                <td>[% loopresul.note | html %]</td>
164
                <td>[% loopresul.note | html %]</td>
169
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
165
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
170
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
166
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt (-7 / +4 lines)
Lines 1-9 Link Here
1
[%- USE ItemTypes -%]
1
[%- USE ItemTypes -%]
2
[%- INCLUDE csv_headers/reports/cash_register_stats.tt -%]
2
[%- INCLUDE csv_headers/reports/cash_register_stats.tt -%]
3
[%- INCLUDE empty_line.inc -%]
3
[%- FOREACH row IN rows %]
4
[%- FOREACH row IN rows -%]
4
    [% FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END %]
5
    [%- FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END -%]
5
[%- END %]
6
    [%- INCLUDE empty_line.inc -%]
6
TOTAL[% sep %][%- FOREACH field IN total; field; sep IF !loop.last; END -%]
7
[%- END -%]
8
TOTAL[%- INCLUDE empty_line.inc -%]
9
[%- FOREACH field IN total; field; sep IF !loop.last; END -%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc (-4 / +4 lines)
Lines 1-16 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
        [%- PROCESS credit_type_description credit_type = account.credit_type -%]
4
        [%- PROCESS credit_type_description credit_type_code = account.credit_type_code -%]
5
    [%- ELSIF account.debit_type_code -%]
5
    [%- ELSIF account.debit_type_code -%]
6
        [%- PROCESS debit_type_description debit_type = account.debit_type -%]
6
        [%- PROCESS debit_type_description debit_type_code = account.debit_type_code -%]
7
    [%- END -%]
7
    [%- END -%]
8
    [%- PROCESS account_status_description account=account -%]
8
    [%- PROCESS account_status_description account=account -%]
9
    </span>
9
    </span>
10
[%- END -%]
10
[%- END -%]
11
11
12
[%- BLOCK debit_type_description -%]
12
[%- BLOCK debit_type_description -%]
13
    [%- SWITCH debit_type.code -%]
13
    [%- SWITCH debit_type_code -%]
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
15
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
15
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
16
        [%- CASE 'LOST'             -%]Lost item
16
        [%- CASE 'LOST'             -%]Lost item
Lines 30-36 Link Here
30
[%- END -%]
30
[%- END -%]
31
31
32
[%- BLOCK credit_type_description -%]
32
[%- BLOCK credit_type_description -%]
33
    [%- SWITCH credit_type.code -%]
33
    [%- SWITCH credit_type_code -%]
34
        [%- CASE 'PAYMENT'      -%]Payment
34
        [%- CASE 'PAYMENT'      -%]Payment
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
(-)a/reports/cash_register_stats.pl (-4 / +2 lines)
Lines 166-173 if ($do_it) { Link Here
166
                        $row->{bfirstname} . ' ' . $row->{bsurname},
166
                        $row->{bfirstname} . ' ' . $row->{bsurname},
167
                        $row->{branchname},
167
                        $row->{branchname},
168
                        $row->{date},
168
                        $row->{date},
169
                        $row->{credit_type_code},
169
                        $row->{credit_type_code} || $row->{debit_type_code},
170
                        $row->{debit_type_code},
171
                        $row->{note},
170
                        $row->{note},
172
                        $row->{amount},
171
                        $row->{amount},
173
                        $row->{title},
172
                        $row->{title},
Lines 176-182 if ($do_it) { Link Here
176
                    push (@rows, \@rowValues) ;
175
                    push (@rows, \@rowValues) ;
177
                }
176
                }
178
                my @total;
177
                my @total;
179
                for (1..6){push(@total,"")};
178
                for (1..7){push(@total,"")};
180
                push(@total, $grantotal);
179
                push(@total, $grantotal);
181
        print $input->header(
180
        print $input->header(
182
            -type       => 'text/csv',
181
            -type       => 'text/csv',
183
- 

Return to bug 29271