git.koha-community.org Git

Bug 33054: Fix unit tests

This patch fixes the tests by making sure:
- The branch in userenv matches the home/holding branch so there are no
  circ rules getting in the middle
- Gives the user superlibrarian permissions for the same reasons above.

To test:
1. Run:
   $ ktd --shell
  k$ for i in $(seq 1 20 ); do prove t/db_dependent/Koha/Acquisition/Order.t ; done
=> FAIL: Notice it fails quite often. You can ctrl+c to interrupt once
it has failed at least once.
2. Apply this patch
3. Repeat 1
=> SUCCESS: it doesn't fail a single time
4. Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2c4dbb7c1e0e8837e54ed44f453ac27473cd0c45)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>

Bug 22490: Some strings in JavaScript files are untranslatable

Javascript function `_` works only if used in template file (.tt or
.inc).
In .js files we should use `__`

This patch updates .js files to use `__` instead of `_`

Test Plan:
1. Do not apply the patch yet
2. Run `npx gulp po:update --lang fr-FR` (choose another language
   if you prefer)
3. Open misc/translator/po/fr-FR-messages-js.po and search "Please
   select a CSV (.csv) or ODS (.ods) spreadsheet file"
4. Notice that the references above only mention biblio_framework.js
5. If not already translated, translate it
6. Run misc/translator/translate install fr-FR
7. Go to staff interface and change language to fr-FR
8. Go to Administration » Authority types and click on "Actions ->
   Import"
9. In the modal window, click on "Import" without selecting a file. You
   should see an alert with the non-translated text
10. Apply the patch
11. Run `npx gulp po:update --lang fr-FR`
12. Open misc/translator/po/fr-FR-messages-js.po and search "Please
    select a CSV (.csv) or ODS (.ods) spreadsheet file"
13. Notice that the references above now also mention authtype.js
14. If the translation is marked as fuzzy, remove the fuzzy flag
15. Run misc/translator/translate install fr-FR
16. Go to staff interface again
17. Go to Administration » Authority types and click on "Actions ->
    Import"
18. In the modal window, click on "Import" without selecting a file. You
    should see an alert, this time with the translated text

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6498c5835c99bfc628ae87bbc43808dfd89f0d87)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>

Bug 32728: ERM - Update search header depending on navigation

Search header should change to match the section you are in.

Default is "agreement". If you are in "local titles" or "local
packages", the header will be positionned on the relevant tab.

To replicate:

1. Enable the ERM module: ERMModule system preference.
2. Go to the ERM module: Home > E-resource management.
3. Select the options from the sidebar menu (Agreements, Packages and Titles),
   and note that the ERM search header options don't change.
4. Add a minimal agreement, package and title.
5. Change the search header to another option, for example 'Search titles',
   then perform a search. Note that:
   - the appropriate sidebar menu option is highlighted, for example: 'Titles'
   - the search header changes back to 'Agreement search'
6. Apply patch, run yarn build
7. Verify the search options are now switched when moving between pages

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c564c8a69614b7f43584d7cdd9f5ffbdfff9a935)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 33051: Make 22600075.pl idempotent

As there is no check, this dbrev could cause trouble if run twice. It
doesn't look like it is going to get backported to 22.05, but just in
case...

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>
(cherry picked from commit 4a28d4295956e077c833b1bc91a12fb4a1c26ad7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32307: Fix local cover images

We were not calling the function here!

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 77b3e01ca04d41be5b95222c84a223f9751dfe99)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32770: Restore phone

all_phone vs all_phones
That was caught by Selenium tests t/db_dependent/selenium/patrons_search.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c500fd3c61f3ef5527c31d1904c3174f784452e2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32918: (follow-up) Add new lines for formatting consistency

This adds new lines between each authorised value for better
readability and to match the formatting of the rest of the file.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 18f3b7619bc6b648bb074b2be836e01a35c52b99)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32918: ERM authorized values should be in installer/data/mysql/en/mandatory/auth_values.yml

This patch moves the authorized value insertions for ERM categories into
the language-specific auth_values.yml file.

To test:
1. Count the number of authorized values in the mandatory categories

select count(*) from authorised_values where category in ('YES_NO', 'PAYMENT_TYPE', 'HSBND_FREQ', 'ERM_AGREEMENT_STATUS', 'ERM_AGREEMENT_CLOSURE_REASON', 'ERM_AGREEMENT_RENEWAL_PRIORITY', 'ERM_USER_ROLES', 'ERM_LICENSE_TYPE', 'ERM_LICENSE_STATUS', 'ERM_AGREEMENT_LICENSE_STATUS', 'ERM_AGREEMENT_LICENSE_LOCATION', 'ERM_PACKAGE_TYPE', 'ERM_PACKAGE_CONTENT_TYPE', 'ERM_TITLE_PUBLICATION_TYPE', 'COUNTRY', 'LANG', 'qualif');

--> There should be 929

2. Delete the authorized values from these categories

delete from authorised_values where category in ('YES_NO', 'PAYMENT_TYPE', 'HSBND_FREQ', 'ERM_AGREEMENT_STATUS', 'ERM_AGREEMENT_CLOSURE_REASON', 'ERM_AGREEMENT_RENEWAL_PRIORITY', 'ERM_USER_ROLES', 'ERM_LICENSE_TYPE', 'ERM_LICENSE_STATUS', 'ERM_AGREEMENT_LICENSE_STATUS', 'ERM_AGREEMENT_LICENSE_LOCATION', 'ERM_PACKAGE_TYPE', 'ERM_PACKAGE_CONTENT_TYPE', 'ERM_TITLE_PUBLICATION_TYPE', 'COUNTRY', 'LANG', 'qualif');

3. Apply patch
4. Load the mandatory authorized values

