Commit graph

52204 commits

Author SHA1 Message Date
f6665e3959 Bug 34853: Add clearfix span to Invoice links
This patch adds a clearfix span around the invoicenumber and EDI message
display texts which should result in them each having their own line.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 939ad01baf)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 16:04:59 +01:00
lmstrand
e819b09254 Bug 35396: Replace Datatables' column filters throttling with input timeout
This patch replaces throttling filter events with a typing timeout for datatable filtering events. This patch should increase filtering responsiveness to datatables that have column filtering enabled across Koha.

To test:
1) Get a datatable with multiple results showing in intranet, for example search patrons with no search string to get all patrons in a filterable datatable result view or open Receive orders page that shows pending orders and order lines in Acquisitions like /cgi-bin/koha/acqui/parcel.pl?invoiceid=xxx
2) Type a character into a Datatable column filtering field
=> notice a filtering event fires right after the first character has been entered
3) Keep typing
=> notice multiple sequential filtering events being fired during the typing and one at the end when typing has stopped
4) Apply patch
5) Start typing into a filtering field
=> Note that during typing no filtering events are being fired unless the time between entering characters exceeds 500ms
6) End typing into the filter field
=> notice that just one filtering event fires at the end of typing if characters were entered sequentially faster than 500ms apart.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 4509614561)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 16:00:29 +01:00
d4c38a3776 Bug 35445: Require OPAC user to confirm self-registration with button push
This change requires the OPAC user to confirm self-registration with
a button push when verifying registration using an emailed token.

Test plan:
0. Apply the patch and koha-plack --reload kohadev
1. Set syspref PatronSelfRegistrationVerifyByEmail to "Don't require"
2. Create a patron using the self-registration on the OPAC
3. Note that no confirmation step is needed when self-registering
4. Set syspref PatronSelfRegistrationVerifyByEmail to "Require"
5. Create a patron using the self-registration on the OPAC
6. Look in message_queue to find the URL with the token to
visit in the browser
7. Visit that URL
8. Note that the page says "Registration pending" and asks you to
click a button labeled "Confirm"
9. Click the button labeled "Confirm"
10. Note that the self-registration is confirmed and details are
shown on the page

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit c67067744c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:54:02 +01:00
Thibaud Guillot
517e50fdf1 Bug 35514: Fix total cost update when adding multiple items to order
Test plan:

1) Create a basket and add an order line to go on neworderempty.pl
   (the new order form)
2) Choose to add one item and repeat the operation
3) See on form that the total cost is updated without update vendor
   price
4) Now add multiple items, for example, "2" you will see that the total
   cost is not updated
5) Apply this patch, refresh form and repeat steps 3 to 5

Signed-off-by: Michał Dudzik <dudzikmichal@wp.pl>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 45c4b936f5)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:52:55 +01:00
1982d207b4 Bug 35530: Tell UserCSS and UserJS in libraries administration are for OPAC
In libraries administration new fields UserCSS and UserJS are for OPAC,
this should be in label.

This patch uses text "Specific OPAC CSS", since the system preference OPACUserCSS as help :
Library specific CSS can be defined in ...

Test plan
1) Go to Administration >  Libraries
2) Modify a library
3) Check you see new labels

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 28510d473f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:52:07 +01:00
1aa52c755e Bug 35578: Simplify the code using intersect
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 602521a80a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:50:38 +01:00
f234d67ca6 Bug 35578: Validate "Where" in OPAC Authority search
This patch adds validation to the "Where" field in OPAC Authority search.

Test plan:
0. Apply the patch and koha-plack --reload kohadev
1. Go to http://localhost:8080/cgi-bin/koha/opac-authorities-home.pl
2. Type "test" into "Term(s)" field
3. Click "Submit"
4. Confirm a result is found

5. Repeat the above using "Where" values of "in the complete record",
"in any heading", and "in main entry"

