From 32d41cb7b8fc44f28c798d558da7a55f4aca3e2d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 6 Mar 2026 12:04:27 +0000 Subject: [PATCH] Bug 41297: (follow-up) Improve system preference descriptions Clarify the three EdiBlockDuplicate* preferences: - EdiBlockDuplicateInvoice: draw comparison with AcqWarnOnDuplicateInvoice to make it clear this is the EDI equivalent for automated processing - EdiBlockDuplicateInvoiceEmailNotice: name the EDI_DUP_INV_LIBRARY and EDI_DUP_INV_VENDOR notice templates and their respective audiences - EdiBlockDuplicateInvoiceEmailAddresses: clarify these are acquisitions staff addresses (not vendor contacts), name the EDI_DUP_INV_LIBRARY template, and note vendor contacts come from their EDI account settings Updated in acquisitions.pref, atomicupdate, and sysprefs.sql. --- installer/data/mysql/atomicupdate/bug_40383.pl | 6 +++--- installer/data/mysql/mandatory/sysprefs.sql | 6 +++--- .../prog/en/modules/admin/preferences/acquisitions.pref | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_40383.pl b/installer/data/mysql/atomicupdate/bug_40383.pl index a87bca2aba9..402977f78b3 100755 --- a/installer/data/mysql/atomicupdate/bug_40383.pl +++ b/installer/data/mysql/atomicupdate/bug_40383.pl @@ -15,7 +15,7 @@ return { 'EdiBlockDuplicateInvoice', '0', NULL, - 'Block processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. When enabled, duplicate invoices will be rejected and logged as errors.', + 'Block automatic processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. Similar to AcqWarnOnDuplicateInvoice for manually created invoices, but applies to invoices received via EDI.', 'YesNo' ) } @@ -30,7 +30,7 @@ return { 'EdiBlockDuplicateInvoiceEmailNotice', '0', NULL, - 'Send email notification when duplicate EDIFACT invoices are detected. Requires EdiBlockDuplicateInvoice to be enabled.', + 'Send email notifications when a duplicate EDIFACT invoice is blocked. Uses the EDI_DUP_INV_LIBRARY notice template to alert acquisitions staff, and the EDI_DUP_INV_VENDOR notice template to alert the vendor\'s EDI contacts. Requires EdiBlockDuplicateInvoice to be enabled.', 'YesNo' ) } @@ -45,7 +45,7 @@ return { 'EdiBlockDuplicateInvoiceEmailAddresses', '', NULL, - 'Comma-separated list of email addresses to notify when duplicate EDIFACT invoices are detected (e.g., "purchasing@library.org,edi_support@library.org"). Requires EdiBlockDuplicateInvoiceEmailNotice to be enabled.', + 'Comma-separated list of acquisitions staff email addresses to notify using the EDI_DUP_INV_LIBRARY notice template when a duplicate EDIFACT invoice is blocked. Vendor contacts are notified separately via the EDI_DUP_INV_VENDOR notice using addresses configured in the vendor\'s EDI account. Requires EdiBlockDuplicateInvoiceEmailNotice to be enabled.', 'Textarea' ) } diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 970d808b668..09515d527ce 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -242,9 +242,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EdifactInvoiceImport', 'automatic', 'automatic|manual', 'If on, don\'t auto-import EDI invoices, just keep them in the database with the status \'new\'', 'Choice'), ('EdifactLSL', 'ccode', 'location|ccode|', 'Map EDI sub-location code (GIR+LSL) to Koha Item field, empty to ignore', 'Choice'), ('EdifactLSQ', 'location', 'location|ccode|', 'Map EDI sequence code (GIR+LSQ) to Koha Item field, empty to ignore', 'Choice'), -('EdiBlockDuplicateInvoice', '0', NULL, 'Block processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. When enabled, duplicate invoices will be rejected and logged as errors.', 'YesNo'), -('EdiBlockDuplicateInvoiceEmailAddresses', '', NULL, 'Comma-separated list of email addresses to notify when duplicate EDIFACT invoices are detected (e.g., "purchasing@library.org,edi_support@library.org"). Requires EdiBlockDuplicateInvoiceEmailNotice to be enabled.', 'Textarea'), -('EdiBlockDuplicateInvoiceEmailNotice', '0', NULL, 'Send email notification when duplicate EDIFACT invoices are detected. Requires EdiBlockDuplicateInvoice to be enabled.', 'YesNo'), +('EdiBlockDuplicateInvoice', '0', NULL, 'Block automatic processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. Similar to AcqWarnOnDuplicateInvoice for manually created invoices, but applies to invoices received via EDI.', 'YesNo'), +('EdiBlockDuplicateInvoiceEmailAddresses', '', NULL, 'Comma-separated list of acquisitions staff email addresses to notify using the EDI_DUP_INV_LIBRARY notice template when a duplicate EDIFACT invoice is blocked. Vendor contacts are notified separately via the EDI_DUP_INV_VENDOR notice using addresses configured in the vendor\'s EDI account. Requires EdiBlockDuplicateInvoiceEmailNotice to be enabled.', 'Textarea'), +('EdiBlockDuplicateInvoiceEmailNotice', '0', NULL, 'Send email notifications when a duplicate EDIFACT invoice is blocked. Uses the EDI_DUP_INV_LIBRARY notice template to alert acquisitions staff, and the EDI_DUP_INV_VENDOR notice template to alert the vendor\'s EDI contacts. Requires EdiBlockDuplicateInvoice to be enabled.', 'YesNo'), ('ElasticsearchBoostFieldMatch', '0', NULL, 'Add a "match" query to es when searching, will follow indexes chosen in advanced search, or use title-cover for generic keyword or title index search', 'YesNo'), ('ElasticsearchCrossFields', '1', NULL, 'Enable "cross_fields" option for searches using Elastic search.', 'YesNo'), ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL), 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 d3882f651fe..27f4f9e358b 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 @@ -201,15 +201,15 @@ Acquisitions: choices: 1: Block 0: "Don't block" - - processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. + - automatic processing of EDIFACT invoices when a duplicate invoice number is detected for the same supplier. Similar to AcqWarnOnDuplicateInvoice, which warns staff when manually creating a duplicate invoice, but applies to invoices received via EDI. - - pref: EdiBlockDuplicateInvoiceEmailNotice choices: 1: Send 0: "Don't send" - - email notifications when duplicate EDIFACT invoices are detected. + - email notifications when a duplicate EDIFACT invoice is blocked. Uses the EDI_DUP_INV_LIBRARY notice template to alert acquisitions staff, and the EDI_DUP_INV_VENDOR notice template to alert the vendor's EDI contacts. - - - "Send duplicate invoice notifications to these email addresses (comma-separated):" + - "Send duplicate EDIFACT invoice notifications to these acquisitions staff email addresses using the EDI_DUP_INV_LIBRARY notice template (comma-separated). Vendor contacts are notified separately via EDI_DUP_INV_VENDOR using addresses configured in the vendor's EDI account:" - pref: EdiBlockDuplicateInvoiceEmailAddresses type: textarea class: code -- 2.53.0