From f33e07f3051acfb0c1f2a30ff5b69a96ebac78a3 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 20 Oct 2021 14:06:29 +0000 Subject: [PATCH] Bug 29271: (QA follow-up) Fetch and send descriptions to template Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 8 ++++---- .../prog/en/modules/reports/cash_register_stats.tt | 3 +-- reports/cash_register_stats.pl | 8 +++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index eee2031bae..10db392d71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -1,16 +1,16 @@ [%- BLOCK account_type_description -%] [%- IF account.credit_type_code -%] - [%- PROCESS credit_type_description credit_type_code = account.credit_type_code -%] + [%- PROCESS credit_type_description credit_type_code = account.credit_type -%] [%- ELSIF account.debit_type_code -%] - [%- PROCESS debit_type_description debit_type_code = account.debit_type_code -%] + [%- PROCESS debit_type_description debit_type_code = account.debit_type -%] [%- END -%] [%- PROCESS account_status_description account=account -%] [%- END -%] [%- BLOCK debit_type_description -%] - [%- SWITCH debit_type_code -%] + [%- SWITCH debit_type.code -%] [%- CASE 'ACCOUNT' -%]Account creation fee [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee [%- CASE 'LOST' -%]Lost item @@ -30,7 +30,7 @@ [%- END -%] [%- BLOCK credit_type_description -%] - [%- SWITCH credit_type_code -%] + [%- SWITCH credit_type.code -%] [%- CASE 'PAYMENT' -%]Payment [%- CASE 'WRITEOFF' -%]Writeoff [%- CASE 'FORGIVEN' -%]Forgiven 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 0cfe76fb21..1402b84cab 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 @@ -16,7 +16,6 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -[% INCLUDE 'accounts.inc' %]