6. Using the HTML inspector in the browser, change the value of
the selected option of the "marclist" select element to
"this is broken"
7. Click "Submit"
8. Confirm a result is found (ie it's not throwing a fatal error
anymore)

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 0ecb02eff9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:50:38 +01:00
d6ad2785de Bug 35742: Fix removal of added user from fund
On the fund edition page, if a new user is added the "Remove" link does
not remove the user.

Test plan:
0. Do not apply this patch
1. Edit a fund
2. Click "Add users"
3. Search for patron and add some users
   => Notice that the "Remove" link does not remove the user
4. Apply this patch and repat 1, 2, 3
   => Notice that the "Remove" link remove the user

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 7ef044cffd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:48:08 +01:00
d7d8bcecdf Bug 35743: Fix patron's category selection in the column filter
The "category" filter is not selected in the column filter dropdown.

Test plan:
0. Do not apply this patch
1. Search for patron, select a patron's category
   => Notice that the "Category" column has a column filter, but no
      option is selected
2. Apply the patch
3. Repeat 1
   => The "Category" column has the option you selected in the filter
      block.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 426324062d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:45:47 +01:00
56b675687f Bug 35745: Fix 'Set suggester' of a suggestion
On the suggestion edit form, if a suggester is selected using the "Set
to patron" (and patron search), the details of the selected patron will
contained "undefined" for the library's name and patron's category
description.

Test plan:
Edit a suggestion, click "Set to patron", select a patron
Notice that with this patch the library's name and patron category is
correctly displayed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f7171c0a6c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:42:46 +01:00
f9be00361c Bug 35744: Implement +strings for GET /patrons/:patron_id
In order to retrieve the library's name and patron category's
description alongwith other patron's info.

Test plan:
Run the following command before and after this patch:

% curl -u koha:koha --request GET 'http://localhost:8081/api/v1/patrons/42' --header "Content-Type: application/json" --header "x-koha-embed: +strings" | jq

Notice that you now have _strings which contains the library's name and
patron category's description

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 5464d11099)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:41:21 +01:00
4c38b7140a Bug 35800: Remove item.can.be.edited check
To test:
APPLY PATCH
1. Check out an item to a patron from library A
2. Give permissions to a patron from library B
   (example of a circulation staff account)
     - circulate
     - catalogue
     - borrowers ( including view_borrower_infos_from_any_libraries )
     - reserveforothers
     - updatecharges
     - suggestions
     - lists
     - clubs -> enroll
3. If necessary, change the username and password of that staff member in order to be able to log in
4. In a private browser window, log in as the staff member
5. View the record with the checked out item
6. You should see the name/cardnumber of the patron the item is checked out ot.
7. Turn off the view_borrower_infos_from_any_libraries for this patron.
8. Now on the record detail page you should see text like `Checked out to A patron from library Midway : due 01/28/2024`.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit e8c0438d87)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:36:46 +01:00
89db37bd91 Bug 35833: Silence few warnings from searching
Resolve:
[2024/01/18 11:31:24] [WARN] Use of uninitialized value $hits in numeric eq (==) at /usr/share/koha/opac/opac-search.pl line 612.
[2024/01/18 11:31:24] [WARN] Use of uninitialized value $times in subtraction (-) at /usr/share/koha/C4/Search.pm line 1715.

Test plan:
Look for a few search expressions without results.
Check log without and with patch.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit cb7921d8d0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:06:57 +01:00
5ab93391a3 Bug 35833: Fix warnings from C4/Koha
[2024/01/18 11:52:40] [WARN] Argument " " isn't numeric in numeric eq (==) at /usr/share/koha/C4/Koha.pm line 600.
[2024/01/18 11:52:40] [WARN] Argument " " isn't numeric in numeric eq (==) at /usr/share/koha/C4/Koha.pm line 659.

Note: According to the code in MARC::Field the indicator returned cannot be undef. So we do not return new
uninitialized warnings.

