From 2049b7f952e09486fdc0da61a09910c1b7b7ef22 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 18 Feb 2022 13:09:59 +0000 Subject: [PATCH] Bug 16258: (QA follow-up) Capitalise EDIFACT EDIFACT is an abreviation, so it should be ALLCAPS. * Electronic Data Interchange for Administration, Commerce and Transport Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Fridolin Somers --- installer/data/mysql/atomicupdate/bug_16258.pl | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/includes/acquisitions-menu.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/admin-menu.inc | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 4 ++-- .../en/modules/admin/preferences/acquisitions.pref | 4 ++-- misc/cronjobs/edi_cron.pl | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_16258.pl b/installer/data/mysql/atomicupdate/bug_16258.pl index 19e74139fa..0151927401 100755 --- a/installer/data/mysql/atomicupdate/bug_16258.pl +++ b/installer/data/mysql/atomicupdate/bug_16258.pl @@ -9,7 +9,7 @@ return { $dbh->do(q{ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('Edifact', '1', NULL, 'Enables edifact acquisitions functions', 'YesNo') + ('EDIFACT', '1', NULL, 'Enables EDIFACT acquisitions functions', 'YesNo') }); }, }; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index a443e3d9ed..a11b54ef42 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -187,7 +187,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'), ('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'), ('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'), -('Edifact','0',NULL,'Enables edifact acquisitions functions','YesNo'), +('EDIFACT','0',NULL,'Enables EDIFACT acquisitions functions','YesNo'), ('EdifactInvoiceImport', 'automatic', 'automatic|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice'), ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL), ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index feabd0861d..066f203482 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -7,7 +7,7 @@ [% IF ( CAN_user_acquisition_order_receive ) %]
  • Late orders
    • [% END %] [% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]
  • Suggestions
    • [% END %]
  • Invoices
    • - [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %] + [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
  • EDIFACT messages
    • [% END %] @@ -23,7 +23,7 @@ [% END %] [% END %] - [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %] + [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
    Administration
      [% IF ( CAN_user_acquisition_period_manage ) %] @@ -35,7 +35,7 @@ [% IF ( CAN_user_acquisition_currencies_manage ) %]
    • Currencies
      • [% END %] - [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %] + [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
    • EDI accounts
    • Library EANs
      • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index f40cea2506..03ac6e69db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -106,7 +106,7 @@
    [% END %] - [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) ) %] + [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]
    Acquisition parameters
      @@ -119,7 +119,7 @@ [% IF ( CAN_user_acquisition_budget_manage ) %]
    • Funds
      • [% END %] - [% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %] + [% IF ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) %]
    • EDI accounts
    • Library EANs
      • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 3c41381baa..c682a6443d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -99,7 +99,7 @@ [% PROCESS csv_export %] - [% IF Koha.Preference('Edifact') && ediaccount %] + [% IF Koha.Preference('EDIFACT') && ediaccount %]
      Create EDIFACT order
      [% END %] @@ -448,7 +448,7 @@ GST % GST Fund - [% IF Koha.Preference('Edifact') && ediaccount %] + [% IF Koha.Preference('EDIFACT') && ediaccount %] Supplier report [% END %] [% IF ( active ) %] @@ -477,7 +477,7 @@   [% foot_loo.tax_value | $Price %]   - [% IF Koha.Preference('Edifact') && ediaccount %] + [% IF Koha.Preference('EDIFACT') && ediaccount %]   [% END %] [% IF ( active ) %] @@ -504,7 +504,7 @@   [% total_tax_value | $Price %]   - [% IF Koha.Preference('Edifact') && ediaccount %] + [% IF Koha.Preference('EDIFACT') && ediaccount %]   [% END %] [% IF ( active ) %] @@ -590,7 +590,7 @@ [% books_loo.tax_rate * 100 | html %] [% books_loo.tax_value | $Price %] [% books_loo.budget_name | html %] - [% IF Koha.Preference('Edifact') && ediaccount %] + [% IF Koha.Preference('EDIFACT') && ediaccount %] [% books_loo.suppliers_report | html %] [% END %] [% IF ( active ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 3ba67e8368..e2930fbf51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -199,7 +199,7 @@ [% END %] - [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) ) %] + [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]

      Acquisition parameters

      [% IF ( CAN_user_acquisition_currencies_manage ) %] @@ -214,7 +214,7 @@
      Funds
      Define funds within your budgets
      [% END %] - [% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %] + [% IF ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) %]
      EDI accounts
      Manage vendor EDI accounts for import/export
      Library EANs
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index ac9d9040e0..e037b9282d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -125,12 +125,12 @@ Acquisitions: - layout when printing basket groups. EDIFACT: - - - pref: Edifact + - pref: EDIFACT default: no choices: 1: Enable 0: Disable - - edifact message exchange for acquisitions + - EDIFACT message exchange for acquisitions - - pref: EdifactInvoiceImport default: no diff --git a/misc/cronjobs/edi_cron.pl b/misc/cronjobs/edi_cron.pl index 19d3a16561..e147204ff2 100755 --- a/misc/cronjobs/edi_cron.pl +++ b/misc/cronjobs/edi_cron.pl @@ -38,7 +38,7 @@ use Koha::Edifact::Transport; use Koha::Plugins::Handler; use Fcntl qw( LOCK_EX O_CREAT O_RDWR SEEK_SET ); -die "Syspref 'Edifact' is disabled" unless C4::Context->preference('Edifact'); +die "Syspref 'EDIFACT' is disabled" unless C4::Context->preference('EDIFACT'); my $logdir = C4::Context->config('logdir'); -- 2.39.5