From 041808bc70cb747d1c270b78ee336b719889c0ea Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Fri, 7 Jan 2022 07:04:24 -0500 Subject: [PATCH] Bug 27946: (QA follow-up) Remove 'scan' terminology, requests may not be scans Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Fridolin Somers --- installer/data/mysql/atomicupdate/bug_27946.pl | 2 +- installer/data/mysql/mandatory/account_debit_types.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_27946.pl b/installer/data/mysql/atomicupdate/bug_27946.pl index 0905496ce4..4d3d408f5b 100755 --- a/installer/data/mysql/atomicupdate/bug_27946.pl +++ b/installer/data/mysql/atomicupdate/bug_27946.pl @@ -27,7 +27,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO account_debit_types ( code, description, can_be_invoiced, can_be_sold, default_amount, is_system ) - VALUES ('ARTICLE_REQUEST', 'Article scan request fee', 0, 0, NULL, 1); + VALUES ('ARTICLE_REQUEST', 'Article request fee', 0, 0, NULL, 1); } ); }, diff --git a/installer/data/mysql/mandatory/account_debit_types.sql b/installer/data/mysql/mandatory/account_debit_types.sql index e1e1a7eb99..7d9c813dd8 100644 --- a/installer/data/mysql/mandatory/account_debit_types.sql +++ b/installer/data/mysql/mandatory/account_debit_types.sql @@ -14,4 +14,4 @@ INSERT INTO account_debit_types ( code, description, can_be_invoiced, can_be_sol ('RESERVE', 'Hold fee', 0, 0, NULL, 1), ('RESERVE_EXPIRED', 'Hold waiting too long', 0, 0, NULL, 1), ('VOID', 'Credit has been voided', 0, 0, NULL, 1), -('ARTICLE_REQUEST', 'Article scan request fee', 0, 0, NULL, 1); +('ARTICLE_REQUEST', 'Article request fee', 0, 0, NULL, 1); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 8fcb01ef64..841896b034 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -13,7 +13,7 @@ [%- SWITCH debit_type.code -%] [%- CASE 'ACCOUNT' -%]Account creation fee [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee - [%- CASE 'ARTICLE_REQUEST' -%]Article scan request fee + [%- CASE 'ARTICLE_REQUEST' -%]Article request fee [%- CASE 'LOST' -%]Lost item [%- CASE 'MANUAL' -%]Manual fee [%- CASE 'NEW_CARD' -%]New card diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc index 7bda0e8dc9..e4b650fddc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc @@ -13,7 +13,7 @@ [%- SWITCH debit_type_code -%] [%- CASE 'ACCOUNT' -%]Account creation fee [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee - [%- CASE 'ARTICLE_REQUEST' -%]Article scan request fee + [%- CASE 'ARTICLE_REQUEST' -%]Article request fee [%- CASE 'LOST' -%]Lost item [%- CASE 'MANUAL' -%]Manual fee [%- CASE 'NEW_CARD' -%]New card -- 2.39.5