Test plan:
Check your log before and after patch.
Possibly you may need to create a record with spaces as field indicators.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 857d8f4d82)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:06:57 +01:00
Katrin Fischer
c3134a26f9 Bug 33464: Add page-section to "Orders by fund" result list
This updates the results table for the "Orders by fund"
report with the common white background.

To test:
* Go to Reports > Orders by fund
* Search for orders (you might have to add one)
* Verify the results table is missing the common
  white background
* Appyl patch
* Reload page and verify styling is improved

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 806ef1899e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:06:15 +01:00
Katrin Fischer
af47caffd3 Bug 34298: Add page-section to duplicated orders list
When creating an order from an existing order (copy),
on the third page, the page section was  missing on the
table.

To test:
* Create a basket with an order, close the basket.
* Create a second basked
* Create a new order line using:
  "From existing orders (copy)"
* Search for your previous order and select it for copy - Next
* Select a fund - Duplicate orders
* Verify that the table with the order lines to create
  doesn't have the white background
* Apply patch
* Reload page - the table now should appear styled correctly

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 621cdbd2b8)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 15:05:28 +01:00
Katrin Fischer
f199236417 Bug 34872: Add page-section to cart pop-up in staff interface
This adds the page-section class to the tables in the cart pop-up
in the staff interface.

To test:
* Search for records in the staff interface and add some to the cart
* Open the cart, review the normal and brief view
* Apply patch
* Review normal and brief view again - tables/sections should now
  have the white background.

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@bsz-bw.de>
(cherry picked from commit 34749a20bd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:52:30 +01:00
af12db72f1 Bug 35350: Update label creator pop-up windows with consistent footer markup
This patch updates two label creator templates in order to style
submission and close buttons in a fixed footer at the bottom of the
window, with markup consistent with other pop-up windows.

To test, apply the patch and go to Cataloging -> Label creator.

- Click New -> Label batch.
- Click the "Add items" button under the form.
- A "Search for items" window should pop up.
  - The window's fixed footer should have the "Search" and "Close
    window" buttons. Test that each work correctly.
- Submit a search which will return results.
  - The search results window should also have a fixed footer. I moved
    the "Add checked" and "Done" buttons out of a floating toolbar and
    put the controls there for consistency's sake.
  - Confirm that both controls work correctly.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f1e9c6e959)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:51:29 +01:00
7071ea0188 Bug 35349: Reindent label item search template
This patch reindents the label item search 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 Cataloging -> Label creator.

- Click New -> Label batch.
- Click the "Add items" button under the form.
- A "Search for items" window should pop up.
- The form should look correct, and work as it did before the patch.

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

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit ee6fe93274)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:49:06 +01:00
Caroline Cyr La Rose
97cc3285bd Bug 35596: Error in writeoff_debts documentation
This patch corrects an error in the documentation of the
writeoff_debts.pl script. The --type parameter accepts debit type codes,
not credit type codes.

To test:
-  Run ./misc/cronjobs/writeoff_debts.pl
-  Make sure the sentence for --type makes sense, grammar and spelling
   are correct

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 633533049a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:48:07 +01:00
Katrin Fischer
1baddec5be Bug 35373: Remove false FIXME comment from gather_print_notices.pl
Removes a FIXME line mentioning bug 8000 that implemented
SendAllEmailsTo. But the note was added to the "From" line
and the "To" address is taken from a command line parameter.

To test:
* Review change carefully

Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 898d96adb9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:46:47 +01:00
Katrin Fischer
3d12b0aa69 Bug 35354: Update description of EmailLibrarianWhenHoldisPlaced system preference
This includes more information about the email addresses
used in the system preference description.

To test:
* Search for EmailLibrarianWhenHoldisPlaced in administration >
  system preferences
* Verify description
* Apply patch
* Verify improved description and that the links work as expected

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit a2a284c7f5)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:43:08 +01:00
63dec2431f Bug 35701: (follow-up) Fix last instance of t variable
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 976f5e7ce6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:22:33 +01:00
66bf6e5e0e Bug 35701: Do not use t
To not interfer with the t from I18N

