]> git.koha-community.org Git - koha.git/log
koha.git
20 months agoBug 32566: Don't show "ILL request log" when IllLog is disabled
Katrin Fischer [Thu, 9 Feb 2023 21:38:38 +0000 (22:38 +0100)]
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)
(cherry picked from commit 86ec29294386f3882d2eb1686d0e27c54792e8c2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32812: Fix cataloguing/value_builder/barcode_manual.pl
Julian Maurice [Fri, 3 Feb 2023 10:58:51 +0000 (11:58 +0100)]
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>
(cherry picked from commit 309858142c2e6d5c370cb828c35f3732bddfe80e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32813: Fix cataloguing/value_builder/barcode.pl
Julian Maurice [Fri, 3 Feb 2023 10:58:50 +0000 (11:58 +0100)]
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>
(cherry picked from commit 47272d22398a39a037d8c27639e1eee6574f86c6)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 22693: ILL "Price paid" column does not appear in column configuration
Jacob O'Mara [Mon, 9 Jan 2023 10:32:23 +0000 (10:32 +0000)]
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>
(cherry picked from commit fff5619e4812b946e7317027aa0ca7df7d16ed19)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32909: Load item type icons from the correct path
Andreas Roussos [Wed, 8 Feb 2023 14:07:52 +0000 (15:07 +0100)]
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>
(cherry picked from commit c206321d2f27b4fac54c5249f0c087fc203d36f5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30993: (QA follow-up) Add missing filter
Tomas Cohen Arazi [Wed, 15 Feb 2023 12:27:50 +0000 (09:27 -0300)]
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>
(cherry picked from commit da902da6e8ddc09a88fd99c07314ce5a257336a4)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30993: Improve translatabilty of UPLOAD av hint
Katrin Fischer [Fri, 6 Jan 2023 23:06:52 +0000 (23:06 +0000)]
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>
(cherry picked from commit 6a12576d015627305b71b60f161590e24d9bcc33)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31957: (QA follow-up) Add missing filters
Tomas Cohen Arazi [Wed, 15 Feb 2023 12:32:07 +0000 (09:32 -0300)]
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>
(cherry picked from commit b0ffe61e3eae193f443a579688fabdc91d6d60ef)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31957: (follow-up) Further improve translations
Katrin Fischer [Mon, 9 Jan 2023 20:00:53 +0000 (20:00 +0000)]
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>
(cherry picked from commit ce76a551fe012fde66f1c9d893d2a19e424e458e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31957: Improve translatability of text containing links on libraries admin page
Katrin Fischer [Fri, 6 Jan 2023 22:33:43 +0000 (22:33 +0000)]
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>
(cherry picked from commit 45c783398d6d89054d43aa1fbddb80b0b739a253)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoUpdate release notes for the 22.05.10 release v22.05.10
Lucas Gass [Mon, 27 Feb 2023 20:23:25 +0000 (20:23 +0000)]
Update release notes for the 22.05.10 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoCorrect increment verion db_rev
Lucas Gass [Mon, 27 Feb 2023 20:14:56 +0000 (20:14 +0000)]
Correct increment verion db_rev

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoIncrement version for 22.05.10 release
Lucas Gass [Mon, 27 Feb 2023 20:07:59 +0000 (20:07 +0000)]
Increment version for 22.05.10 release

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoFix translations for 22.05.10
Lucas Gass [Mon, 27 Feb 2023 20:00:35 +0000 (20:00 +0000)]
Fix translations for 22.05.10

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoTranslation updates for Koha 22.05.10
Koha translators [Mon, 27 Feb 2023 14:17:08 +0000 (11:17 -0300)]
Translation updates for Koha 22.05.10

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32237: Fix using a list as base for batch record deletion
Géraud Frappier [Wed, 16 Nov 2022 21:54:41 +0000 (16:54 -0500)]
Bug 32237: Fix using a list as base for batch record deletion

When a list was used to select records for batch deletion, the
record IDs were no longer found.

To test:

1. Go to Lists in the intranet.
2. Add a list by clicking on "New list". Choose a random name for it and select private or public and save.
3.Add one or more items into it and save.
4.Go back to the main page and select "Cataloging".
5.Go to "Batch record deletion".
6.In "upload a file" select "Select a list of records" and choose a list and keep the Bibliographic on.
7.Select continue and see that the list of records is not shown.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.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 dc08b5337656acd0d845486d2b038ef012d531cb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30254: [22.05.x] Don't charge overdue fines unless some fine exists
Nick Clemens [Mon, 31 Oct 2022 18:38:04 +0000 (18:38 +0000)]
Bug 30254: [22.05.x] Don't charge overdue fines unless some fine exists

We need to determine if a book was lost by a patron, the clues we have
are previous charges. If we don't find any, we shouldn't charge a new fine

To test:
 1 - set Lost item fee refund on return policy to "Refund lost item charge and charge new overdue fine", turn on FinesMode, make sure your circ rules charge fines
 2 - have an itemtype / patron combo that charges an overdue fine
 3 - check item out (with a due date in the future) and then right back in again
 4 - confirm patron doesn't have a fine because the item was not late
 5 - set the item to Lost
 6 - in the database, edit the date_due of your checkout to a date in the past
 7 - check the item in, it is marked found
 8 - confirm your patron now has a fine
 9 - Apply patch
10 - Repeat with a new item and patron
11 - Confirm no charges

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Bug 30254: Unit tests

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Bug 30254: (QA follow-up) Remove warn from tests

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
https://bugs.koha-community.org/show_bug.cgi?id=32054

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32574: [22.05] Fix table settings on member.tt
Lucas Gass [Thu, 5 Jan 2023 18:05:13 +0000 (18:05 +0000)]
Bug 32574: [22.05] Fix table settings on member.tt

To test:
1. Apply patch
2. Do a patron searches that will return mutiple patrons.
3. Make sure you see the Columns button
4. Make sure you can properly hide columns via Table settings

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29792: DBRev 22.05.09.002
Lucas Gass [Thu, 16 Feb 2023 13:11:38 +0000 (13:11 +0000)]
Bug 29792: DBRev 22.05.09.002

20 months agoBug 29792: [22.05.x] Automatically send wrong transfers
Nick Clemens [Fri, 30 Sep 2022 11:01:56 +0000 (11:01 +0000)]
Bug 29792: [22.05.x] Automatically send wrong transfers

Bug 24434 reinstated the 'updateWrongTransfer' call here, but made the assertion that
the transfer should not be sent until 'Ok' was clicked.

I see how unsent transfers are useful for rotation, but I believe for wrong transfer we shouldn't require a confirm or print. If a library does want to, the 'transfersblockcirc' system preference will enforce clicking the button
to continue

This patch also confirms a transfer when item already has a transfer and only options are Confirm/Print because the transfer already exists

To test:
1 - Disable TransfersBlockCirc system preference
2 - Manually transfer an item from branch A to branch B
3 - Check in the item at branch A
4 - Dismiss modal without confirming
5 - View item on biblio details page, item not in transit
6 - Check in item, confirm transfer
7 - Note item in transit on details page
8 - Check in the item at branch C
9 - Dismiss modal without confirm
10 - View item on biblio detail, not in transit
11 - Checkin at A, cancel transfer
12 - Apply patch
13 - repeat 1 - 4
14 - Confirm item appears in transit
15 - Check in at branch C, dismiss modal
16 - Confirm item in transit

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32539: Add tests
Jonathan Druart [Thu, 9 Feb 2023 10:45:02 +0000 (11:45 +0100)]
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>
(cherry picked from commit 24363f91da4f02e02101456fc3e24fdce955b786)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32539: Add exception handling to plugin hooks in template plugin
David Cook [Mon, 16 Jan 2023 04:41:01 +0000 (04:41 +0000)]
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>
(cherry picked from commit 0623ba78e5ea1510de2314ea80bd846adb75259b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29173: (QA follow-up) Match pop-over sizes
Martin Renvoize [Wed, 8 Feb 2023 06:56:20 +0000 (06:56 +0000)]
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>
(cherry picked from commit 353d9dda3e4dfe6f8c446b50f73e3c489cf75d64)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29173: Fixed pre-filling of the search form from the "Replace record with ZR39...
Thibaud Guillot [Tue, 29 Mar 2022 14:12:48 +0000 (16:12 +0200)]
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>
(cherry picked from commit d788bf07c2dcc365867c1fa765caa87e8a659ae4)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32356: Install installer translated files on update
Jonathan Druart [Tue, 29 Nov 2022 09:22:10 +0000 (10:22 +0100)]
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>
(cherry picked from commit 27d128c3ab24096fccb1fa96a05ad7173c9bbc9d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32408: Add unit tests to SIP checkout
Matthias Meusburger [Thu, 8 Dec 2022 10:38:10 +0000 (10:38 +0000)]
Bug 32408: Add unit tests to SIP checkout

This patch adds unit tests to show SIP's behavior on checkout according to the
AllFinesNeedOverride, AllowFineOverride and noissuescharge sysprefs, knowingly:

+----------------------+-------------------+---------+---------+
| AllFinesNeedOverride | AllowFineOverride |  Under  |  Over   |
+----------------------+-------------------+---------+---------+
|                    0 |                 0 | allowed | blocked |
|                    0 |                 1 | allowed | blocked |
|                    1 |                 0 | blocked | blocked |
|                    1 |                 1 | blocked | blocked |
+----------------------+-------------------+---------+---------+

(the columns Under and Over are referring to "under noissuescharge" and
"over noissuescharge")

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 28672: (QA follow-up) Method calls cannot be interpolated directly
Kyle Hall [Wed, 1 Feb 2023 11:52:01 +0000 (06:52 -0500)]
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>
(cherry picked from commit 6f2aeda4c3a9e294765749a51570949b90e70d26)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 28672: Pass itemnumber instead of item object
Martin Renvoize [Wed, 7 Jul 2021 11:43:36 +0000 (12:43 +0100)]
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>
(cherry picked from commit bc23e4a1d8b72192e70e6cb31f64b630280575ec)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31407: Set focus for cursor to Currency when adding a new currency
Katrin Fischer [Sat, 4 Feb 2023 23:58:05 +0000 (23:58 +0000)]
Bug 31407: Set focus for cursor to Currency when adding a new currency

This makes sure that the focus is on the first field of the
form when adding a new currency.

To test:
* Go to administration > currencies
* Add a new currency
* Verify the focus is not on the form
* Apply patch
* Repeat, verify the focus is now on the first input "currency"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fcb19865e82c6389f64a984ed8ef0dbde5afc2d7)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 1d19b62a24a50f3458040881e3463e7d827d5612)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31768: Add tools toolbar to tags page
Katrin Fischer [Mon, 6 Feb 2023 22:06:32 +0000 (22:06 +0000)]
Bug 31768: Add tools toolbar to tags page

The tags tool was missing the toolbar on the left side.
With the filters, this patch adds the toolbar below, like
we do on other pages like HTML customizations.

To test:
* Go to Tools > Tags
* Verify no toolbar
* Apply patch
* Verify toolbar is now present
* Compare to other tool pages
* Sign off :)

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 2b63498545b41929d26ab9f3fbeecfa33e277cc3)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit a464971441887bdcadb170edef06faf68b5cd6c5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32523: Links to missing fields in MARC editor error
Jan Kissig [Wed, 4 Jan 2023 13:04:28 +0000 (14:04 +0100)]
Bug 32523: Links to missing fields in MARC editor error

This bug appears after switching to the new staff interface design (from 22.05 to 22.11).
When adding/editing a biblio in staff interface leaving out mandatory fields and click on save, you get an error dialog with shortcuts/links to these missing fields. Clicking on these links should change section tabs and focus the field.
This patch fixes that error.

Test plan:
1) in staff interface go to /cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=
2) click Save
3) Error dialog appears, informing about missing input in mandatory fields.
4) Click on tab 0 (section 0) to make sure only marc 0XX fields are visible.
5) In the error dialog click on a "Go to field" which points f.e. to section 9
6) The selected / active tab will switch to section 9 and will not focus on the selected field
7) apply patch
8) repeat step 1) to 6)

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 d7dcd3d1a8fd41bf76e1cf406f9cb92e6f998e52)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit c7c97aec66024b79544378a26ec31d0637c5e3ff)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32295: Fix punctuation for "Filters :" on serials claims page
Katrin Fischer [Sun, 5 Feb 2023 01:37:19 +0000 (01:37 +0000)]
Bug 32295: Fix punctuation for "Filters :" on serials claims page

