View | Details | Raw Unified | Return to bug 21791
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
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
1
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Transaction type[% sep |html %]Payment type[% sep | html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-1 / +3 lines)
Lines 74-80 Link Here
74
                            <option value="[% debit_type.code | html %]">[% debit_type.description | html %]</option>
74
                            <option value="[% debit_type.code | html %]">[% debit_type.description | html %]</option>
75
                            [% END %]
75
                            [% END %]
76
                        [% END %]
76
                        [% END %]
77
                        
77
78
                        [% FOREACH credit_type IN credit_types %]
78
                        [% FOREACH credit_type IN credit_types %]
79
                            [% IF transaction_type == credit_type.code %]
79
                            [% IF transaction_type == credit_type.code %]
80
                            <option value="[% credit_type.code | html %]" selected="selected">[% credit_type.description | html %]</option>
80
                            <option value="[% credit_type.code | html %]" selected="selected">[% credit_type.description | html %]</option>
Lines 134-139 Link Here
134
            <th>Transaction library</th>
134
            <th>Transaction library</th>
135
            <th>Transaction date</th>
135
            <th>Transaction date</th>
136
            <th>Transaction type</th>
136
            <th>Transaction type</th>
137
            <th>Payment Type</th>
137
            <th>Notes</th>
138
            <th>Notes</th>
138
            <th>Amount</th>
139
            <th>Amount</th>
139
            <th>Bibliographic record title</th>
140
            <th>Bibliographic record title</th>
Lines 155-160 Link Here
155
                        [%- PROCESS account_type_description account=loopresul -%]
156
                        [%- PROCESS account_type_description account=loopresul -%]
156
                    [% END %]
157
                    [% END %]
157
                </td>
158
                </td>
159
                <td>[% loopresul.payment_type | html %]</td>
158
                <td>[% loopresul.note | html %]</td>
160
                <td>[% loopresul.note | html %]</td>
159
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
161
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
160
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
162
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
(-)a/reports/cash_register_stats.pl (-2 / +3 lines)
Lines 99-105 if ($do_it) { Link Here
99
    SELECT round(amount,2) AS amount, description,
99
    SELECT round(amount,2) AS amount, description,
100
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
100
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
101
        bo.cardnumber, br.branchname, bo.borrowernumber,
101
        bo.cardnumber, br.branchname, bo.borrowernumber,
102
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note,
102
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code,
103
        al.payment_type, al.amountoutstanding, al.note,
103
        bi.title, bi.biblionumber, i.barcode, i.itype
104
        bi.title, bi.biblionumber, i.barcode, i.itype
104
        FROM accountlines al
105
        FROM accountlines al
105
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
106
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
Lines 160-165 if ($do_it) { Link Here
160
                        $row->{date},
161
                        $row->{date},
161
                        $row->{credit_type},
162
                        $row->{credit_type},
162
                        $row->{debit_type},
163
                        $row->{debit_type},
164
                        $row->{payment_type},
163
                        $row->{note},
165
                        $row->{note},
164
                        $row->{amount},
166
                        $row->{amount},
165
                        $row->{title},
167
                        $row->{title},
166
- 

Return to bug 21791