On bug 35329 we are using the I18N TT plugin that is providing the 't'
subroutine.

This loop is redefining the subroutine, therefore it is not longer
accessible.

Test plan:
Edit a patron and confirm the the "Title" dropdown still contain the
different values of syspref BorrowersTitles.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 50904b219e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-02-01 14:22:33 +01:00
5c9c45c58c Bug 35795: Missing closing tag in OPAC course details template
This patch adds a missing closing tag, "</em>" to the breadcrumb
navigation shown when viewing the detail page of a course.

To test you must have at least one course created in the course reserves
module (Course reserves -> New course)

- Apply the patch and go to the OPAC.
- Open the Course reserves page and click the name of the course you
  created.
- The last item in the breadcrumb menu should be "Course reserves for
  [your course name]" and "you_course_name" should be in italics.
- The rest of the page should look correct.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit a7f914bf3b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 15:12:37 +01:00
5bdec49f14 Bug 35820: Fix table id on hold ratios page
This patch corrects the ID on the table showing holds on the holds
ratios page so that it matches the DataTables initialization and
configuration. I'm not aware of any bug with the functionality, but
consistency is good.

The patch also wraps the table in a "page-section" div, an update which
includes indentation changes.

To test, apply the patch and if necessary, place multiple holds on a
title so that the hold ratios page will display results.

- Go to Circulation -> Hold ratios.
- The table of hold ratios should look correct.
- Click the "Configure" button at the top of the table.
- On the table settings page, change the default visibility of some
  columns.
- Return to the hold ratios page to confirm that the correct columns are
  hidden by default.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 05cdc48fd6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 15:10:21 +01:00
Caroline Cyr La Rose
02e28179c8 Bug 35831: Move UpdateItemLocationOnCheckout to Checkout policy section
This patch moves the UpdateItemLocationOnCheckout system preference from
the Checkin policy section of the circulation preferences to the
Checkout policy section.

To test:
1. Apply patch
2. Go to Administration > System preferences > Circulation
3. Check that UpdateItemLocationOnCheckout is under Checkout policy

The text should be the same as before, and the feature should not have changed.

Signed-off-by: Aude <aude.charillon@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit fceafbc496)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 15:01:42 +01:00
473bc55a63 Bug 35835: Fix shebang in cataloguing/ysearch.pl
Speaks for itself.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f34a639c58)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 15:00:29 +01:00
33f709cf8e Bug 35407: Correct terminology: Show fewer collections
In the OPAC, the "Show more" and "Show less" links have aria-labels to
make their function clearer to screen readers. The collection and item
type controls need corrected terminology, and the links also need to
have their template filter corrected (html, not uri).

To test, apply the patch and perform a catalog search in the OPAC.

- Test that the "Show more" and "Show less" links in the facets sidebar
  work correctly to expand and collapse the lists of facets.
- It's not necessary to test with a screen reader. You can view the
  source to confirm the markup on the "Show more collections" and "Show
  more item types" links.

  Before:
  <a href="#" aria-label="%0A%20%20%20%20Show%20more%20collection%20codes%0A"><strong>Show more</strong></a>

  After:
  <a href="#" aria-label="Show more collections"><strong>Show more</strong></a>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 24845a8861)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:57:03 +01:00
Katrin Fischer
dffd6b4b53 Bug 35323: Fix hint for OpacMoreSearches HTML customization
There was some confusion on where this content appears.
This patch fixes the description shown as hint in the HTML
customizations tool when when the OpacMoreSearches entry is
selected.

