Attachment 128726 Details for Bug 29481 – Bug 29481: Terminology: Fix other occurrences of 'Collection code'

[patch] Bug 29481: Terminology: Fix other occurrences of 'Collection code'

Bug-29481-Terminology-Fix-other-occurrences-of-Col.patch (text/plain), 22.76 KB, created by Jonathan Druart on 2021-12-20 08:52:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-12-20 08:52:03 UTC

Size: 22.76 KB

patch

obsolete

>From dfc27cfadf85cba3185bcc316b08409428fc2593 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sat, 18 Dec 2021 22:04:16 +0100
>Subject: [PATCH] Bug 29481: Terminology: Fix other occurrences of 'Collection
> code'
>
>This changes "collection code" to be "collection" as Koha displays
>the collection description and no codes. This will also help to make
>the GUI more consistent overall.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../mandatory/marc21_framework_DEFAULT.yml    |  4 +--
> .../marc21_simple_bib_frameworks.sql          | 32 +++++++++----------
> koha-tmpl/intranet-tmpl/prog/en/columns.def   |  2 +-
> .../en/modules/admin/preferences/patrons.pref |  6 ++--
> 4 files changed, 22 insertions(+), 22 deletions(-)
>
>diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
>index 63214f06b33..4aed1394d97 100644
>--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
>+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
>@@ -510,8 +510,8 @@ tables:
> 
>         - tagfield: "952"
>           tagsubfield: "8"
>-          liblibrarian: "Collection code"
>-          libopac: "Collection code"
>+          liblibrarian: "Collection"
>+          libopac: "Collection"
>           repeatable: 0
>           mandatory: 0
>           kohafield: items.ccode
>diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
>index 859cb74875a..1b3c366224a 100644
>--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
>+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
>@@ -170,7 +170,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'BKS', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'BKS', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'BKS', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'BKS', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL),
>@@ -3976,7 +3976,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'BKS', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'BKS', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'BKS', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL),
>@@ -4097,7 +4097,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'CF', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'CF', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'CF', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'CF', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL),
>@@ -7904,7 +7904,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'CF', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'CF', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'CF', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL),
>@@ -8025,7 +8025,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'SR', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'SR', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SR', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SR', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL),
>@@ -11831,7 +11831,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'SR', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'SR', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'SR', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL),
>@@ -11952,7 +11952,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'VR', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'VR', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'VR', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'VR', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL),
>@@ -15758,7 +15758,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'VR', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'VR', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'VR', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL),
>@@ -15878,7 +15878,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'AR', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'AR', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'AR', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'AR', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL),
>@@ -19684,7 +19684,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'AR', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'AR', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'AR', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL),
>@@ -19804,7 +19804,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'KT', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'KT', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'KT', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'KT', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL),
>@@ -23609,7 +23609,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'KT', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'KT', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'KT', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL),
>@@ -23730,7 +23730,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'IR', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'IR', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'IR', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'IR', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL),
>@@ -27535,7 +27535,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'IR', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'IR', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'IR', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL),
>@@ -27654,7 +27654,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'SER', '', '', NULL),
> 		('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
> 		('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'SER', '', '', NULL),
>-		('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SER', '', '', NULL),
>+		('952', '8', 'Collection', 'Collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SER', '', '', NULL),
> 		('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
> 		('952', 'a', 'Home library', 'Home library', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL),
> 		('952', 'b', 'Current library', 'Current library', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL),
>@@ -31457,7 +31457,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
> 		('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'SER', '', '', NULL),
> 		('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'SER', '', '', NULL),
> 		('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'SER', '', '', NULL),
>-		('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL),
>+		('995', '8', 'Collection [LOCAL, KOHA]', 'Collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL),
> 		('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL),
> 		('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL),
> 		('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def
>index a8d15914c16..41c1e441f8d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def
>+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def
>@@ -94,7 +94,7 @@
> <field name="items.timestamp">Timestamp</field>
> <field name="items.location">Shelving location</field>
> <field name="items.permanent_location">Permanent shelving location</field>
>-<field name="items.ccode">Collection code</field>
>+<field name="items.ccode">Collection</field>
> <field name="items.itype">Koha itemtype</field>
> <field name="items.stocknumber">Inventory number</field>
> <field name="items.damaged">Damaged status</field>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 5a6f1bd5a43..8c302243566 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -396,8 +396,8 @@ Patrons:
>              transaction_type: "Transaction type"
>              itemnumber: "Itemnumber"
>              itemtype: "Item type"
>-             holdingbranch: "Holding branch"
>-             homebranch: "Home branch"
>+             holdingbranch: "Holding library"
>+             homebranch: "Home library"
>              location: "Location"
>              itemcallnumber: "Item's callnumber"
>-             ccode: "Collection code"
>+             ccode: "Collection"
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 29481: 127728 | 127899 | 128695 | 128696 | 128697 | 128725 | 128726