./misc/load_yaml.pl --file installer/data/mysql/en/mandatory/auth_values.yml --load

5. Redo step 1
   --> There should be the same number (929)
6. Update translations

cd misc/translator
./translate update xx-XX

7. Search the po/xx-XX-installer.po file for any of the loaded
   authorized values

   For example,

   grep "Abstract and index" po/xx-XX-installer.po

   --> descriptions should be translatable

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ff18e46ca64bc729704668ca231b04fecc55551e)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32353: Fix erm_agreements.t

Agreement.vendor_id has a default value defined in TestBuilder, but here
we were assuming there was one.
We should then generate it and pass the value when building the
agreement objects.

The failure was:
koha_1       |     #   Failed test '200 OK'
koha_1       |     #   at t/db_dependent/api/v1/erm_agreements.t line 95.
koha_1       |     #          got: '400'
koha_1       |     #     expected: '200'
koha_1       |
koha_1       |     #   Failed test 'exact match for JSON Pointer ""'
koha_1       |     #   at t/db_dependent/api/v1/erm_agreements.t line 95.
koha_1       |     #     Structures begin differing at:
koha_1       |     #          $got = HASH(0x55cde781a480)
koha_1       |     #     $expected = ARRAY(0x55cde75af9c8)
koha_1       |     # Looks like you failed 2 tests of 32.

400 because we were calling
http://localhost:8081/api/v1/erm/agreements?vendor_id='
which returns {"errors":[{"message":"Expected integer - got string.","path":"\/vendor_id"}],"status":400}%

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e7d40b7a99c6ad8df8f91307560bb6021143c73f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32353: Don't generate item group for holds in tests

See bug 31447, we don't want the tests to deal with potential failures
because of some item groups.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 813bd47b4c6052da7f320096e226ab013a054c5f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32353: Pick the default value for FK

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d766992f2b9b077753a285b18f59b74c17b92e53)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