To test:
* Before appyling the patch
* Add a new HTML customization for OpacMoreSearches
* Verif hint showing below the pull down
* Set a title and a publication date in the past
* Enter a short text, like "Koha" as content
* Save
* Go to the OPAC, verify text shows in the navigation
* Apply patch
* Verify hint is now correct

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit ec95c63d41)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:56:20 +01:00
17c3b15c2e Bug 33457: (follow-up) Simplify even further
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit cd18b2e6fc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:52:40 +01:00
26c27bd65d Bug 33457: (QA follow-up) Use js-patron-format instead
This patch updates the code to use the $patron_to_html js function
rather than replicating it locally.. this means if in the future we
introduce further fixes/improvements to the display they're affect here
too.

Test plan
1) As for the original implementation, confirm the fix is still fixed

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 4732d10809)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:52:40 +01:00
c5dc3cf3f4 Bug 33457: Improve display of fund users when the patron has no firstname
This patch updates the way the fund modification page handles patron
names so that a patron with only a first name or only a surname will
have their name appear correctly when selected as a manager or a user.

To test, apply the patch if necessary, create a patron with only a first
name and one with only a surname and give them acquisitions permissions.

- Go to Administration -> Funds.
- Edit a fund.
- Click 'Add users'.
- Select a user, only staff users will be searchable
- Select one of the patrons you created.
  - The patron name should appear correctly
  - Test with both your first name only patron and your last name only
    patron.
- Perform the same test with the 'Select owner' process.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 00ed806d20)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:52:40 +01:00
a50ab3e6dd Bug 35865: Add missing hint about permissions when adding managers to a basket
When searching for managers for an acquisition basket, the list of patrons is
limited to patrons with the baskets_managers permission. For other patron
searches there is a hint about the restriction but it does not appear here.

Test plan;
Edit a basket, click "Add user" to select a manager.
Notice the hint about the permission.

Signed-off-by: Loïc Vassaux--Artur <loic.vassaux-artur@outlook.fr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 8a478f912f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:51:31 +01:00
c7f3884cbe Bug 35841: Change wording to indicate request to cancel
1. APPLY PATCH
2. Update circ rules "Default waiting hold cancellation policy" to allow cancellation of holds.
3. Put some holds onto a patron account, Make some waiting holds and have others be any other status besides waiting.
4. Log in to the OPAC as that patron.
5. Go to your account details and look at the Holds tab.
6. You should see a 'Request to cancel' button for all waiting holds.
7. You should see a 'Cancel' button for all non-waiting holds.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit ffbbee6a76)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:50:26 +01:00
5809d746d4 Bug 35817: Fix hint on patron's category when batch update patron
When a patron's attribute is limited to a given patron's category, the
batch patron modification tool will display a hint "This attribute will
be only applied to the patron's category %s". But this is followed by
the description of the patron's attribute, not the patron's category.

Test plan:
Create a patron's attribute "Color of hair" and select a patron
category (Patron).
Batch edit batch and select "Color of hair"
A hint will be display.
=> Without this patch the hint is "This attribute will be only applied
   to the patron's category Color of hair"
=> With this patch it will be corrected to "This attribute will be only
   applied to the patron's category Patron"

Signed-off-by: Anneli Österman <anneli.osterman@koha-suomi.fi>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 074684eaf4)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:38:01 +01:00
5ab508d792 Bug 35695: Remove useless JS from cataloging_additem.js
To test:
1. APPLY PATCH
2. Turn on EnableItemGroups
3. Go to a record with item groups, or create some.
4. Add an item, making sure items can be added to a group. ( Bug 33639 must be applied )

If I am wrong and this code should stay, tell me. I'll fix the jQuery instead of removing it. :)

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit cbc97f5c68)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:28:30 +01:00
a51094a715 Bug 35461: Fix function call parameters causing the HASH to show in the renew all responses
"Renew All" -function aka. 65-66-messages work like this: 66-return messages has renewed items in BM-fields and non-renewables go into BN-fields.

If all items were renewable, then the reply message looks like:

