@@ -, +, @@ --- .../prog/en/modules/reports/cash_register_stats.tt | 16 ++++++++-------- reports/cash_register_stats.pl | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -78,16 +78,16 @@ [% END %] - [% IF transaction_type == "F" %] - + [% IF transaction_type == "OVERDUE" %] + [% ELSE %] - + [% END %] - [% IF transaction_type == "FU" %] - + [% IF transaction_type == "OVERDUEA" %] + [% ELSE %] - + [% END %] [% IF transaction_type == "PAY" %] @@ -201,9 +201,9 @@ Credit [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %] Write off - [% ELSIF loopresul.accounttype == "F" %] + [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status != "UNRETURNED" %] Fine - [% ELSIF loopresul.accounttype == "FU" %] + [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status == "UNRETURNED" %] Accruing fine [% ELSIF loopresul.accounttype == "Pay" %] Payment --- a/reports/cash_register_stats.pl +++ a/reports/cash_register_stats.pl @@ -76,6 +76,10 @@ if ($do_it) { } else { #Single transac type if ($transaction_type eq 'FORW') { $whereTType = q{ AND accounttype IN ('FOR','W') }; + } elsif ( $transaction_type eq 'OVERDUEA' ) { + $whereTType = q{ AND accounttype = 'OVERDUE' AND status = 'UNRETURNED' }; + } elsif ( $transaction_type eq 'OVERDUE' ) { + $whereTType = q{ AND accounttype = 'OVERDUE' AND status != 'UNRETURNED' }; } else { $whereTType = q{ AND accounttype = ? }; push @extra_params, $transaction_type; --