To test:
* Add a subscription
* Generate next issue, to have a late one
* Go to serials > claims
* Select your vendor
* Verify one of the sections is labelled "Filters :"
* Apply patch
* Verify the section is now labelled "Filters:"

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 37220779fe06fbf71706930751ebef2db0d6d0a2)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 02492721a1e00b0d11539832eef0882f12e4b17d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32290: Fix terminology on ILL requests page
Katrin Fischer [Sun, 5 Feb 2023 02:18:05 +0000 (03:18 +0100)]
Bug 32290: Fix terminology on ILL requests page

This makes some fixes for the terminology used in
the ill-requests.pl page:

This item cannot be issued as it has no biblio record associated with it
> This item cannot be checked out out as there is no bibliographic
  record associated with it

You must choose a branch
> You must choose a library

View borrower details
> View patron details

Test plan:
* You can set up ILL using the instructions on
  https://wiki.koha-community.org/wiki/ILL_backends
* All strings will be located on the ILL request management page or
  the ILL requests list
* Or... you could verify looking at the patch itself

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 59cffea5d0e113b59c93e780a191232d9ad6546e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 1cbecfb143c62871a188a523939ef3e500d4234e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: DBRev 22.05.09.001
Lucas Gass [Wed, 15 Feb 2023 13:53:37 +0000 (13:53 +0000)]
Bug 30250: DBRev 22.05.09.001

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: Fix atomicupdate permissions
Tomas Cohen Arazi [Wed, 9 Nov 2022 17:12:50 +0000 (14:12 -0300)]
Bug 30250: Fix atomicupdate permissions

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 73865a6072091fdcf70610a7cb99c4a8a14479a7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: (follow-up) Clarify syspref wording around importing
Aleisha Amohia [Wed, 7 Sep 2022 02:35:42 +0000 (14:35 +1200)]
Bug 30250: (follow-up) Clarify syspref wording around importing

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 10e4aa2ee222d1fca07c0406eab412fd378739f1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: Use ApplyFrameworkDefaults when importing a record
Aleisha Amohia [Tue, 22 Mar 2022 21:26:35 +0000 (21:26 +0000)]
Bug 30250: Use ApplyFrameworkDefaults when importing a record