RMaint: Release follow-up - Fix db_rev permissions

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32994: Remove breaking css/maps/*.map files from Makefile.PL

to test:
- run makefile, note failure

  $ perl Makefile.PL
  $ make
  $ make install
  webpack 5.74.0 compiled with 3 warnings in 20831 ms
  Done in 36.01s.
  make: *** No rule to make target 'koha-tmpl/opac-tmpl/bootstrap/css/maps/opac-rtl.css.map', needed by 'pm_to_blib'.  Stop.

- apply patch
- run makefile, note success

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 587ab3ddb850398cd1ba26b8ff2b9369651b7a67)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32994: Remove compiled files from src (2)

this patch adds 2 files that stops dpkg-source from including ./node_modules dir into koha-common.deb package

to test...
- build a package, note failure
- apply patch
- build a package, note success

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0fdc27672a5f2742fbd3a391146885a6c8a90c19)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32978: Updated yarn.lock

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4bf5bcc940f25a254543332a6ee4359bdb77a404)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32978: Replace node-sass with dart-sass

'npm install' fails in ktd on aarch64, giving unsupported architecture error for node-sass.

This patch addresses this by replacing node-sass with dart-sass, updating our gulpfile
accordingly. Some corrections have been made to SCSS to fix warnings
raised during the build process.

Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Works like a charm. Great work oleonard! Tested on Apple M1, e.g. aarch64.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: I removed some useless formatting changes in the gulpfile, and the
yarn.lock changes as well.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e5b28d9c40cab651079eadc1b64d2479a34cbbeb)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32338: OPAC - Mobile - Selection toolbar in search result is shifted and not adjusted

To reproduce:
1- Go to the OPAC
2- Inspect the webpage and switch to mobile view
3- Perform a search
4- Check the top of the results table
5- Notice that options are not displayed correctly, there is a blank space between 'Unhighlight' and 'Select All'
6- Apply the patch
7- compile the .scss file 'yarn build --view opac'
8- Clear your navigator caches
9- repeat step 1, 2, 3, 4
10- The options are now displayed correctly

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 967c61a190cd0da395e8acf8e8cbf4ee3f12eb37)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32941: Sys prefs side menu styling applying where not intended

In bug 32881 I introduced changes to make system preferences sub menu items easier to read. At the time, I couldn't find other instances of ul ul in the templates code, but turns out the ERM module has a <ul> inside a <ul>, and possibly other places.
The original selector was too loose and was applying where not intended, this patch rolls back 32881 changes and puts the changes in a tighter selector.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e11646eb618df03528a4f70c560c23ab9b622083)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32460: Add missing columns to table configuration for patron categories

The table settings were missing the recently added columns, resulting
in strange behaviour using the column visibility settings:

* patron expiration
* can be guarantee
* exclude from local holds priority

To test:
* Go to administration > patron categories
* Verify some columns are missing from the Columns selection
* Apply patch
* Verify the missing columns are now present and all columns
can be hidden/unhidden as expected
* Change settings for the table in administration > table settings
* Verify the settings have the desired effect

Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0f042b02c72e7f751b07d5a53be94d982119a17e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32798: Update parameter passed to Koha::Biblio::Metadata->record

To test:
1 - Enable OAI sets, and define a set with mapping 952 y = BK
2 - perl misc/migration_tools/build_oai_sets.pl -v -i -r
3 - The script dies:
Koha::Biblio::Metadata->record must be called on an instantiated object or like a class method with a record passed in parameter
4 - Apply patch
5 - Repeat
6 - Success!

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: tcohen updated indentation
(cherry picked from commit d6433ff71eba75eea9cd7d5e7da8cac62e7ade01)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32891: (QA follow-up) Fix perlcritic error

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1d3159922070059cf55c71f31a1297dbb9bfe4ed)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32891: Fix slot selection in last hour

If the curbside pickup module is configured with slot not on the hour
(minutes=00), the slots in the last (not complete) hour won't be
selectable.

Test plan:
Create the following configuration:
pickup interval: 10
Opening hours: 08:00 to 11:30
Create a pickup and select 11:10 or 11:20
=> Without this patch the pickup is not created and the UI displays "Wrong slot selected"
=> With this patch you are able to create the pickup

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f2f288a8c409ae32fb15e764bfd980d022315ff8)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32653: Fix curbside pickup if configured on more than 1 branch

If curbside pickup is configured on more than 1 branch, the calendar
will not display the correct day.

We are always selecting the days for the last branch.

Test plan:
Configure curbside pickup for
CPL Monday 8:12
FPL Tuesday 12:15

Login at the opac, select CPL, notice Tuesday are available

Apply the patch and confirm all is working correctly now.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 64e14f90b5c180b561bfe9c07e30f1456ef49a2e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32933: Use val() instead of attr("value") when getting field values with jQuery

This patch replaces instances in Koha's templates where "attr('value')" is
used to get the value of a form field, using "val()" instead. This
ensures that we get the current value of the field, not just the
value of the field when the page first loaded.

To test, apply the patch and test the following pages:

- Tools -> Tags. Use the "Check lists" form in the right-hand sidebar
  to test the approval status of some approved and rejected tags. It
  should correctly respond with the tag's status.
- Cataloging -> Label creator.
  - New -> Printer profile. Each offset and creep field should correctly
    reflect the selected value in the "Units" dropdown. Changing the
    dropdown should make the units change accordingly.
  - New -> Label template. Perform the same tests as above.
- Tools -> Patron card creator.
  - New -> Layout. If necessary, check the "Field 1" checkbox. The
    units should be displayed correctly and change as you change the
    "Units" dropdown.
  - New -> Printer profile,
  - New -> Card template: Perform the same tests as above.
- Lists -> List contents.
  - Check that the "Add to" dropdown menu works for adding selected
    titles to a cart or another list.
- Back record modification. Submit a batch of records for modification
  and go to Administration -> Manage jobs.
  - View the details of the job you just submitted.
  - Confirm that the "Add modified records to the following list"
    dropdown works correctly.
- Cataloging -> Find a bibliographic record -> Edit items.
  - Confirm that clicking a cell in the table of existing items
    triggers the "Edit item/Delete item" menu, and that these links
    work correctly.

Works as described.

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9863c18cc87e0e49923eeb585319f6e6c46172b0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 33002: Restore "Archive selected" for archiving multiple suggestions

It looks like this button, added by bug 30599 was later
accidentally removed again. This is giving it a comeback.

To test:
1 - Apply patch
2 - Create some purchase suggestions
3 - Select several suggestions
4 - Click 'Archive selected'
5 - Suggestions are archived
6 - You can view archived suggestions by selecting 'Suggestion information'->'Include archived'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 956ae915b0619e93ab3513b9ad6a4b53add640a7)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32898: Avoid hardcoding user/pass in tests

This patch makes the authentication parameters be configurable through
env. Before this, it was hardcoded to koha/koha, which only works if the
ktd defaults haven't been tweaked.

If no env is defined, it fallsback to koha/koha.

In order to pass the ktd configured params, the tests need to be run
like:

$ yarn cypress run --env KOHA_USER=$KOHA_USER,KOHA_PASS=$KOHA_PASS

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 53bebb413aec3796ce66311b0e66c872e01fee19)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32898: Remove unecessary async/await

myFetch awaits already

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a36f3ed7fe60e14129f2b4b66db1b61ebabe1f9a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32898: ERM - Improve fetch

... and fix cypress tests

The main problem was that there were no more checkError call for fetchLocalTitleCount
and the error was not displayed on the UI.

This commit is doing several things:
- Refactor fetch.js to call the same fetch method (myFetch) in order to
deal with the error in a single place
- Have a new myFetchTotal JS function to get the X-Total-Count header
from the response and get the benefit of the previous refactoring
- Rename fetchCountLocalPackages with fetchLocalPackagesCount to match fetchLocalTitleCount
- Use fetchLocalPackagesCount on the Package list view
- Use checkError from components using fetch directly. Ideally the could
should be moved to fetch.js and myFetch should be used.
- checkError get a new flag in parameter to ask for the response instead
of the result (ie. the JSON of the response). That's useful when we need
the response status or the headers
- Make checkError throw a proper exception to stop propation. This
modify the error we display on the UI, it's why we have the following
changes in cypress tests:
- "Something went wrong: Internal Server Error"
+ "Something went wrong: Error: Internal Server Error"
That's not ideal, we should have our own JS exception to avoid that
"Error" (coming from the toString call on the error)

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a294c5e901e56f05dc80b7b5993ffd4394349104)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32898: Fix Cypress tests

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 61656983f250d8c3275e83e7924951a62bde473f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32757: Make 'Save changes' button on housebound details yellow

This changes the button to btn-primary to make it appear yellow.

To test:
* Enable HouseboundModule
* Search for any patron
* Go to their patron account
* Switch to Housebound tab
* Edit details
* Verify 'Save changes' is not yellow
* Apply patch
* Verify the button has changed

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1e2bb90204d69c0f2e7128b8de95be360af10d21)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32307: (follow-up) Fix gallery when Coce is enabled

Yet another fix, this is porting the following change to the intranet:
commit 1916c644808577beb3170d642f93b456bfcc5c56
Bug 28180: Fix bug with first image does not exist

To recreate the problem:
Enable Coce
Go to biblionmber=5 detail
=> No image (but one is displayed on the search result)
Add a local cover image
=> Only the local cover image is displayed
Apply this patch
=> Both images are displayed
Remove the local cover image
=> Image from coce is displayed

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d534d9186ce5af4b7054fe021c3a1d4afd2c3d55)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32307: Fix gallery when Coce is enabled

Bug 28179 added the gallery in the staff interface, and bug 28180 in the
OPAC.

OPAC and staff have different code, because the cover image providers
are different.
On bug 28180 we noticed that the OPAC needed additional code to handle
OpenLibrary, Google Jacket and Coce, to differ the creation of the
gallery to prevent Chocolat to be instantiated before the links (img src)
are effectively in the DOM.

To acchieve that we introduced a wait_for_images function, and added a
"done" flag to the 3 "JS modules".

However we haven't ported this code for the staff interface, which is
also using Coce.

Note that there was a bug at the OPAC as well for COCE, the ajax jQuery
function is async, and so 'done' was set even if the call was not
finished.

Test plan:
0. Do not apply this patch
1. Enable LocalCoverImages and IntranetCoce
2. Pick a bibliographic record with an image returned from Coce
3. Add a local cover image
4. Go to the detail page
5. Open the gallery
=> Notice that you can notice a JS error and a loading icon on the
second image. This behaviour is not always broken, it depends on the
speed of the Coce server. If you don't see the problem reload the page.
6. Apply the patch and repeat
=> Notice that the cover slider block is longer to display the icon, but
that the error is gone.
7. Confirm that there is no regression at the OPAC

We could improve the situation here, and we could display the images
in the slider, especially if the first image is a local image. But
that's for another bug...

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fd6cbf2273f71acd39bbc920400da50aed55030c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32999: Click handler to show QR code in OPAC lacks preventDefault

This patch adds "preventDefault()" to the click handler for showing
the bibliographic detail QR code. This prevents the page from scrolling
to the top when the user clicks the link.

To test, apply the patch and make sure the OPACDetailQRCode system
preference is enabled.

Locate a bibliographic record and view the detail page. If necessary,
reduce the size of your browser window so that you have to scroll down
a bit to bring the "Send to device" menu item into view in the sidebar.
Click the link to confirm that it shows the QR code and that the page
doesn't jump to the top.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5ba3eea4959cc9a89ff21b92fb12c342fed973d7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32816: Fix cataloguing/value_builder/cn_browser.pl

Use event parameter

This is part of the refactoring happening in bug 30975

Test plan:
1. Verify that the plugin continues to work as before

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d18772c3c28a339e3f4b59628a477e9c7603e3e0)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32821: Fix cataloguing/value_builder/stocknumber.pl

Use event parameter

This is part of the refactoring happening in bug 30975

Test plan:
1. Verify that the plugin continues to work as before

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 97c050eacb87cc78f8cdfc3a37d240372b164437)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32814: Fix cataloguing/value_builder/callnumber-KU.pl

Use event parameter

This is part of the refactoring happening in bug 30975

Test plan:
1. Verify that the plugin continues to work as before

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a925b07f7b5c182f2c8050886d58e08ce065eff3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 31890: Add surname to PrefillGuaranteeField system pref

To test:
1. Apply patch and restart_all
2. Find the system preference PrefillGuaranteeField
3. Look for the Surname option and add it
4. Go to a patron account and add a gaurantee
5. See that the surname is properly populated for the gaurantor's surname field

Note:
This patch replaces borrower_data.surname with patron.surname. There seems to be a mismatch here so I filed Bug 32458.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 13e1e55fb872d8a0e79fa8466f9f1276c5517e35)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 31209: Add a span with a class for items.enumchron in the checkouts list

To test:
* Add or edit an item and add some info to the 'Serial Enumeration /
  chronology' field
* Check the item out
* Verify by checking the source code or using the element inspector
  that the title and enumchron have been merged into one string
* Apply patch
* Reload and verify that now the enumchron is wrapped in a span
  with class="item_enumeration" matching the class in the list of
  checkins

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 736805ae5c4e13c8ea8523fbfe5eeea4ae90759f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32979: Skip test if running as root

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7a8a2d7110cd7f2fa5d4218665496b4c4be66ab3)

Bug 32979: Add Test::Exception to Logger.t

Test plan:
Run t/Logger.t
Note: Run under koha user, not root. Root wont have
the permission failure which is tested.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2cdc018c810667681e88fbff9a9aca5720b816e6)

Bug 23247: Use EmbedItems in opac-MARCdetail.pl

This patch uses the EmbedItems processor to add the items to the MARC
record.

To test:
- Find a known record, go to the OPAC MARC page of it.
- Play with several options in OpacHiddenItems, refreshing it
- Play with OpacHiddenItemsExceptions as well
=> SUCCESS: Things work as expected
- Apply this patch
- Repeate the tests above
=> SUCCESS: Things work as expected!
- Sign off :-D

Seems to work as advertised.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: LMSCloudPaulD <paul.derscheid@lmscloud.de>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 801cace195429b0c682468a4ea29bfd7bcc0a5ec)

Bug 32566: Don't show "ILL request log" when IllLog is disabled

When the IllLog system preference is disabled there will be no
log to view and the log will always appear empty.

To test:
1) Activate the IllModule system preference
2) Install a backend (BLDSS or FreeForm) following the wiki instructions:
https://wiki.koha-community.org/wiki/ILL_backends
3) Go to the ILL module and add a new request
4) The "ILL request log" entry in the toolbar should be visible
5) Turn off the IllLog system preference
6) Reload the page - the option should remain visible
7) Apply patch
8) Verify the link is now no longer visible after reload
9) Re-activate the IllLog
10) Verify the option now appears

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f1ca05ac77f0d2537967bbf000a09cdb0a74a2d1)

Bug 32770: Restore patron search on all emails, phones, and addresses

Prior to bug 30063 we had "Email", "Phone", and "Address" in the search field list
that allowed a search on all email, phone, or address attributes.

This patron restores these and makes sure the search box and the patron search filters use
the same block to keep them consistent

The fields are now labelled 'All emails', 'All phones', and 'Full address' to make it clear
that they search multiple - including any single field in the DefaultPatronSearchFields will
additionally add that to the dropdowns

To test:
1 - define 'test@email.pro' as 'Secondary email' for a patron
2 - Search from 'Search patrons' address bar (visible at top of moremember.pl)
3 - Nothing is found using 'Standard' or 'Email fields'
4 - Apply patch
5 - Refresh page and repeat
6 - Nothing is found for standard, Patron is found for 'All emails'
7 - Define a unique value for patron in 'Address 2'
8 - Confirm 'Full address' search returns the patron
9 - Test with 'Secondary phone' and 'All phones' as well
10 - Repeat test from 'Patrons' module using the search on the left

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 96488dfec185af2a46411e944836aafd74940123)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32812: Fix cataloguing/value_builder/barcode_manual.pl

Use event parameter instead of id.

This is part of the refactoring happening in bug 30975

Test plan:
1. Verify that the plugin continues to work as before

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1aaf68d9e57b0e131d0bc0cc4f0353cab75f2156)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32813: Fix cataloguing/value_builder/barcode.pl

Use event parameter instead of id.

This is part of the refactoring happening in bug 30975

Test plan:
1. Verify that the plugin continues to work as before

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8327b7d86e35d9b34e815d5aa686dea6d8814cfe)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32946: (QA follow-up) Fix "Send cart" form

The send cart form is almost identical to the list
'Send list' form and requires the exact same fixes
to look good. This patch achieves the same look for
both forms.

To test:
* Fill your cart in the OPAC
* Open the cart to view contents
* Click on "Send"
* The form shoud look nicely aligned
* Compary to form for sending lists, they should look the same

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f42dcf9c5105a36aa3b4997f3f6973eef0cf02e2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32946: 'Send list' form in OPAC is misaligned

This patch tweaks the OPAC CSS and the send list template so that form
fields are laid out correctly.

To test, apply the patch and rebuild the OPAC CSS.

- Log in to the OPAC and create a list if necessary.
- In the OPAC's view of the list contents, click the "Send list" button.
- In the pop-up window the form layout should look correct.

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0d7ba6e5201b16f7e7a2332af7204cb6416c289a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32922: (follow-up) Fix two additional occurences

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a9743888e506ded02200ce2aad842c038810e49f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 32922: Remove space in shebang

Some of our scripts have a space in the "shebang" (first) line:

  #! /usr/bin/perl

This is not illegal, and it does work, but it is good to be
consistent, so this patch removes the space.

To test:
- Run: grep -rn --include=*.pl '#! /usr/' *
- See the list of files that have a space in the shebang
- Apply the patch
- Run the command again, there should be no output, meaning there
  are no more files with space in the shebang
- Have a look at the patch and check that it only changes the
  shebangs
- Sign off

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6a0cd4cc5e52489a8dc1cf591447f414c34d5677)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Update release notes for 22.11.03 release

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Increment version for 22.11.03 release

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Fix translations for Koha 22.11.03

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Translation updates for Koha 22.11.03

(cherry picked from commit 0c5922c8556fe2ee68138c1029213e3f8408874e)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

RMaint: Built resources

Bug 31957: (QA follow-up) Add missing filters

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f6bf78a1073857b6a1e6b76a99b7f26380122d36)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 30993: (QA follow-up) Add missing filter

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2697f7884bbb1c68e09f47a5260b4c801f30bfe2)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32908: Load item type icons from the correct path

In the Staff interface, the details page of a bibliographic
record should display the icon associated with the item
type of an item ('Item type' column in the 'Holdings' tab).

This feature broke in v22.11.00 (for Debian package installs):
instead of the item type icon you get the default 'broken
image URL' image of your web browser.

This patch fixes that.

Test plan:

1) (if needed) Configure the following System preferences:
   - item-level_itypes => 'specific item'
   - noItemTypeImages  => 'Show'

2) (if needed) In Koha Administration > Item types, create
   an item type and associate it with an icon

3) (if needed) Create a test bibliographic record, and add
   an item to it that has an item type with an icon

4) Visit the bibliographic record's details page in the
   Staff interface. Notice that in the 'Item type' column of
   the 'Holdings' tab instead of seeing the icon associated
   with the item type of each item you get the default
   'broken image URL' image of your web browser [*].

   [*] In non-Debian package installs, the 'href' property
       of the item type icon's <img> tag should start with
       '/opac-tmpl/bootstrap/itemtypeimg'

5) Apply this patch, and refresh the page with CTRL-F5.
   The item type icon should now be displayed correctly.

   [*] KTD and Koha Sandboxes users: To verify the patch
       has worked, you should right-click on the item type
       icon and click 'Inspect: the 'href' property of the
       <img> tag should now start with:
       '/intranet-tmpl/prog/img/itemtypeimg'

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bc9a37534f10a13ca9513fae31d094e322e5358b)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 22693: ILL "Price paid" column does not appear in column configuration

Test Plan:
- Navigate to ILL requests page from the main menu after setting up your ILL backend.
- Observe that Price Paid column does not exist either here nor in the column configuration.
- Apply patch
- Observe that Price Paid column now appears in ILL requests table and in the column configuration page.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c5abf57f5a2164e118eeac0e021038eb71df2644)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32605: (follow-up) Additional fixes

This patch makes some further changes to form CSS in order to improve
consistency. Some templates have also been modified to improve layout.

- Acquisitions -> New vendor
- Staff interface home -> Patrons requesting modifications
- Reports -> Saved SQL reports
- Serials -> New subscription
- Tools -> Import patrons

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 898aeaad9a095d1ebf5c64cee0ca2d16b57dfade)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32605: Restore some form styling from before the redesign

This patch pulls styles from pre-22.11 staff-global.scss related to the
styling of fieldset.rows and contents. The old CSS is more verbose but
it has been better proven to hold up in a variety of situations.

The patch makes only one template change, a minor correction to the
basket groups form.

To test, apply the patch and rebuild the staff interface SCSS.

Test as many forms as possible to confirm that everything is still
correct. Forms affected are ones shown in the main body of the page, not
in sidebars.

Some good examples: Editing patrons, subscriptions, patron categories,
notices, item types.

This patch should help outstanding bugs 32513, 32543, and 32591

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0a3eee9e70988625c6d1ce3f044d9a540e2ebe5c)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32909: Load item type icons from the correct path

When placing an item-level hold in the Staff interface,
the table at the bottom of the screen (under the "Place
a hold on a specific item" heading) should display the
icon associated with the item type of each item in the
'Item type' column.

This feature broke in v22.05.00 (for Debian package installs):
instead of the item type icon you get the default 'broken
image URL' image of your web browser.

This patch fixes that.

Test plan:

1) (if needed) Configure the following System preferences:
   - item-level_itypes => 'specific item'
   - noItemTypeImages  => 'Show'

2) (if needed) In Koha Administration > Item types, create
   an item type and associate it with an icon

3) (if needed) Create a test bibliographic record, and add
   an item to it that has an item type with an icon

4) Visit the bibliographic record's details page in the
   Staff interface. Select 'Holds' on the left hand side,
   then pick a patron. The "Place a hold on ..." page should
   load. In the 'Item type' column of the table at the bottom
   of the screen notice that instead of seeing the icon
   associated with the item type of each item you get the
   default 'broken image URL' image of your web browser [*]

   [*] In non-Debian package installs, the 'href' property
       of the item type icon's <img> tag should start with
       '/opac-tmpl/bootstrap/itemtypeimg'

5) Apply this patch, restart Plack and refresh the page.
   The item type icon should now be displayed correctly.

   KTD and Koha Sandboxes users: To verify the patch has
   worked, you should right-click on the item type icon and
   click 'Inspect': the 'href' property of the <img> tag
   should now start with: '/intranet-tmpl/prog/img/itemtypeimg'

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ed84cfd43b0d7c135d96b712713787cf7fd53834)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 30993: Improve translatabilty of UPLOAD av hint

Improve translatability on the hint for AV UPLOAD
on the upload tool page.

To test:
* Go to tools > uploads
* Verify that the hint below the 'Browse...' displayes nicely
and the link to the UPLOAD AV works correctly
* Apply patch
* Verify the link still works and the sentence reads correctly.
NOTE: now only UPLOAD will be linked.

If you are familiar with the process, you can also make sure
the strings now show up on po files as expected:
https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 453793f714367178a2642bfd3115bfc82556ebd0)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 31957: (follow-up) Further improve translations

With the previous attempt, we ended up with some TT
constructs in the po files. This will hopefully avoid that.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d2a281ad4b80fc74bfeaab8260408bb354f7a9b8)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 31957: Improve translatability of text containing links on libraries admin page

The libraries administration page has several links to system
preferences that appear within sentences or with other text
around it. To make translations easier, we need to make sure that
those links don't break context.

To test:
* Activate IllModule (so we can see the ILL staff email setting)
* Go to administration > libraries
* Verify that the links for those settings show correctly
  * Reply-to
  * Return-Path
  * Ill staff email
  * MARC organization code
* Apply patch
* Verify links still work and show unchanged

If you are familiar with the process, you can also make sure
the strings now show up on po files as expected:
https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation

https://bugs.koha-community.org/show_bug.cgi?id=31954

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0e64ead240fd6df47a1a11e4e2439b1c9869da07)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 30642: (RMaint follow-up) Fix db_revs name

We got our version numbering a bit muddled here.. fixed before anything
bad happened ;P

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Bug 30642: (follow-up) Remove use of deleted file

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 796b3559e58fa5fe0ff02078f76421198cf89093)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>

Bug 30642: Fix dbrev permissions

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a637666d3ec804eca7c9a15a6bcdd7cb387d91c5)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>

Bug 30642: DBRev 22.12.00.004

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 178e40ae9fd7246fa638a64c34fde06f94548ff0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 30642: Make renewal_type an enum in spec and add test

This patch makes the renewal_type an enum, to match the change on the
DB. A test is added to account the fact the API is always setting
'Manual' request type.

Bonus: small portion of code gets a tidy, should've been asked by QA.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c90f60adfcb3aeba3dd81122cce96db2c8d1fc1d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 30642: (QA follow-up) Do not rely on script names in modules, add unit test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: Kyle, stop impersonating John Doe
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e8c232fcf757659bfb48433e1b8f08fa895e6aaa)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 30642: (follow-up) Change sql and adapt for translations

New column has now been changed to an enum in line with comments and the strings have been amended to be picked up for translation. The file koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc has been removed as the variables can be included within the javascript file.

Test plan:
1) In the database shell run "show columns from checkout_renewals;" and observe that there is currently no column for recording the type of renewal
2) Apply patch
3) In the shell run "dbic" and "perl installer/data/mysql/updatedatabase.pl" to update the database schema with the new column.
4) Create some checkouts
5) Renew some checkouts manually and observe in the database that there is now a column called "renewal_type" that will have recorded these as "Manual"
6) Create some checkouts that can be automatically renewed
7) Run the cron script in automatic_renewals.pl and observe that there are now also entries with a renewal_type of "Automatic"
8) Send a GET request to http://localhost:8081/api/v1/checkouts/1/renewals and observe that the renewal_type is now returned in the response
9) In the Item Details tab for a record, there is the "Current renewals" option which has a button to view renewals. Click on this and observe that the modal now displays the new information.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7fe9e76af85f3f063ac870d17b10c5e18f95c48f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 30642: Record renewal type

A requirement has been requested to record whether a renewal was done manually or automatically. A column has been added to the checkout_renewals table in the database to record this and a check is now in place to determine whether the renewal was manual or automatic. The API has also been updated to reflect this new column and return the data when requested. The renewals modal view has also been updated to show what type the renewal was.

Test plan:
1) In the database shell run "show columns from checkout_renewals;" and observe that there is currently no column for recording the type of renewal
2) Apply patch
3) In the shell run "dbic" and "perl installer/data/mysql/updatedatabase.pl" to update the database schema with the new column.
4) Create some checkouts
5) Renew some checkouts manually and observe in the database that there is now a column called "renewal_type" that will have recorded these as "Manual"
6) Create some checkouts that can be automatically renewed
7) Run the cron script in automatic_renewals.pl and observe that there are now also entries with a renewal_type of "Automatic"
8) Send a GET request to http://localhost:8081/api/v1/checkouts/1/renewals and observe that the renewal_type is now returned in the response
9) In the Item Details tab for a record, there is the "Current renewals" option which has a button to view renewals. Click on this and observe that the modal now displays the new information.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5045da59f15a7dfb3da72b5f96e249976a84692b)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 28674: DBIC schema

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 60c0d42359cb91baac6dc871146671a17380cd4f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32125: Select correct tab on return

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 32258f82b5dd6a2bef3faedf06211eaf674f674c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32125: Impliment modal context return on opac-detail.

This patch utilises the generic return option introduced in the previous
patch to prevent lose of context when clicking to login to add a comment
to a biblio.

Test plan
1/ Test that prior to this patch, upon clicking 'Log in to your account
to post a comment' you are redirected to opac-user.pl and thus loose
your context.
2/ Apply the patch
3/ Confirm that a login using the 'Log in to your account to post a
comment' link now redirect immediatly back the correct record and thus
maintains context.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 93d563b575d3c0a43702e1bf7dda5afc211c898f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 31699: (follow-up) Protect more against open redirects

This change checks that the OPACBaseURL exists, and uses its scheme
and authority to rewrite the URL passed through the "return"
param.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37ced7df0531accb4f091c78258ff98946d062c9)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 31699: (follow-up) Protect against unauthorized redirects

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e0760fd1851abc4a94a924bcf30e775c8e97da2a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 31699: Add 'return' option to opac modal login

This patch adds the option to trigger a redirect back to the current
context after successful login using modal logins triggered from various
places in the OPAC.

To make use of this, simply add 'data-return="true"' to the modal trigger link.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 507d48413d3d09866a37db81d2a856f9a0a7c6f9)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32539: Add tests

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7bb4aeba9f10336d836f31b9e572390dd5bf588a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32539: Add exception handling to plugin hooks in template plugin

This change wraps Koha plugin hook calls with exception handling
within the template plugin for Koha plugins.

Test plan:
0) Apply patch
1) Install a plugin that provides "opac_head", "opac_js",
"intranet_head", and "intranet_js" with Perl errors in them
2) Load an OPAC page
3) Note that the OPAC page loads correctly
4) Load a staff interace page
5) Note that the staff interface page loads correctly

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 23a002112273d2b406af7edd6b85acce0d5d699c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32624: Don't include guarantee or guarantor fines in BV (fines amount) in SIP messages

This patch chanegs the code to report only the patron's personal fines, and to report a block
from other fines in the screen message

This is to prevent overpayment on accounts from SIP machines

To test:
1 - prove t/db_dependent/SIP/Patron.t

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c6c2fe81a273cbb70af69dfa0b51b2f07b49a76c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 31338: (follow-up) add special class and add also to OPAC

In order to easily hide this new text, this patch adds the class "included-see-from-headings-info".

Also uses <div> instead of <p>.

And adds the same feature to OPAC.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6acdfd0493a472232cc265d7b1cac8abcff94add)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 31338: Show in advanced search when IncludeSeeFromInSearches is used

Test plan :
1) Apply patch
2) Set system preference IncludeSeeFromInSearches to "Include"
3) Go to staff interface advanced search
4) Check you see tip text in "Search for"
5) Set system preference IncludeSeeFromInSearches to "Don't include"
6) Go to staff interface advanced search
7) Check you don't see tip text in "Search for"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8d9de60582a6de64160026b99256187d7f04ea1e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32769: Standardize structure around action fieldsets in administration

This patch updates administration templates so that fieldsets with the
"action" class are placed outside the form's main fieldset.

To test, apply the patch and check the following pages to confirm that
the forms look correct:

- Administration
   -> Keyboard shortcuts
   -> Audio alerts
   -> Share content with Mana KB
      - When the ManaToken system preference is empty, the page should
        have two forms with updated fieldsets: the form with the "Use
        Mana KB..." field and a "Configure Mana KB" form.
      - With a ManaToken defined the second form should be one labeled
        "Mana KB token."
   -> Budgets
      - Click on a budget which has existing funds.
      - In the page toolbar click Planning -> Plan by libraries.
      - Check the forms in the sidebar.
   -> System preferences ->  OverDriveAuthName
      - Follow the link to "OverDrive library authnames table" and check
        the form on that page.

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 622581e5bfd8c42082bba6ee8a54e3249ea78c5d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 29173: (QA follow-up) Match pop-over sizes

As suggested by David Nind, this patch updates the call to z3950 search
on the authority edit page to match the sizing of the one from the
details page.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d25b7459b4ff4fd9f6acd539ab547fcb57dac6e0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 29173: Fixed pre-filling of the search form from the "Replace record with ZR39.50/SRU" (Authority page detail)

Now this action has the same pre-filling behaviour as the "Edit" -> "Edit Record" -> "Replace Record via Z39.50/SRU Search" action.
Author Personal - Author Meeting/Conf. - Uniform Title and Subject are filled in if the subfield contains data (like the "Edit->Replace" action).
Unimarc and Marc21 specificities are supported.

Test Plan :

1) You must have a Z39.50/SRU server for authorities
2) Go to an authority detail page (Author - Uniform title - Subject)
3)After go to "Edit"-> "Edit record" -> "Replace record via..." or
choose "Replace Record.." directly
4) See that form is also prefilled with data now

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 26c26164ba78029cb99fa99662f9e0a8ce9557df)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32356: Install installer translated files on update

If the installer files exist for a given language, the translate script
won't update it.
We should get a confirmation from Bernardo (author of bug 24262), but I
don't understand why it could be needed (side-effects?)

Test plan:
Installer several times the same language, drop the DB and run the
installer+onboarding process.
Check files installed by the installer (yaml for notice templates,
biblio frameworks) have inserted the data properly in DB.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit aa3444505f2b47a73f4b281a622b6c1073bb5c8d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 28672: (QA follow-up) Method calls cannot be interpolated directly

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8939c58a862c819e8af6366c664ec89fbe3f7547)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 28672: Pass itemnumber instead of item object

The warn call here was passing the full item object which leads to
HASH() in the logs.. this patch updates it to pass the itemnumber which
is more helpful.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c89c25d81aa8d6a2500820b84aaf7a5c157ed815)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 29100: (QA follow-up) Rename issue(s) keys to checkout(s)

Adapted test plan:

1) Apply this patch
2) For DUE and PREDUE notices, set the message body to the following:
   Title: [% checkout.title %]
3) For DUEDGST and PREDUEDGST notices, set the message body to the following:
   Titles:
   [% FOREACH c IN checkouts %]
    * [% c.title %][% END %]
4) Generate PREDUE and DUE notices for patrons including digests
5) Verify those notices contain the checkout titles

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: tcohen renamed @issues => @checkouts as well
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d81bca827058e04f656ce0bf95187b7b74b2d5c2)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 29100: Remove unnecessary loops

Remove loops that only operate one one result only

Signed-off-by: Felicity Brown <Felicity.Brown@montgomerycountymd.gov>
Signed-off-by: George Veranis <gveranis@dataly.gr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fd7a612c6ed4dc85049fa2ef6a786d2657501d74)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 29100: Add checkouts data loop to predue notices script ( advance_notices.pl )

Predue / due notices are limited to using itemscontent to display checkouts data. It would be nice to make all the checkouts data available for those notices so that libraries could format that data more nicely if they wish.

1) Apply this patch
2) For DUE and PREDUE notices, set the message body to the following:
Title: [% issue.title %]
3) For DUEDGST and PREDUEDGST notices, set the message body to the following:
Titles:
[% FOREACH i IN issues %]
* [% i.title %]
[% END %]
4) Generate PREDUE and DUE notices for patrons including digests
5) Verify those notices contain the checkout titles

Signed-off-by: Felicity Brown <Felicity.Brown@montgomerycountymd.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2114c70d11b077d83db4bdf9f3e85598e96cf2cb)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32788: Order curbside pickup slots chronologically

We need to order the slots chronologically, not depending on when they
have been added.

Test plan:
Create a slot 13 to 17 the another one 8 to 12
We want to display 8 to 12 before 13 to 17.
Confirm that this patch fixes that on the 3 following views:
Curbside pickups admin
Curbside pickups staff side
Curbside pickups at the OPAC

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0481f1d74e7d6175e1eb31b299f01c7cc7ce6090)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32743: (follow-up) Add markup comments

This patch adds comments to the template to highlight the markup
structure.

This patch should have no effect on the page's appearance or
functionality.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ac1e80400d3ab21001a5c0259a09280a7ab1cbfe)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32743: Reindent the invoice details page

This patch reindents the invoice template so that it has consistent
indentation. These changes should have no visible effect on the page.

To test, apply the patch and go to Acquisitions -> Invoices.

- Perform a search which will return invoice results.
- Click on an invoice to view the details.
- Everything should look normal.

Viewing the diff while ignoring whitespace changes should show only
places where a line break was added.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bf5806e2ec353d5c873f1d8f08f8eb910f752975)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 14911: Add 245 fields to itemsearch title column via biblio-title.inc

To test:
1. Have some records that have these 245 fields:

    -Title 245$a
    -Subtitle 245$b
    -Medium 245$h
    -Part number 245$n
    -Part name 245$p

Note: IN KTD I have to run batchRebuildBiblioTables.pl -c

2. Apply patch and do an item search that will turn up items with the 245 fields lists above
3. Notice that those subfields are now included in the title column.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bc85b3b9a6817cbe06499a3e9e97fbbbb90d2167)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Bug 32603: Suggester category in Suggestions management

In Suggestions management, in the table displaying all suggestions, add
a column to display suggester category. This way, it is possible for
example for the librarian managing suggestions rather to prioritize
suggestions coming from teachers than those coming from students.

TEST :

1. Apply the patch.
2. Acquisition > Suggestions.
3. There is a new column 'Suggester category'. It can be
displayed/hidden.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 09010a248b65c7a47973c208809c1915dac3fe0e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32567: (QA follow-up) Fix some labelling inconsistencies

This makes sure that the descriptions in the pull-downs always
match for selected/unselected.
This is not only for consistency, but will also ease translations
as simple things like an additional space will create a new
string to translate.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 226f83cbb916285b13eaa5b0ec7badb006b83fca)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>

Bug 32567: Update unimarc_field_110.pl with some values

'Script of title' values =>
e - b/c/d/e/f/g/h
i - d/e
j - f/g
l - f
n - b/c
o - a
p - a

'Translitteral code' values =>
'g' and 'h'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 343d68d8282bba90b415bdb0342284f1be1af7d0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>