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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-1 / +3 lines)
Lines 178-184 Link Here
178
            <th>Patron card number</th>
178
            <th>Patron card number</th>
179
            <th>Patron name</th>
179
            <th>Patron name</th>
180
            <th>Transaction branch</th>
180
            <th>Transaction branch</th>
181
            <th>Transaction date</th>
181
            <th>Transaction original date</th>
182
            <th>Transaction updated</th>
182
            <th>Transaction type</th>
183
            <th>Transaction type</th>
183
            <th>Notes</th>
184
            <th>Notes</th>
184
            <th>Amount</th>
185
            <th>Amount</th>
Lines 194-199 Link Here
194
                <td>[% loopresul.bfirstname %] [% loopresul.bsurname %]</td>
195
                <td>[% loopresul.bfirstname %] [% loopresul.bsurname %]</td>
195
                <td>[% loopresul.branchname %]</td>
196
                <td>[% loopresul.branchname %]</td>
196
                <td>[% loopresul.date | $KohaDates %]</td>
197
                <td>[% loopresul.date | $KohaDates %]</td>
198
                <td>[% loopresul.timestamp | $KohaDates with_hours => 1 %]</td>
197
                <td>
199
                <td>
198
                    [% IF loopresul.accounttype == "ACT" %]
200
                    [% IF loopresul.accounttype == "ACT" %]
199
                        <span>All payments to the library</span>
201
                        <span>All payments to the library</span>
(-)a/reports/cash_register_stats.pl (-4 / +3 lines)
Lines 61-69 my $manualinv_types = $sth_manualinv->fetchall_arrayref({}); Link Here
61
61
62
if ($do_it) {
62
if ($do_it) {
63
63
64
    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("from")) } || dt_from_string,
64
    $fromDate = output_pref({ dt => eval { dt_from_string(scalar $input->param("from")) } || dt_from_string,
65
            dateformat => 'sql', dateonly => 1 }); #for sql query
65
            dateformat => 'sql', dateonly => 1 }); #for sql query
66
    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("to")) } || dt_from_string,
66
    $toDate   = output_pref({ dt => eval { dt_from_string(scalar $input->param("to")) } || dt_from_string,
67
            dateformat => 'sql', dateonly => 1 }); #for sql query
67
            dateformat => 'sql', dateonly => 1 }); #for sql query
68
68
69
    my $whereTType = q{};
69
    my $whereTType = q{};
Lines 93-99 if ($do_it) { Link Here
93
    SELECT round(amount,2) AS amount, description,
93
    SELECT round(amount,2) AS amount, description,
94
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
94
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
95
        bo.cardnumber, br.branchname, bo.borrowernumber,
95
        bo.cardnumber, br.branchname, bo.borrowernumber,
96
        al.borrowernumber, DATE(al.date) as date, al.accounttype, al.amountoutstanding, al.note,
96
        al.borrowernumber, DATE(al.date) as date, al.timestamp, al.accounttype, al.amountoutstanding, al.note,
97
        bi.title, bi.biblionumber, i.barcode, i.itype
97
        bi.title, bi.biblionumber, i.barcode, i.itype
98
        FROM accountlines al
98
        FROM accountlines al
99
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
99
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
100
- 

Return to bug 16486