This patch adds the case of importing a record to the
ApplyFrameworkDefaults options.

To test:
1. Update database
2. Confirm the ApplyFrameworkDefaults system preference now has the
'when importing a record via z39.50' option. Do not select it.
3. Go to Cataloguing. Import a record from z39.50, or replace an
existing record.
4. Confirm framework defaults are not applied.
5. Go back to the system preference and check the 'when importing a
record via z39.50' option.
6. Repeat step 3. This time framework defaults should be applied. Only
fields that are empty in the imported record will be replaced by
framework defaults.
7. Repeat for authorities.

Sponsored-by: Catalyst IT
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 b837f1356b0c25801bab09f95f1881c831cf4cd3)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: Add ApplyFrameworkDefaults system preference
Aleisha Amohia [Wed, 9 Mar 2022 01:13:03 +0000 (01:13 +0000)]
Bug 30250: Add ApplyFrameworkDefaults system preference

(cherry picked from commit 684a04deb6ec7e94ca60f5cb38811176fbb9c230)

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 d42de2c657b6432c3223291f663eac5fc25b8706)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 30250: Use ApplyFrameworkDefaults when cataloguing
Aleisha Amohia [Wed, 9 Mar 2022 01:13:32 +0000 (01:13 +0000)]
Bug 30250: Use ApplyFrameworkDefaults when cataloguing

This patch adds a system preference ApplyFrameworkDefaults to configure
when to apply framework defaults - when cataloguing a new record, when
editing a record as new (duplicating), or when changing the framework
while editing an existing record. This applies to both bibliographic
records and authority records.

To test:
1. Update database
2. Go to Administration -> system preferences. Find the
ApplyFrameworkDefaults system preference. Confirm "when cataloguing new
records" is selected by default.
3. Keep the system preference open in one tab, and open the staff client
in another tab.
4. Go to Administration -> bibliographic frameworks. Choose a framework,
edit the subfields for a tag, and give a subfield a default value. For
example, set 500$a for the BOOKS framework to have a default value of
"TEST". This will be Framework A.
5. Ensure you have another framework that does not have the same default
value for a subfield as Framework A. This will be Framework B.
6. Go to Cataloguing. Add a new record using Framework A. Confirm your
subfield has the default value filled. Cancel and do not save the
record.
7. In your System preferences tab, uncheck the option "when cataloguing
new records" and save. No options should now be selected.
8. In our other tab, go to cataloguing, add a new record using Framework
A. Confirm your subfield does NOT have the default value filled. Fill
the required fields, including the subfield that should have a default
value, and Save the record.
9. In your system preferences tab, select all options and save.
10. In your other tab, click Edit, then "Edit as new (duplicate)".
Confirm your subfield has maintained the value from the source record.
Cancel and do not save the record.
11. Edit your original record and delete the value in your subfield that
could be filled with a default value by the framework. Save the record
with no value in the subfield.
12. Click Edit, then "Edit as new (duplicate)". Confirm your subfield
has the default value filled. Framework defaults will only apply to
emplty fields. Save the record.
13. Do a catalogue search and find a record that uses Framework B.
14. If you need to, edit the record to make sure there is nothing in your
subfield that should have a default value if this record were to use
Framework A, and Save.
15. Edit the record. Using the settings dropdown, change the framework
to Framework A. Confirm your subfield has the default value filled.
16. Repeat steps 4 to 12 with authority types and authority records.

Sponsored-by: Education Services Australia SCIS
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 5d42b5ff641397a4fbaeb601e2e00cd71e05e001)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32294: Fix capitalization for user ID in self checkout
Katrin Fischer [Sun, 5 Feb 2023 01:24:58 +0000 (02:24 +0100)]
Bug 32294: Fix capitalization for user ID in self checkout

Fixes capitalization of "user ID" on the self checkout help
page.

To test:
* Enable WebBasedSelfCheck
* Go to: /cgi-bin/koha/sco/sco-main.pl in the OPAC
* Log in and open help
* Verify there is a User ID within a sentence and a User id in the heading
* Apply patch
* Both should be corrected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a5f300d9fd78a684ae006aecfe44277ab2858310)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit e5efd957d085993fd691386dabe842a895ecbece)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32289: Fix punctuation in "Delete desk "X?"
Katrin Fischer [Sun, 5 Feb 2023 01:44:23 +0000 (01:44 +0000)]
Bug 32289: Fix punctuation in "Delete desk "X?"

The question mark should be after the quote instead of before.

To test:
* Enable desks using the UseCirculationDesks system preference
* Go to administration > circulation desks
* Add a new desk and save
* Delete desk
* Verify the heading reads "Delete desk "X?"
* Apply patch
* Verify the punctuation now is fixed now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 312535a9cce93548881a526a130f70772e125780)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit aa7b59e57b7699425beb82aa44911fbec7a7d7c5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32624: Don't include guarantee or guarantor fines in BV (fines amount) in SIP...
Nick Clemens [Fri, 13 Jan 2023 19:27:04 +0000 (19:27 +0000)]
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>
(cherry picked from commit dd2fedd2a1d06003091b052b220422fe8a5def7d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 8948: (follow-up) Remove 580 display from 787
Nick Clemens [Thu, 10 Nov 2022 11:37:02 +0000 (11:37 +0000)]
Bug 8948: (follow-up) Remove 580 display from 787

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7c34048bd5da170a02b958f3266c6e84df2a4d20)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 8948: (follow-up) Correct OPAC link
Nick Clemens [Thu, 3 Nov 2022 13:09:01 +0000 (13:09 +0000)]
Bug 8948: (follow-up) Correct OPAC link

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b842e55679aec03e09cc0b0e7514c3c75e8770c3)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 8948: Changes for OPAC
Nick Clemens [Thu, 3 Nov 2022 12:05:59 +0000 (12:05 +0000)]
Bug 8948: Changes for OPAC

Test with same record, confirm OPAC view is as expected

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3dce56d7cc62985534179a74347cf5fcfe1a6a55)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 8948: Display MARC 787 relationship field
Nick Clemens [Fri, 28 Oct 2022 16:38:22 +0000 (16:38 +0000)]
Bug 8948: Display MARC 787 relationship field

This field is defined similar to 775, as a related work:
https://www.loc.gov/marc/bibliographic/bd787.html

This patch adds a display of this field, linking to the referenced record as the 775 does

