Attachment 114788 Details for Bug 25534 – Bug 25534: (QA follow-up 2) Add default values for new AV category

[patch] Bug 25534: (QA follow-up 2) Add default values for new AV category

Bug-25534-QA-follow-up-2-Add-default-values-for-ne.patch (text/plain), 1.72 KB, created by Jonathan Druart on 2021-01-04 13:42:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-01-04 13:42:29 UTC

Size: 1.72 KB

patch

obsolete

>From cadcd70a19315cd93ee21e3d607a8aed7fd76f21 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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

Actions: View | Diff | Splinter Review

Attachments on bug 25534: 105034 | 105035 | 105036 | 105077 | 105078 | 105079 | 105105 | 105106 | 105108 | 105109 | 105110 | 105111 | 105112 | 105113 | 105114 | 105115 | 105116 | 105117 | 105118 | 105119 | 105120 | 105121 | 105122 | 105147 | 105148 | 105149 | 105150 | 105151 | 108476 | 108477 | 108478 | 108479 | 108480 | 108481 | 108746 | 108747 | 108748 | 108749 | 108750 | 108751 | 108752 | 108753 | 108754 | 108755 | 108756 | 108757 | 108805 | 108806 | 108891 | 108892 | 108893 | 108894 | 108895 | 108896 | 108897 | 108898 | 108899 | 108900 | 108901 | 108902 | 108903 | 108904 | 108977 | 108985 | 108986 | 108990 | 114026 | 114027 | 114788