Attachment 111797 Details for Bug 24603 – Bug 24603: (QA follow-up) Make the new credit type translatable and shorten description a bit

[patch] Bug 24603: (QA follow-up) Make the new credit type translatable and shorten description a bit

Bug-24603-QA-follow-up-Make-the-new-credit-type-tr.patch (text/plain), 2.32 KB, created by Katrin Fischer on 2020-10-15 20:52:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-15 20:52:49 UTC

Size: 2.32 KB

patch

obsolete

>From 71dc7930a0c3ead02909cfcbb62ca8b0d2d49832 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>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 <katrin.fischer.83@web.de>
>
>https://bugs.koha-community.org/show_bug.cgi?id=24063
>---
> 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 fae860d4cf..395d0783bc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>@@ -8,6 +8,7 @@
> [%- CASE 'CREDIT' -%]Credit
> [%- CASE 'LOST_FOUND' -%]Lost item fee refund
> [%- CASE 'REFUND' -%]Refund
>+ [%- CASE 'CANCELLATION' -%]Cancelled charge
> [%- CASE -%][% account.credit_type.description | html %]
> [%- END -%]
> [%- ELSIF account.debit_type_code -%]
>@@ -42,6 +43,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 -%]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24603: 98534 | 98551 | 102005 | 106772 | 111217 | 111218 | 111255 | 111256 | 111794 | 111795 | 111796 | 111797 | 111914 | 113048 | 113049 | 113050 | 113051 | 113052 | 113113 | 113114