It also tests for 580 field, and displays the text there if present, using the 787 a and t subfields otherwise

To test:
1 - Edit the default framework to make 787atw and 580a visible in editor
2 - Add a 787 to a record:
    $tThe ideas behind the chess openings
    $aFine, Reuben<
    $w2470231
3 - Confirm there is no display
4 - Apply patch / restart all
5 - 'Other related works' now shows
6 - Link should be using title of record
7 - Set system preference UseControlNumber to Use
8 - Reload details, link should now use control number
9 - Add a 580 to the record:
    $a This is a friendly work to this one
10 - Confirm the text of the link now displays before the link
11 - Add a second 580, confirm it displays as well
   - there is no seperator as each should end with a period or other punctuation according to MARC
   - there is a dpan with a class surrounding each so styling can be added as desired
12 - Add a second 787
   - confirm seperator present and wrapped in a span with a class
   - confirm each 787 is shown with a span/class for styling

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 18ad260608f3b53cbd6b1aa8581cdc82b5ba6366)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32515: Ignore no-block flag in check-in message
Nick Clemens [Tue, 27 Dec 2022 20:32:10 +0000 (20:32 +0000)]
Bug 32515: Ignore no-block flag in check-in message

Bug 12225 changed the templates to correctly pass through the no-block flag,
however, we don't have a no-block routine for checkins

This patch restore previous behaviour of performing a normal checkin when
no block was requested - it adds a new FIXME

To test:
1 - See bug 32537
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32537
2 - Repeat test plan on that bug, noting that there is no response when no-block = Y
3 - Apply this patch
4 - Repeat the tests and confirm no-block = Y has a standard checkin response

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Blou <philippe.blouin@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 30fcbb44370048f6ad53d71225a0f40c6d27fbb1)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit a7e914151c7d8a55ae45d670a41c9a7d4c200503)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32655: Move phone and itiva variables into templates
Lucas Gass [Tue, 17 Jan 2023 18:42:28 +0000 (18:42 +0000)]
Bug 32655: Move phone and itiva variables into templates

To test:
1. Go to a patron record or create a new one.
2. Toggle the 'Patron messaging preferences' fieldset so it is hidden.
3. Notice the variables.
4. Apply patch
5. Try steps 1 & 2 again, no varibales.
6. Attempt to toggle on/off options for email/sms. When email/sms are off the digest option next to it should be disabled.
7. Go to  Administration > Patron categories and try step 6 there as well.

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 176397d7619abf79969c98b7adc20a1c52da47fd)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit ec70e54af5652e99ede5b1080906c9d49bf9ef18)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 28314: Spinning icon is not always going away for local covers in staff
Hammat Wele [Thu, 19 Jan 2023 15:50:49 +0000 (15:50 +0000)]
Bug 28314: Spinning icon is not always going away for local covers in staff

The spinner is always visible with images which are under 80-90 px high

this patch remove the spinner when the image is loaded.

To test:
1. Make sure the LocalCoverImages system preference is enabled
   1.1. Go to Administration > Global system preferences
   1.2. Search for Coverimages
   1.3. Set LocalCoverImages to 'Show'
   1.4. Click 'Save all Enhanced content preferences'
2. Add a short local cover image to a record (I added one which is just a grey rectangle with the size printed on it, to facilitate the test)
   2.1. Download the attached image
   2.2. Find a record without an image
   2.3. Click the 'Images' tab
   2.4. Click 'Upload'
   2.5. Click 'Drop files here or click to select a file' and choose the downloaded image
   2.6. Click 'Process images'
   2.7. Click on the title of the record in the page heading to access the detailed record
   --> Note that the image is displayed normally, but the spinner is also displayed
4. Apply the patch
5. Search for the previous record with the small image
6. Click on the title of the record in the page heading to access the detailed record
   --> Note that the spinner is no more displayed

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a20dec603be52bc0c3a981445f9360b1c0c08e2d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit ba9c3cfd6b49ace550fd8499cf157e758c8c3abd)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32672: Incorrect CSS path to jquery-ui
Owen Leonard [Wed, 18 Jan 2023 15:41:51 +0000 (15:41 +0000)]
Bug 32672: Incorrect CSS path to jquery-ui

This patch removes links to jQueryUI assets which are not required in
the self-checkout and self-checkin pages.

The patch also adds missing JS to the self-checkin page related to
internationalization. This prevents a JS error related to an undefined
function, "__".

To test, apply the patch and view the main pages in self-checkout and
self-checkin, and the help page in self checkout. There should be no
errors in the browser console related to missing files.

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 410b9ee35f29d9065425036dfd8099ba28911170)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit c638ce42a59cc575c78eb2e77baffaadbcede3ec)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32537: (QA follow-up): Tidy code
Kyle Hall [Tue, 3 Jan 2023 13:14:50 +0000 (08:14 -0500)]
Bug 32537: (QA follow-up): Tidy code

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32537: (QA follow-up) Don't allow invalid no block values
Kyle Hall [Tue, 3 Jan 2023 13:12:08 +0000 (08:12 -0500)]
Bug 32537: (QA follow-up) Don't allow invalid no block values

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32537: Add no-block option to SIP cli emulator
Nick Clemens [Tue, 27 Dec 2022 20:21:15 +0000 (20:21 +0000)]
Bug 32537: Add no-block option to SIP cli emulator

This patch adds the option to pass a no-block option and use this
in checkout/checkin/renew messages

To test:
1 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831
2 - Confirm out like:
    SEND: 09N20221227    20183920221227    201839APCPL|AOCPL|AB39999000010831|ACterm1|BIN|
    (Note the N after 09)
3 - Apply patch
4 - Restart SIP, repeat 1
5 - Confirm still an N
6 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831 -n N
7 - Confirm still an N
8 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831 -n Y
9 - Confirm the send has a Y after 09

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 0880d809492f4011ef4cfac32129df4a2dd1fa71)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 61c4d9d37454cab2240cc1c43f811045e492a2ec)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32797: Check if fields have a value, not if true
Nick Clemens [Thu, 2 Feb 2023 14:57:14 +0000 (14:57 +0000)]
Bug 32797: Check if fields have a value, not if true

When saving OAI set mappgins we are checking for truth, this prevents
saving subfield 0. We should check for content

To test:
1 - Go to Admin->OAI sets
2 - Create a set
3 - Define mappings for the set
4 - Attempt to save a rule on field 952 subfield 0 (withdrawn)
5 - It does not save
6 - Apply patch
7 - Try again
8 - Success!

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 6f606e00c597cfdfb30fe969b061a331c8a372db)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 677e68c7f1c3456b4a4bbb0e4141a797b99e676b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Add POD and fix typo
Tomas Cohen Arazi [Tue, 7 Feb 2023 18:19:47 +0000 (15:19 -0300)]
Bug 32612: (QA follow-up) Add POD and fix typo

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Add BINMODE method to C4::SIP::Trapper
Kyle Hall [Tue, 7 Feb 2023 11:49:28 +0000 (06:49 -0500)]
Bug 32612: (QA follow-up) Add BINMODE method to C4::SIP::Trapper

