Attachment 132400 Details for Bug 16258 – Bug 16258: (QA follow-up) Capitalise EDIFACT

[patch] Bug 16258: (QA follow-up) Capitalise EDIFACT

Bug-16258-QA-follow-up-Capitalise-EDIFACT.patch (text/plain), 12.06 KB, created by Nick Clemens (kidclamp) on 2022-03-29 11:38:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2022-03-29 11:38:47 UTC

Size: 12.06 KB

patch

obsolete

>From 0c2ae53eb8fc59113f13f526e809cdad373b9d97 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> 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 055b1d005e..755df4506d 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -186,7 +186,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 ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
>             [% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
>             <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
>-            [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
>+            [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
>                 <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
>             [% END %]
>         </ul>
>@@ -23,7 +23,7 @@
>                 [% END %]
>             </ul>
>         [% 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 ) %]
>             <h5>Administration</h5>
>             <ul>
>                 [% IF ( CAN_user_acquisition_period_manage ) %]
>@@ -35,7 +35,7 @@
>                 [% IF ( CAN_user_acquisition_currencies_manage ) %]
>                     <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
>                 [% END %]
>-                [% IF Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage %]
>+                [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
>                     <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>                     <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>                 [% 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 @@
>         </ul>
>     [% 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 ) ) %]
>         <h5>Acquisition parameters</h5>
> 
>         <ul>
>@@ -119,7 +119,7 @@
>             [% IF ( CAN_user_acquisition_budget_manage ) %]
>                 <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
>             [% END %]
>-            [% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %]
>+            [% IF ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) %]
>                 <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>                 <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>             [% 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 01207c9c52..6535cf00c3 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 %]
>                         <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
>                         [% END %]
> 
>@@ -448,7 +448,7 @@
>                         <th>GST %</th>
>                         <th>GST</th>
>                         <th>Fund</th>
>-                        [% IF Koha.Preference('Edifact') && ediaccount %]
>+                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>                         <th>Supplier report</th>
>                         [% END %]
>                         [% IF ( active ) %]
>@@ -477,7 +477,7 @@
>                         <th>&nbsp;</th>
>                         <th>[% foot_loo.tax_value | $Price %]</th>
>                         <th>&nbsp;</th>
>-                        [% IF Koha.Preference('Edifact') && ediaccount %]
>+                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>                         <th>&nbsp;</th>
>                         [% END %]
>                         [% IF ( active ) %]
>@@ -504,7 +504,7 @@
>                     <th>&nbsp;</th>
>                     <th>[% total_tax_value | $Price %]</th>
>                     <th>&nbsp;</th>
>-                    [% IF Koha.Preference('Edifact') && ediaccount %]
>+                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
>                     <th>&nbsp;</th>
>                     [% END %]
>                     [% IF ( active ) %]
>@@ -590,7 +590,7 @@
>                         <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
>                         <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
>                         <td>[% books_loo.budget_name | html %]</td>
>-                        [% IF Koha.Preference('Edifact') && ediaccount %]
>+                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>                         <td>[% books_loo.suppliers_report | html %]</td>
>                         [% 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 @@
>                 </dl>
>             [% 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 ) ) %]
>                 <h3>Acquisition parameters</h3>
>                 <dl>
>                     [% IF ( CAN_user_acquisition_currencies_manage ) %]
>@@ -214,7 +214,7 @@
>                         <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
>                         <dd>Define funds within your budgets</dd>
>                     [% END %]
>-                    [% IF ( Koha.Preference('Edifact') && CAN_user_acquisition_edi_manage ) %]
>+                    [% IF ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) %]
>                         <dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>
>                         <dd>Manage vendor EDI accounts for import/export</dd>
>                         <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
>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.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 16258: 51185 | 51228 | 54539 | 54567 | 130451 | 130453 | 130454 | 130455 | 130470 | 130471 | 130472 | 130473 | 130474 | 130475 | 130833 | 130834 | 130835 | 130836 | 130837 | 130838 | 130839 | 130840 | 130841 | 130842 | 130952 | 130980 | 130981 | 130982 | 130983 | 130984 | 130985 | 130986 | 130987 | 130988 | 130989 | 130990 | 132391 | 132392 | 132393 | 132394 | 132395 | 132396 | 132397 | 132398 | 132399 | 132400 | 132401 | 132402