Bugzilla – Attachment 113051 Details for
Bug 24603
Allow to cancel charges in patron accounting
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[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.27 KB, created by
Martin Renvoize (ashimema)
on 2020-11-05 09:32:55 UTC
(
hide
)
Description:
Bug 24603: (QA follow-up) Make the new credit type translatable and shorten description a bit
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-11-05 09:32:55 UTC
Size:
2.27 KB
patch
obsolete
>From 5efa0e04aee0264efe1cf2a6800a4b48c98f4763 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 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' -%]<span>Lost item returned</span> > [%- CASE 'Writeoff' -%]<span>Writeoff</span> > [%- CASE 'Void Payment' -%]<span>Void payment</span> >+ [%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span> > [%- 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.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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