The module Log::Log4perl::Appender::Screen is attempting to change
binmode during unit tests for SIPServer and is failing because of
our tie in SIPServer.pm for reasons unknown.

This patch implements the perltie method TIEHANDLE which allows the
binmode to be handled in the C4::SIP::Trapper package.

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Add missing interface for Logger
Marcel de Rooy [Fri, 3 Feb 2023 09:45:03 +0000 (09:45 +0000)]
Bug 32612: (QA follow-up) Add missing interface for Logger

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Remove worker.log
Marcel de Rooy [Fri, 3 Feb 2023 09:41:11 +0000 (09:41 +0000)]
Bug 32612: (QA follow-up) Remove worker.log

It is not used; overruled by daemon's --output option.

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Remove more unneeded appender lines
Marcel de Rooy [Fri, 3 Feb 2023 08:14:06 +0000 (08:14 +0000)]
Bug 32612: (QA follow-up) Remove more unneeded appender lines

To be more consistent ;)

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Update package files
Kyle Hall [Thu, 2 Feb 2023 11:53:53 +0000 (06:53 -0500)]
Bug 32612: (QA follow-up) Update package files

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 cb1da500ec1d409c836b66e0a0a1836c2d56b1fe)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit a538cfea5b8614a58c58e0dd219a4001a400e24d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: (QA follow-up) Remove superfluous line
Kyle Hall [Wed, 1 Feb 2023 17:37:44 +0000 (12:37 -0500)]
Bug 32612: (QA follow-up) Remove superfluous line

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
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 09e0f8e30db2b99556d32cbf0276fbe4e117ebab)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 9b25eb0ed31320f0f03875442cadb43a703e2b77)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32612: Add worker-error to log4perl conf
Nick Clemens [Wed, 11 Jan 2023 18:46:11 +0000 (18:46 +0000)]
Bug 32612: Add worker-error to log4perl conf

To test:
1 - Apply patch
2 - vim /etc/koha/sites/kohadev/log4perl.conf, Add lines below:
log4perl.logger.worker = WARN, WORKER
log4perl.appender.WORKER=Log::Log4perl::Appender::Screen
log4perl.appender.WORKER.stderr=1
log4perl.appender.WORKER.mode=append
log4perl.appender.WORKER.layout=PatternLayout
log4perl.appender.WORKER.layout.ConversionPattern=[%d] [%p] %m %l%n
log4perl.appender.WORKER.utf8=1
3 - Restart all
4 - Edit misc/background_jobs_worker.pl
-        my $job = Koha::BackgroundJobs->find($args->{job_id});
+        my $job;# = Koha::BackgroundJobs->find($args->{job_id});
5 - In another terminal: tail -f /var/log/koha/kohadev/koha-worker-error.log
6 - Force enqueue a job (that won't be found because of #4
  perl -e 'use Koha::BackgroundJob::BatchUpdateItem; my $bg = Koha::BackgroundJob::BatchUpdateItem->new(); $bg->enqueue({ record_ids=>['888888']});'
7 - Note error in log like:
  [2023/01/11 19:26:10] [WARN] No job found for id=2983 main:: /kohadevbox/koha/misc/background_jobs_worker.pl (111)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
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 3b1f2c57eaed978845eef3824c7311da06099bc5)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 872d03963e09633c50dabf3ac3be92bdb9cab391)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32741: Fix {biblios|authorities}/bib1.att duplicate codes
Tomas Cohen Arazi [Fri, 27 Jan 2023 19:32:16 +0000 (16:32 -0300)]
Bug 32741: Fix {biblios|authorities}/bib1.att duplicate codes

This patch fixes a duplicate attribute code for Author-in-order in the
biblios definition.
The picked code matches what was already in ccl.properties.

Also Chronological-term for authorities gets fixed.

To test:
1. Apply the regression tests
2. Run:
  k$ prove xt/verify_bib1.att.t
=> FAIL: Some failiures
3. Apply this patch
4. Repeat 1
=> SUCCESS: Tests now pass!
5. Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
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 a4999a289563281c2b6956edb94fc6e1b20ad54e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit c59571cbf0ff3aa0aee4234c1672d8089d9045ed)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32741: Regression tests
Tomas Cohen Arazi [Fri, 27 Jan 2023 18:59:52 +0000 (15:59 -0300)]
Bug 32741: Regression tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
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 74513307292745add212d39d5564309188159dea)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit a37207a192cefeaeddf591fc76728c962f461e55)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32409: Fix cashup searching with non latin-1 chars
Tomas Cohen Arazi [Tue, 6 Dec 2022 14:02:20 +0000 (11:02 -0300)]
Bug 32409: Fix cashup searching with non latin-1 chars

This patch fixes a problem with the way queries are passed to the API so
cashups are searchable with non-laint1 chars.

To test:
1. Have two superlibrarian users, one with non-latin1 chars on the name
   (e.g. خمسة)
2. Setup a debit type that can be sold.
3. Use the POS module to have some activity, using both your regular
   user and the other one.
4. Go to the register you used, and choose 'Transaction history'
5. Perform a couple cashups with each user ('Record cashup').
6. Look at the 'Cashup history' table
=> SUCCESS: You see cashups for both users
7. Use the 'Search' filter with latin chars
=> SUCCESS: Your user with only latin1 chars is displayed on the table
8. Repeat, using some non-latin1 char found on the other user
=> FAIL: Table is not refreshed or filtered!
9. Apply this patch
10. Reload the page
11. Repeat 8
=> SUCCESS: Filtering works now!
12. Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
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 96cba5503c896b01bb4eb7eab326d2fa8c4b96dc)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 270170cd0e37ed016bec0ba845ce887f1b2414d0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32406: Switch acq datatable from headers to query param
David Cook [Mon, 5 Dec 2022 22:50:23 +0000 (22:50 +0000)]
Bug 32406: Switch acq datatable from headers to query param

This patch changes the pending orders datatable from using the
x-koha-query header to the "q" query parameter, so that it is
able to support UTF-8 encoded scripts rather than just Latin-1
scripts.

Test plan:

1. Apply patch
2. Go to
http://localhost:8081/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=29
3. Change title from "Gairm" to "五" (alternatively use "cœur" or Arabic title)
4. Create a basket containing multiple records including bib 29 五
5. Close the basket
6. Receive shipment
7. You should be on a page like the following:
http://localhost:8081/cgi-bin/koha/acqui/parcel.pl?invoiceid=3
8. In the search box, type in 五
9. Note that you see a "Processing..." box and then the
results are filtered to just show the order for 五

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
tcohen amend: removed the line instead as we are probably phasing out
that DT configuration option anyway.

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32377: Set param skiptotals on call of GetBudgetHierarchy in acqui/histsearch.pl
Emmi Takkinen [Wed, 30 Nov 2022 10:33:19 +0000 (12:33 +0200)]
Bug 32377: Set param skiptotals on call of GetBudgetHierarchy in acqui/histsearch.pl