Reply:
13.07.2022 10:06:17:530 OUTESTI1 6610005000020220713 100616AOOUPK|BM564N15977171|BM564N09203960|BM564N23261720|BM564N25161958|BM564N23455012|C4::SIP::SIPServer=HASHC4::SIP::SIPServer=HASHAY6AZCEFE

If items include renewables and non-renewables, the response includes the renewed  items first, then a HASH mixed into the first BN-field, then rest of the renewed ones like they should show in BN-fields and after that, anohter HASH:

13.07.2022 14:41:32:610 OUTESTI1 6610003000420220713 144130AOOUPK|BM564N23455012|BM564N23261720|BM564N25161958|C4::SIP::SIPServer=HASHBN564N09203960|BN564N04191259|BN564N15977171|BN564N13788332|C4::SIP::SIPServer=HASHAY8AZC7C5

If all loans were unrenewable (this test included just one item), you first get a HASH in a BN-field, and another at the end.

13.07.2022 14:49:00:037 OUTESTI1 6610000000120220713 144858AOOUPK|C4::SIP::SIPServer=HASHBN564N19874533|C4::SIP::SIPServer=HASHAY9AZDD3B

Our self checkout/checkin machine can handle/parse these reply messages correctly, but this might not be the case with all self checkout/checkin devices.

Test Plan:
1) Unit test patch
2) prove t/db_dependent/SIP/Message.t
3) Note failures
4) Apply this patch
5) prove t/db_dependent/SIP/Message.t
6) Tests pass!

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: lmstrand <lmstrand@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit bb7fc5025b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:27:39 +01:00
52d43922b8 Bug 35461: Add unit tests
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: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit e70e1f8a17)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:27:39 +01:00
e0d5c13cf1 Bug 35360: Make HTML/buttons consistent on waitingreserves.tt
To test:
0. Turn on hold cancellation requests in Administration -> Circulation rules.
1. Have some holds that are waiting, waiting over expiration date, and cancelled waiting holds. In order to create holds waiting over expiration date, if you are in ktd, you can use SQL to update the expirationdate in reserves: UPDATE reserves SET expirationdate="2022-01-01" WHERE reserve_id=1; (make sure it's the correct reserve_id!)
1a. If you are not using ktd, you will need to set ReservesMaxPickUpDelay to 0 days, then return the reserved item and then wait one day before it will be marked as over expiration date.
1b. In order to create cancelled waiting holds, you will need to send a cancel request over the OPAC, that is, reserve something after logging in to the OPAC, return it in the staff interface, and then go to the OPAC -> Your Account -> Holds -> click Cancel on the waiting hold.
2. Notice the differences between the 3 tables and their related buttons:
-Holds waiting
-Holds waiting past their expiration date
-Holds with cancellation requests

-Holds waiting includes a 'Canceled selected' button at the top of the table. It is with in a #toolbar.

-Holds waiting past their expiration date includes a 'Cancel selected' and a 'Cancel all' button. None are within a #toolbar. The 'Cancel selected' here lacks a Bootstrap .btn class. The 'Cancel all' button does have a .btn class.

-Holds with cancellation requests has neither a 'Cancel selected' or a 'Cancel all' button.

3. APPLY PATCH
4. Look again and the tables/buttons should be more consistent.
5. The 'Holds with cancellation requests: X' tab should now include a 'Cancel selected (X)' button. Make sure is works.
6. Make sure TransferWhenCancelAllWaitingHolds is set to "Don't transfer" and make sure the hint displays well in the Holds over table.

Signed-off-by: Philip Orr <philip.orr@lmscloud.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit fea69c8607)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:24:44 +01:00
b6239a6ce6 Bug 34979: DBRev 23.11.02.002
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit bfbace46e1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:11:16 +01:00
Katrin Fischer
ad4c72aa8c Bug 34979: (follow-up) Only print message when preference was added
Implements Joubu's suggestion from comment#14 and improves
on it for the cases where we fix capitalization.

