From cadcd70a19315cd93ee21e3d607a8aed7fd76f21 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Jan 2021 14:41:56 +0100 Subject: [PATCH] Bug 25534: (QA follow-up 2) Add default values for new AV category Fix wrong conflict resolution --- .../data/mysql/fr-FR/1-Obligatoire/authorised_values.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql index 001bc774db..0f7a6bcb30 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql @@ -721,6 +721,6 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HSBND_F INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'RET_BY_PATRON', 'Returned by patron'); INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('RETURN_CLAIM_RESOLUTION', 'FOUND_IN_LIB', 'Found in library'); -+-- hold cancellation -+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CANCELLATION','NOT_FOUND','Item could not be located on shelves'); -+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CANCELLATION','DAMAGED','Item was found to be too damaged to fill hold'); +-- hold cancellation +INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CANCELLATION','NOT_FOUND','Item could not be located on shelves'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CANCELLATION','DAMAGED','Item was found to be too damaged to fill hold'); -- 2.20.1