]> git.koha-community.org Git - koha.git/commit
Bug 34339: (bug 33556 follow-up) Easy ERM-related changes
authorTomas Cohen Arazi <tomascohen@theke.io>
Thu, 8 Jun 2023 16:27:13 +0000 (13:27 -0300)
committerTomas Cohen Arazi <tomascohen@theke.io>
Fri, 8 Sep 2023 14:54:49 +0000 (11:54 -0300)
commit5788f94868bde660179a183382aad42e9e3b40be
treec5385cf3e064b3e96a69117668d955d78603388b
parentd1d9f4698eb2f959964d83d22b2079f07286a7c4
Bug 34339: (bug 33556 follow-up) Easy ERM-related changes

I left the (easy) ERM cases out because it throws this when running the
QA script:

Processing files before patches
|========================>| 51 / 51 (100.00%)

An error occurred : Inconsistent hierarchy during C3 merge of class 'Koha::REST::V1::ERM::EHoldings::Titles::Local':
current merge results [
Koha::REST::V1::ERM::EHoldings::Titles::Local,
]
merging failed on 'Mojolicious::Controller' at /kohadevbox/qa-test-tools/koha-qa.pl line 112.

and didn't want this to pollute the rest of the changes.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Koha/REST/V1/ERM/Agreements.pm
Koha/REST/V1/ERM/Documents.pm
Koha/REST/V1/ERM/EHoldings/Packages.pm
Koha/REST/V1/ERM/EHoldings/Packages/EBSCO.pm
Koha/REST/V1/ERM/EHoldings/Packages/Local.pm
Koha/REST/V1/ERM/EHoldings/Resources.pm
Koha/REST/V1/ERM/EHoldings/Resources/Local.pm
Koha/REST/V1/ERM/EHoldings/Titles.pm
Koha/REST/V1/ERM/EHoldings/Titles/EBSCO.pm
Koha/REST/V1/ERM/EHoldings/Titles/Local.pm
Koha/REST/V1/ERM/Licenses.pm