Calling GetBudgetHierarchy from acqui/histsearch.pl
is slow if param skiptotals is not used.

To test:
1. Open browsers Console -> Network (F12).
2. Navigate to Order search page and perform search.
=> Take a note how long it takes to load the Search results page.
3. Apply this patch.
4. Repeat step 2.
=> Page should now load faster.

Sponsored-by: Koha-Suomi Oy
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0f5daaa553bc63bd2c08212ee8db3d56c52781e9)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 6b5cf15102235daa38a1f5a70e6ee7bea306abe5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32688: Convert recalls awaiting pickup tabs to Bootstrap
Owen Leonard [Fri, 20 Jan 2023 11:56:55 +0000 (11:56 +0000)]
Bug 32688: Convert recalls awaiting pickup tabs to Bootstrap

This patch updates the recalls awaiting pickup template
(recalls_waiting.tt) to replace a set of jQueryUI tabs. They are
converted to Bootstrap in order to complete Bug 29226.

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

- Go to Circulation -> Recalls awaiting pickup.
- You should see two tabs, "Recalls waiting" and "Recalls waiting over X
  days."
- The tabs should look correct and work correctly.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4877666fb5fed6fcab03063603a4d00cdbb7d1e0)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 8d8f40ddddc8e2d899c557e35ffd6df338446b76)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 26628: Fix access to clubs when user only has clubs permission
Katrin Fischer [Thu, 26 Jan 2023 21:46:51 +0000 (21:46 +0000)]
Bug 26628: Fix access to clubs when user only has clubs permission

If a user only has the clubs and no permission from the tools section,
they can't access the patron clubs page by navigation. This patch
extends the permission checks for tools to include the clubs, that
live on the tools page, but have a top level permission.

To test:
- create a patron with only the catalogue and clubs permissions
- log in to the staff client as that patron
- navigate to a patron record, confirm you can see the Clubs tab in the patron account, can add patrons to and remove patrons from clubs
- confirm you don't have a link to the Tools module either on the Koha homepage or in the More menu
- enter the clubs URL manually (/cgi-bin/koha/clubs/clubs.pl), confirm you are allowed to open the page
- Apply patch
- The only changes should be:
  - You can now see the Tools entry in the More navigation menu
  - You can now see the Tools module link on the start page
  - Both take you to the tools page, only visible tools is 'Patron clubs'

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 50927bb9b530f7a9c092dfe99bd2dddc69202432)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit ecdd1d2b420f646279c69f61be30e46a33e8739e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 19188: Use the Price template plugin with_symbol => 1
Jonathan Druart [Thu, 1 Feb 2018 17:32:54 +0000 (14:32 -0300)]
Bug 19188: Use the Price template plugin with_symbol => 1

To make it displayed correctly depending on the configuration of the
currency

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
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 c6366c6d6869be719e48e73b40827efd574a13c6)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit ae4e269b7b12975d7e0d5504d0b2b504fa41a4ce)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 19188: Self checkout missing currency symbol
Jenny Way [Tue, 16 Jan 2018 22:05:39 +0000 (22:05 +0000)]
Bug 19188: Self checkout missing currency symbol

Test plan:
1. Under administration and system preferences, enable WebBasedSelfCheck
2. In OPAC give user fine by going to 'my account' at top right
3. Then under fines tab 'create manual invoice'
4. Make sure this amount is more than noissuescharge which can be
   changed under system preferences
5. Go to the web based self check from the OPAC URL
6. Log in as your user
7. Try to check out an item
7. Error 'Item cannot be checked out' should occur
8. With the patch, the currency symbol should show for the amount.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
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 5eab08cc2edd897f9afdfeb46caf5e409476946f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 13f7ee3e938b41f66d3d057001660c347b3dc08c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32570: Display patron.state correctly
Lucas Gass [Wed, 4 Jan 2023 23:03:42 +0000 (23:03 +0000)]
Bug 32570: Display patron.state correctly

To test:
1. Have a patron with both a city and state in their Main address.
2. Do a patron search that will return that patron among others.
3. Notice the patroncity will say something like Centerville, Centerville: repeating the city but no state.
4. Apply patch
5. Try step 2 again, this time the city, state should display correctly.

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 5acc976dec573ddd679219a0e920871a10622ac3)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 74957821f951ec15b67e4707d562261724145805)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32644: Terminology: staff/intranet and biblio in plugins-home page
Caroline Cyr La Rose [Mon, 16 Jan 2023 20:06:19 +0000 (15:06 -0500)]
Bug 32644: Terminology: staff/intranet and biblio in plugins-home page

This patch replaces some incorrect terminology in the plugins-home page.
The current terminology is available at https://wiki.koha-community.org/wiki/Terminology

To test:
0. Make sure you have no enhanced content plugins installed
1. Apply patch
2. Go to Administration > Manage plugins
3. Click 'View plugins by class'
   --> Notice that one of the options is 'View bibliographic record enhancement
   plugins for the staff interface'
4. Make sure this phrase is gramatically correct, makes sense and has no
   typos
5. Click on that option
   --> Notice that the message says 'No plugins that can enhance the bibliographic
   records in the staff interface are installed'
6. Make sure this phrase is gramatically correct, makes sense and has no
   typos

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0fe829e5b2a67a8af2b026af02dcb23ec55af195)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 807b3f669544fc380e8f4e4c868146a133c9d156)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoUpdate debian/control file: 22.05.09 on deb9 (cb5f3095)
Mason James [Fri, 27 Jan 2023 02:14:31 +0000 (15:14 +1300)]
Update debian/control file: 22.05.09 on deb9 (cb5f3095)

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoUpdate debian/changelog file: 22.05.09
Mason James [Fri, 27 Jan 2023 02:14:33 +0000 (15:14 +1300)]
Update debian/changelog file: 22.05.09

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoRevert "Bug 29021: RenewAccruingItemWhenPaid renewals are not seen"
Lucas Gass [Thu, 2 Feb 2023 16:54:29 +0000 (16:54 +0000)]
Revert "Bug 29021: RenewAccruingItemWhenPaid renewals are not seen"

This reverts commit 055270f9f930403c38ec8a2d3450f854ae3d9b5a.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoRevert "Bug 29021: (QA follow-up) Fix for new parameter, add unit test"
Lucas Gass [Thu, 2 Feb 2023 16:54:12 +0000 (16:54 +0000)]
Revert "Bug 29021: (QA follow-up) Fix for new parameter, add unit test"

This reverts commit 26cc76369ef5a14a5bfaf4ffabeb72f036f8e0a0.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoRevert "Bug 29021: (QA follow-up) Remove useless warnings"
Lucas Gass [Thu, 2 Feb 2023 16:53:58 +0000 (16:53 +0000)]
Revert "Bug 29021: (QA follow-up) Remove useless warnings"