Test plan remains unchanged. You can run the database update
a second time to see the difference.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 92d98c1808)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:10:42 +01:00
Katrin Fischer
84d9dea1ae Bug 34979: Fix mistakes in system preference files highlighted by unit test
This fixes the mistakes the unit test helped to find:
* Add missing system preferences to sysprefs.sql
* Correct spelling for AutoUpdateSetsEmbedItemData
* Correct capitalization, so that code and pref files match
* Fix OverDrive sytem preferences, where explanation/options
  columns where switched, resulting in strange database entries

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 971d115c8f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:10:42 +01:00
Katrin Fischer
82dcba1cdb Bug 34979: Sort sysprefs.sql alphabetically
This doesn't add or remove any entries, but only changes
the sequence of entries to be alphabetic again, compared
to:

SELECT variable FROM systempreferences ORDER BY variable;

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 24249e2647)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:10:42 +01:00
Katrin Fischer
a1da7ef8f8 Bug 34979: Add unit test for comparing YAMl files with sysprefs.sql
The unit tests will help to detect any discrepancies
and missing entries in the YAML and sysprefs.sql files.

To test:
* Apply only this patch
* prove -v t/db_dependent/check_sysprefs.t
* It will fail.
* Apply other patches
* Run database update
* Re-run test. It should pass now.
* Recreate your database or reset_all with patches applied.
* System preferences should be installed correctly.
* Test should still pass.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 06ba285562)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:10:42 +01:00
b545b9424c Bug 34647: (follow-up) Minor fixes
This patch fixes the functionality of the <select> menu for jumping to a
particular vendor, "Choose a vendor in the list to jump directly to the
right place."

The patch also removes the empty anchor tag on the "Items with no
checkouts" report. It appears to be unused.

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f3a069ad7f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:07:54 +01:00
68336a8d4b Bug 34647: Delete unnecessary anchor tag
This patch removes an anchor tag from the form that does not seem to
serve any purpose. The form has an id attribute and it is this that
appears to be used for navigation to and displaying the form.

Test plan:
1) Navigate to Cataloging > marc modification templates
2) Add a new template or edit an existing one
3) The form to add a new action should be displayed when either the
   "New action" button is clicked or you select to edit an existing
   action

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit a317923bfd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:07:54 +01:00
7317b66b5a Bug 34647: Replace name attributes with ids
This patch replaces name attributes on <a> tags as this is now obsolete
in HTML 5. The recommended practice is to substitute these for ids, as
has been done in this patch

Test plan:
1) Navigate to each page where the link has been amended
2) Check that the link still works as expected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 8a07455e3b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:07:54 +01:00
b2e5be2b13 Bug 35894: Remove duplicate link
This patch deletes a link that appears to be an unnecessary duplicate
in the template file. The link does not appear in the UI and serves no
obvious purpose

Test plan:
1) Navigate to Acquisitions and click Search next to the vendors field
2) Click on a vendor name and the navigation should still work as
   intended, taking you to the Vendor's details page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f931a0ac80)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:07:05 +01:00
Andreas Jonsson
cadf36dc5f Bug 30627: Verify --days parameter and use find command to select old backups for deletion
Test plan

* Create some old fake backups:

backuproot=/var/spool/koha
instance=kohadev

backupdir="$backuproot"/"$instance"

for i in 1 2 3 4 ; do
   for j in sql tar xxx ; do
      file="$backupdir"/"$instance"-$(date -I -d "- $i day").${j}.gz
      if ! test -e "$file" ; then
         touch -t "$(date +%Y%m%d%H%M -d "- $i day")" "$file"
      fi
   done
done

* Verify that --days parameter is validated

sudo koha-run-backups --days 0
sudo koha-run-backups --days foo

* Run backup

sudo koha-run-backups --days 3

* Verify that backups from 3 days have been preserved and older backups have been deleted
* Verify that filenames that do not match the pattern (the .xxx.gz files) are preserved

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit b2e5efbdae)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2024-01-31 14:04:52 +01:00