From 5dfbe1c8cd2c2d86bdf0017892c82d98e6c86b8d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 31 Oct 2019 17:49:29 +0000 Subject: [PATCH] Bug 23805: (QA follow-up) Corrections for cash_register_stats Signed-off-by: Martin Renvoize --- .../en/modules/reports/cash_register_stats.tt | 26 ++++++------------- reports/cash_register_stats.pl | 3 +++ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index dc2b1c82c7..cbcc27a056 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -61,30 +61,12 @@ [% END %] - [% IF transaction_type == "C" %] - - [% ELSE %] - - [% END %] - - [% IF transaction_type == "CR" %] - - [% ELSE %] - - [% END %] - [% IF transaction_type == "FORW" %] [% ELSE %] [% END %] - [% IF transaction_type == "PAY" %] - - [% ELSE %] - - [% END %] - [% FOREACH debit_type IN debit_types %] [% IF transaction_type == debit_type.code %] @@ -92,6 +74,14 @@ [% END %] [% END %] + + [% FOREACH credit_type IN credit_types %] + [% IF transaction_type == credit_type.code %] + + [% ELSE %] + + [% END %] + [% END %]
  • diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl index 84ce1949a1..37aaace19b 100755 --- a/reports/cash_register_stats.pl +++ b/reports/cash_register_stats.pl @@ -58,6 +58,8 @@ my $toDate = dt_from_string; my @debit_types = Koha::Account::DebitTypes->search()->as_list; +my @credit_types = + Koha::Account::CreditTypes->search()->as_list; if ($do_it) { @@ -187,6 +189,7 @@ $template->param( transaction_type => $transaction_type, branchloop => Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed, debit_types => \@debit_types, + credit_types => \@credit_types, CGIsepChoice => GetDelimiterChoices, ); -- 2.39.5