From 9bf00d32489edf78db92139d2d87841b6e970882 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 5 Oct 2020 13:24:40 +0000 Subject: [PATCH] Bug 24603: (QA follow-up) Make the new credit type translatable and shorten description a bit Adding the new offset type and credit type to the include so it can be translated. Also suggest shortening the db description a bit. Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=24063 Signed-off-by: Jonathan Druart --- installer/data/mysql/atomicupdate/bug_24603.perl | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/atomicupdate/bug_24603.perl b/installer/data/mysql/atomicupdate/bug_24603.perl index a9c6bfe3b8..2ce47a457b 100644 --- a/installer/data/mysql/atomicupdate/bug_24603.perl +++ b/installer/data/mysql/atomicupdate/bug_24603.perl @@ -5,7 +5,7 @@ if ( CheckVersion($DBversion) ) { qq{ INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system) VALUES - ('CANCELLATION', 'A cancellation applied to a patron charge', 0, 1) + ('CANCELLATION', 'Cancelled charge', 0, 1) } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index f8a3175613..4761dae46b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -18,6 +18,7 @@ [%- CASE 'Lost Item' -%]Lost item returned [%- CASE 'Writeoff' -%]Writeoff [%- CASE 'Void Payment' -%]Void payment + [%- CASE 'CANCELLATION' -%]Cancelled charge [%- CASE -%][% account_offset.type | html %] [%- END -%] [%- END -%] @@ -65,6 +66,7 @@ [%- CASE 'LOST_FOUND' -%]Lost item fee refund [%- CASE 'OVERPAYMENT' -%]Overpayment refund [%- CASE 'REFUND' -%]Refund + [%- CASE 'CANCELLATION' -%]Cancelled charge [%- CASE -%][% credit_type.description | html %] [%- END -%] [%- END -%] -- 2.39.5