This reverts commit fa82da9b574707382c3187487785c7b42b45f515.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32694: (QA follow-up) Fix missing TT filters
Katrin Fischer [Fri, 27 Jan 2023 13:17:42 +0000 (13:17 +0000)]
Bug 32694: (QA follow-up) Fix missing TT filters

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b2c1c0efe12856b99a2ab76bc84468f409235cf8)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 851739b52ab41490dea36eea24f6730f296a342e)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32694: Fix value of 'Keep current' option in receiving
Nick Clemens [Fri, 20 Jan 2023 20:18:27 +0000 (20:18 +0000)]
Bug 32694: Fix value of 'Keep current' option in receiving

This patch restores missing template toolkit markers around the variable

To test:
1 - Order an item in a basket
2 - Close the basket
3 - Attempt to receive the item, leaving budget as 'Keep current'
4 - 500 Error:
C4::Acquisition::ModReceiveOrder(): DBI Exception: DBD::mysql::st execute failed: Cannot add or update a child row: a foreign key constraint fails (koha_cclsny.aqorders, CONSTRAINT aqorders_budget_id_fk FOREIGN KEY (budget_id) REFERENCES aqbudgets (budget_id) ON DELETE CASCADE ON UPDATE CASCADE) at /usr/share/koha/intranet/cgi-bin/acqui/finishreceive.pl line 120
5 - Apply patch
6 - Receive order successfully!

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 9531a82e97661ce7013a8e9a64b8d5c4d2fa3635)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 6f0bbc2afc4a592dc3d1cefb73b24a6cac4ea8ae)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29021: (QA follow-up) Remove useless warnings
Tomas Cohen Arazi [Mon, 30 Jan 2023 15:01:41 +0000 (12:01 -0300)]
Bug 29021: (QA follow-up) Remove useless warnings

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29021: (QA follow-up) Fix for new parameter, add unit test
Kyle Hall [Fri, 27 Jan 2023 16:58:45 +0000 (11:58 -0500)]
Bug 29021: (QA follow-up) Fix for new parameter, add unit test

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 29021: RenewAccruingItemWhenPaid renewals are not seen
Martin Renvoize [Wed, 11 May 2022 14:47:58 +0000 (15:47 +0100)]
Bug 29021: RenewAccruingItemWhenPaid renewals are not seen

This patch updates the call to AddRewewal from Koha::Accounts to makr
the renewal as unseen.

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 5b87d7a473328cfcf772b7faa31871be068d2a05)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
(cherry picked from commit 2c9ad0a59bfbcc41a1d5bd7b473e0bb6cc375008)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 18247: Remove SQL queries from branch_transfer_limit.pl
Alex Buckley [Mon, 8 Aug 2022 23:59:20 +0000 (23:59 +0000)]
Bug 18247: Remove SQL queries from branch_transfer_limit.pl

1. Visit Administration > Patrons and circulation > Limit transfer limits

2. Observe collection codes are displayed as tabs on the Limit transfer
limits page when the BranchTransferLimitsType syspref = 'Collection
code'

3. Switch the BranchTransferLimitsType syspref = 'item type'. Refresh
the Limit transfer limits page and observe the tabs have changed to item
type codes

4. Apply patchset and restart services

5. Reload the Limit transfer limits page and confirm it displays
correctly with the  BranchTransferLimitsType = 'collection code' and
'item type'

6. Confirm you can successfully save transfer policies

Sponsored-by: Catalyst IT
Signed-off-by: Jacob Omara <jacob.omara@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 5e863f93c06e1e67ddbf0c705657ca7d024006f6)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit b57ce0e15b6cae5933c3836697be9ec5a607f14d)

20 months agoBug 32416: Add a warning to the file
Nick Clemens [Wed, 7 Dec 2022 13:02:33 +0000 (13:02 +0000)]
Bug 32416: Add a warning to the file

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 e88f31d8a28566cef2275c3d9e62f3432b1f54f2)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit ab0a00dcb90f07b6b115a76b916553eeabb9ee71)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32416: Update attribute number for arp search to 9015
Nick Clemens [Wed, 7 Dec 2022 12:56:02 +0000 (12:56 +0000)]
Bug 32416: Update attribute number for arp search to 9015

Bug 20078 updated the attribute for arp to 2014 to avoid conflict with 9013 not-on-loan-count

Bug 28830 then added Control-number-identifier as 2014, breaking arp again

This patch updates the number to 9015

To test:
1 - Apply first patch
2 - Attempt searching by arp, no results (add a unique 526$d to a record to ease searching)
3 - Apply this patch
4 - Copy bib1.att and ccl.properties to the correct locations
    cp etc/zebradb/biblios/etc/bib1.att /etc/koha/zebradb/biblios/etc/bib1.att
    cp etc/zebradb/ccl.properties /etc/koha/zebradb/ccl.properties
5 - Restart zebra
6 - Rebuild indexes
7 - Search again, success!

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 e6efa820993c0b04fd848caf84658620b7ef337d)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 54f0873019d9e0f1db9d750a19ae25e52396aeb0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32393: (QA follow-up) Add explicit undef response in two catch blocks
Marcel de Rooy [Tue, 24 Jan 2023 13:38:41 +0000 (13:38 +0000)]
Bug 32393: (QA follow-up) Add explicit undef response in two catch blocks

Do not implicitly depend on last statement returning nothing.
Make it explicit. We want $args to be null here.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 08cc23626c30a61254eddd552f6b23253876d753)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 223583d3b59295259d48417fb00e9b4c4e86294d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32393: Deal with the DB fallback part
Jonathan Druart [Tue, 24 Jan 2023 08:11:25 +0000 (09:11 +0100)]
Bug 32393: Deal with the DB fallback part

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 85c330d8f2ca6246cf3619c8075907cce8387be0)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 54e87225eac2c70aa6487b6f614bddc3083a774b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32393: Split into 2 try catch blocks
Jonathan Druart [Wed, 11 Jan 2023 11:36:42 +0000 (12:36 +0100)]
Bug 32393: Split into 2 try catch blocks

Signed-off-by: Nick Clemens <nick@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 8df96262c145fc0ee26c019601b6a86de9396915)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 5fc37e57062fb16bd65e682bbca853151382834b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32393: Prevent invalid job to block the job queue
Jonathan Druart [Fri, 2 Dec 2022 13:23:38 +0000 (14:23 +0100)]
Bug 32393: Prevent invalid job to block the job queue

I have faced a problem when testing an incorrect version of bug 32370.
The frame sent to the message broker was not a correct JSON encoded
string, and its decoding was obviously failing, exploding the worker
script.
Additionally, as we don't send a ack for this frame, the next pull will
result in processing the same message, and so in the same explosion.
No more messages can be processed!

This patch is logging the error and ack the message to the broker, in
order to not get stuck.

Test plan:
0. Dont' apply this patch
1. Enqueue a bad message
  a. Apply 32370
  b. Comment the following line in Koha::BackgroundJob::enqueue
    $self->set_encoded_json_field( { data => $job_args,    field => 'data' } );
  c. restart_all
  d. Use the batch item modification tool to enqueue a new job
=> Notice the error in the log
=> Note that the status of the job is "new"
=> Inspect rabbitmq queue:
% rabbitmq-plugins enable rabbitmq_management
% rabbitmqadmin get queue=koha_kohadev-long_tasks
You will notice there is a message in the "long_tasks" queue
2. Enqueue a good message
  a. Remove the change from 1.b
  b. restart_all
  c. Enqueue another job
