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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-8 / +8 lines)
Lines 78-93 Link Here
78
                        <option value="FORW">Write off</option>
78
                        <option value="FORW">Write off</option>
79
                        [% END %]
79
                        [% END %]
80
80
81
                        [% IF transaction_type == "F" %]
81
                        [% IF transaction_type == "OVERDUE" %]
82
                        <option value="F" selected="selected">Fine</option>
82
                        <option value="OVERDUE" selected="selected">Fine</option>
83
                        [% ELSE %]
83
                        [% ELSE %]
84
                        <option value="F">Fine</option>
84
                        <option value="OVERDUE">Fine</option>
85
                        [% END %]
85
                        [% END %]
86
86
87
                        [% IF transaction_type == "FU" %]
87
                        [% IF transaction_type == "OVERDUEA" %]
88
                        <option value="FU" selected="selected">Accruing fine</option>
88
                        <option value="OVERDUEA" selected="selected">Accruing fine</option>
89
                        [% ELSE %]
89
                        [% ELSE %]
90
                        <option value="FU">Accruing fine</option>
90
                        <option value="OVERDUEA">Accruing fine</option>
91
                        [% END %]
91
                        [% END %]
92
92
93
                        [% IF transaction_type == "PAY" %]
93
                        [% IF transaction_type == "PAY" %]
Lines 201-209 Link Here
201
                        <span>Credit</span>
201
                        <span>Credit</span>
202
                    [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %]
202
                    [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %]
203
                        <span>Write off</span>
203
                        <span>Write off</span>
204
                    [% ELSIF loopresul.accounttype == "F" %]
204
                    [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status != "UNRETURNED" %]
205
                        <span>Fine</span>
205
                        <span>Fine</span>
206
                    [% ELSIF loopresul.accounttype == "FU" %]
206
                    [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status == "UNRETURNED" %]
207
                        <span>Accruing fine</span>
207
                        <span>Accruing fine</span>
208
                    [% ELSIF loopresul.accounttype == "Pay" %]
208
                    [% ELSIF loopresul.accounttype == "Pay" %]
209
                        <span>Payment</span>
209
                        <span>Payment</span>
(-)a/reports/cash_register_stats.pl (-1 / +4 lines)
Lines 76-81 if ($do_it) { Link Here
76
    } else { #Single transac type
76
    } else { #Single transac type
77
        if ($transaction_type eq 'FORW') {
77
        if ($transaction_type eq 'FORW') {
78
            $whereTType = q{ AND accounttype IN ('FOR','W') };
78
            $whereTType = q{ AND accounttype IN ('FOR','W') };
79
        } elsif ( $transaction_type eq 'OVERDUEA' ) {
80
            $whereTType = q{ AND accounttype = 'OVERDUE' AND status = 'UNRETURNED' };
81
        } elsif ( $transaction_type eq 'OVERDUE' ) {
82
            $whereTType = q{ AND accounttype = 'OVERDUE' AND status != 'UNRETURNED' };
79
        } else {
83
        } else {
80
            $whereTType = q{ AND accounttype = ? };
84
            $whereTType = q{ AND accounttype = ? };
81
            push @extra_params, $transaction_type;
85
            push @extra_params, $transaction_type;
82
- 

Return to bug 23827