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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt (-1 / +1 lines)
Line 1 Link Here
1
mfirstname[% sep %]cardnumber[% sep %]bfirstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]"itype"
1
mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]"itype"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-5 / +4 lines)
Lines 6-12 Link Here
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
[% INCLUDE 'datatables.inc' %]
8
[% INCLUDE 'datatables.inc' %]
9
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
10
<script type="text/javascript" id="js">
9
<script type="text/javascript" id="js">
11
 $(document).ready(function() {
10
 $(document).ready(function() {
12
    $("#tbl_cash_register_stats").dataTable($.extend(true, {}, dataTablesDefaults, {
11
    $("#tbl_cash_register_stats").dataTable($.extend(true, {}, dataTablesDefaults, {
Lines 106-114 $(document).ready(function() { Link Here
106
                        [% END %]
105
                        [% END %]
107
106
108
                        [% IF transaction_type == "ACT" %]
107
                        [% IF transaction_type == "ACT" %]
109
                        <option value="ACT" selected="selected">Active transactions</option>
108
                        <option value="ACT" selected="selected">All payments to the library</option>
110
                        [% ELSE %]
109
                        [% ELSE %]
111
                        <option value="ACT">Active transactions</option>
110
                        <option value="ACT">All payments to the library</option>
112
                        [% END %]
111
                        [% END %]
113
112
114
                        [% IF transaction_type == "C" %]
113
                        [% IF transaction_type == "C" %]
Lines 226-232 $(document).ready(function() { Link Here
226
        <thead>
225
        <thead>
227
        <tr>
226
        <tr>
228
            <th>Manager name</th>
227
            <th>Manager name</th>
229
            <th>Patron cardnumber</th>
228
            <th>Patron card number</th>
230
            <th>Patron name</th>
229
            <th>Patron name</th>
231
            <th>Transaction branch</th>
230
            <th>Transaction branch</th>
232
            <th>Transaction date</th>
231
            <th>Transaction date</th>
Lines 247-253 $(document).ready(function() { Link Here
247
                <td>[% loopresul.date | $KohaDates %]</td>
246
                <td>[% loopresul.date | $KohaDates %]</td>
248
                <td>
247
                <td>
249
                    [% IF loopresul.accounttype == "ACT" %]
248
                    [% IF loopresul.accounttype == "ACT" %]
250
                        <span>Active transactions</span>
249
                        <span>All payments to the library</span>
251
                    [% ELSIF loopresul.accounttype == "C" || loopresul.accounttype == "CR" %]
250
                    [% ELSIF loopresul.accounttype == "C" || loopresul.accounttype == "CR" %]
252
                        <span>Credit</span>
251
                        <span>Credit</span>
253
                    [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %]
252
                    [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %]
(-)a/reports/cash_register_stats.pl (-2 / +1 lines)
Lines 71-77 if ($do_it) { Link Here
71
    if ($transaction_type eq 'ALL') { #All Transactons
71
    if ($transaction_type eq 'ALL') { #All Transactons
72
        $whereTType = '';
72
        $whereTType = '';
73
    } elsif ($transaction_type eq 'ACT') { #Active
73
    } elsif ($transaction_type eq 'ACT') { #Active
74
        $whereTType = " accounttype NOT IN ('F', 'FU', 'FOR', 'M', 'L') AND ";
74
        $whereTType = " accounttype IN ('Pay','C') AND ";
75
    } else { #Single transac type
75
    } else { #Single transac type
76
        if ($transaction_type eq 'FORW') {
76
        if ($transaction_type eq 'FORW') {
77
            $whereTType = " accounttype = 'FOR' OR accounttype = 'W' AND ";
77
            $whereTType = " accounttype = 'FOR' OR accounttype = 'W' AND ";
78
- 

Return to bug 6934