=> Same error in the log
=> Both jobs are new
=> Inspect rabbitmq, there are 2 messages
3. Apply this patch
4. restart_all
=> Second (good) job is finished
=> rabbitmq long_tasks queue is empty

We cannot mark the first job as done, we have no idea which job it was!

QA: Note that this patch is dealing with another problem, not tested in
this test plan. If an exception is not correctly caught by the ->process
method of the job, we won't crash the worker. The job will be marked as
failed.

Signed-off-by: Nick Clemens <nick@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 ca9a5981839a444fce109540035f26cac2780611)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32394: [22.05.x] Add tests
Jonathan Druart [Wed, 14 Dec 2022 08:01:33 +0000 (09:01 +0100)]
Bug 32394: [22.05.x] Add tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32394: [22.05.x] Restore long tasks queue
Jonathan Druart [Fri, 2 Dec 2022 13:43:27 +0000 (14:43 +0100)]
Bug 32394: [22.05.x] Restore long tasks queue

We are sending "queue" as parameter, but "job_queue" is retrieved in
Koha::BackgroundJob->enqueue...

Test plan:
Read code and confirm the above.
More fun for test plan will be found on bug 32393

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>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32394: [22.05.x] Regression tests
Tomas Cohen Arazi [Wed, 14 Dec 2022 17:30:18 +0000 (14:30 -0300)]
Bug 32394: [22.05.x] Regression tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32561: Prevent worker to run with unecessary modules in memory
Jonathan Druart [Wed, 4 Jan 2023 09:08:06 +0000 (10:08 +0100)]
Bug 32561: Prevent worker to run with unecessary modules in memory

Regression of bug 28413, bug 30410 added a "use Koha::Plugins" statement at the top of Koha::BackgroundJob, and so all Koha module are loaded by the worker on startup.

See bug 28413 for more info

Signed-off-by: Kyle M Hall <kyle@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 a85a6bc4d4a1c15a065dc8b188d6de0c23f99271)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 16ecdc2f8edfcdc77214751caa049e46b237184c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32321: Pre-populate material type for 006 in advanced cataloging editor
Nick Clemens [Tue, 22 Nov 2022 14:05:08 +0000 (14:05 +0000)]
Bug 32321: Pre-populate material type for 006 in advanced cataloging editor

To test"
1 - Edit a record in advanced cataloging editor with field helpers enabled
2 - Choose a material type, not BKS, from dropdown
3 - Set the first position to something
4 - Save the record
5 - 006 shows 'BKS'
6 - Apply patch
7 - Reload
8 - Record should show correct value
9 - Edit 006 and confirm the first position correctly determines material type

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.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 7818717f3c69bcaf5953d6139f6a104dfb1c4ee7)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 8a28f6e2595997604e11355b49bffb5b90979113)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32692: Terminology - use staff interface for MARC framework subfield editor
David Nind [Fri, 20 Jan 2023 18:42:01 +0000 (18:42 +0000)]
Bug 32692: Terminology - use staff interface for MARC framework subfield editor

For the visibility options in the advanced constraints section of the
MARC framework subfield editor, use 'Staff interface' instead
of 'Intranet'.

This makes it consistent with the terminology list (see
https://wiki.koha-community.org/wiki/Terminology#I).

Test plan:
1. Go to Administration > Catalog > MARC bibliographic framework.
2. Select Actions > MARC structure for any framework.
3. For any tag select Actions > Edit subfields.
4. Note that in the advanced constraints section for the visibility
   field that 'Intranet' is used as an option.
5. Apply the patch.
6. Refresh the page and note that 'Staff interface' is now used, which
   is consistent with the terminology list (see
   https://wiki.koha-community.org/wiki/Terminology#I).
7. Sign off D:

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Amaury GAU <amaury.gau@bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ab48b53d96bd33a37181b13bbb517500eae61fc2)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 2dbd065065feff6a3d59c84c2f1cd742f31a3da3)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32573: Send ACK message to RabbitMQ before handling the job
Kyle Hall [Thu, 5 Jan 2023 16:35:42 +0000 (11:35 -0500)]
Bug 32573: Send ACK message to RabbitMQ before handling the job

Splitting off this functionality from bug 32558. This is the comment that started this discussion: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32558#c15

From the O'Reilly book Mobile and Web Messaging:

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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 31893: Use checkauth and do not fetch about.tt template
Nick Clemens [Fri, 13 Jan 2023 17:29:22 +0000 (17:29 +0000)]
Bug 31893: Use checkauth and do not fetch about.tt template

This patch updates four scripts to use checkauth instead of get_template_and_user

reserve/modrequest.pl
reserve/modrequest_suspendall.pl
course_reserves/mod_course.pl
members/members-update-do.pl

No behvaiour change is expected

To test:
0 - Apply patch
1 - Place some holds for a patron
2 - From patron page, confirm you can suspend all
3 - confirm you can delete marked holds
4 - Edit a course in course-reserves
5 - Make a chaneg to personal details via OPAC
6 - Confirm change can be approved on staff side

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit fc650b3e871e1d558ca1ff9f0dcb2f1fa0ad5db2)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit c1a5442a2286afbcd1bb6a429adab6f5a009ca07)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32221: Borrowers.password should no longer be an option
Matt Blenkinsop [Mon, 28 Nov 2022 14:35:37 +0000 (14:35 +0000)]
Bug 32221: Borrowers.password should no longer be an option

When creating a notice template the user has the option to add the borrower's
password to the template. This should be removed as the password should not be
an option to be added to a notice.

Test plan:
1) Navigate to Tools > Notices and slips
2) Either create a new notice or edit an existing notice
3) Observe that in the list of fields available to insert into the message body,
   there is the option for "borrowers.password"
4) Apply patch
5) Navigate to the same menu
6) Observe that the "borrowers.password" option is now no longer visible

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9608b16a6ba9d877dddc75beb1e1eef691f7b21a)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 7a143c19ad570adf8ab6cdf6f65a5456f7357ad3)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
20 months agoBug 32656: Script delete_records_via_leader.pl no longer deletes items
Kyle Hall [Tue, 17 Jan 2023 17:18:00 +0000 (12:18 -0500)]
Bug 32656: Script delete_records_via_leader.pl no longer deletes items

Bug 29788 inadvertantly replaced a call to safe_delete() with safe_to_delete()
such that any time the script should delete an item it only checks to see if
the item is delectable, after which deletion of the record fails because the
items were not deleted.

Test Plan:
1) Mark a record with items to be deleted via the record leader
2) Run delete_records_via_leader.pl -i -b -v
3) Note the script says it is deleting the items but then the record
   deletion fails. Note the items remain in the items table of the
   database.
4) Apply this patch
5) Repeat step 2
6) This time the items and record should be deleted!

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 790f00781ab6c98017529ebf226d52c36c36cd68)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit 03a9b139587aea26a9abde4f45a7c4f99532353c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>