[koha-commits] main Koha release repository branch master updated. v20.05.00-1070-ga0e4e3b5f8
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 28 16:40:49 CEST 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via a0e4e3b5f87fc4fa2af78ec1749429921e5e5ae9 (commit)
via 8dca36661d7cca5a60aaacc44d2e6a774f78da7a (commit)
via 80993795ddf7c7b3c37262dc5f10a9771e5eaa37 (commit)
via ed6d0d42a79a6b553f6945b8b0f041bf7177e925 (commit)
via a03e4f485a351f73015a39346ee0738217016f0a (commit)
via 81b14467af36424183fbf2d3a281262e63d441fa (commit)
via e8522d8231ad096f4cc25b2a7aee8466d03c5bc2 (commit)
via 5baffbee313c8d70d9abe9517fd9d4fda6efe9cd (commit)
via 68ec27562fbb89c68058505b35c14aab7accc7fb (commit)
via 5651facf0574f028250aeb8f30d6d8e2a5ebaabe (commit)
via 0bc0aa708c5903c8ae2b7c45643600d0fc59ae03 (commit)
via 79b2b85f82875664e47cfff1cf1922605f94b03c (commit)
via ef021268bbe9519ac3eb070450591c2b761ac1c3 (commit)
via 57c62a612d7a8c590a2b5ef0ce75d9915471e19a (commit)
via d924e892a897b723664aa950938f1fbc06e7e3a4 (commit)
via fe84c3acba33af7a2fb27643f6b5f9129c329b36 (commit)
via 0afcf3936a6ceeb865fdf0159cf54618400847d7 (commit)
via aa8ee99fb77f3de1904efe52d0bbd847cc4e63aa (commit)
via 5d5a49a7ef165b7b47dda6357aaf2953dacfa362 (commit)
via bd6598d018d0a27b0704aed95e299f6fe0f1c2c1 (commit)
via 9bbf90969304943210e24dcd69422c9fe7d28303 (commit)
via 1e502efa0aef9ca865ff0af6c6ecefee73cc4ee1 (commit)
via 5da1e809b7b5476a2d8a740b1441415ce529fc3c (commit)
via 3cd40f7bafe99c72b804dc1d6ff993fbc71f2d85 (commit)
via b048d155bf18d794d2ac97eaafc6f0fc00996018 (commit)
via 34b9c061f347da750f4565a57012c9caab93f925 (commit)
via 340c8019d2630cc2442b51ae6dfbed5526813699 (commit)
via dc7f187743b614cda367a032d89f4e55a35d311b (commit)
via be7c705d3bfba2044d4656e86b9e94c537c26945 (commit)
via f8d9a7a42706b3f38c373b3d0fe7baeae8a3101e (commit)
from d9815855bd6e442857fdae0c48335f9fe5d17507 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a0e4e3b5f87fc4fa2af78ec1749429921e5e5ae9
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Sep 28 15:47:34 2020 +0200
Bug 26556: (bug 25070 follow-up) Fix typo data_addressfield in address includes
Selecting "main address" city or "alternate address" city does not trigger the automatic population of values to the city, state, and zip fields anymore.
It woks for "alternate contact".
Test plan :
1) Create some cities with all datas : city, state, zip code and country
2) Open patron creation form
3) On "main address", select a city in combobox
4) Check city, state, zip code and country are filled
5) Same with "alternate address"
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8dca36661d7cca5a60aaacc44d2e6a774f78da7a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Sep 24 14:21:43 2020 +0200
Bug 11176: Add active switch on budgets select in suggestions
When creating a new purchase suggestion, all funds display and are available for selection.
The behaviour of this drop-down menu should mirror that of those drop-down menus elsewhere in acquisitions,
where only funds that are linked to active budgets display to the user.
This patch add the active switch based on what exists in acqui/invoice.tt and acqui/invoice.pl.
Looks like actually in suggestion.pl budgets list was fetches with GetBudgets().
But this is for the filter in 'Acquisition information'.
Budgets selection on suggestion creation/edition must use GetBudgetHierarchy(), like in acqui/invoice.pl,
in order to have the actif status.
Test plan :
1) Create a budget periods active B1 with a fund F1
2) Create a budget periods inactive B2 with a fund F2
3) Go to suggestions module
4) Create a new suggestion
5) Check you see only active fund F1
6) Click on 'Show inactive'
7) Check you see also 'F2 (inactive)'
8) Choose fund F1 and save
9) Select the suggestion and edit
10) Check fund F1 is selected
11) Come back to suggestion table
12) Check filter 'Book fund' under 'Acquisition information' contains all funds
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 80993795ddf7c7b3c37262dc5f10a9771e5eaa37
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Sep 21 04:49:48 2020 +0000
Bug 11223: Fix the ind1 semantics for 785 in the staff interface
For 780 and 785 the field should not display when the first indicator
is 1. After checking the code, I found that 785 in staff was missing.
This patches fixes that one.
To test:
- Catalog a record with 785 and 780 fields with one 1st indicator set to
0 and another to 1.
- Verify in staff and OPAC detail pages that only the fields with 0 display.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ed6d0d42a79a6b553f6945b8b0f041bf7177e925
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Sep 13 15:06:46 2020 +0000
Bug 15437: (follow-up) Move $i subfield display to the beginning and add OPAC
This patch builds on Caitlin's to finish the work but keeping as
much from her code as possible.
- Finishes reindenting started in first patch
- Readds a space after the label
- Moves $i to the beginning of the field as suggested by MARC21
documentation:
http://www.loc.gov/marc/bibliographic/bd76x78x.html
The data in subfield $i can be displayed preceding the other
data contained in the field.
- Adds a span with a class around the $i so people can control
the formatting
To test:
- Catalog a record with 780/785 with and without $i.
- Verify that they display nicely in staff and OPAC, $i should show.
Also $a and $t will show (unchanged by this patch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a03e4f485a351f73015a39346ee0738217016f0a
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date: Wed Jan 18 20:54:33 2017 +0000
Bug 15437: MARC21: Show $i for 780/785
Test Plan
1: Inside Administration go to MARC bibliographic framework and on the
default framework under Actions click on MARC structure
2: Search for 780 under search tag and under actions click subfields
3: Find i and click on edit.
4: Under Advanced Constraints select editor and save the changes.
5: Repeat for 785.
6: Find a Bibliograpical record and under Edit select edit record.
7: Under the 7 put values into 780 and 785. For this to work it is
dependant on the patch 17929 so that you can type into the indicators
8: When you save the changes you won't be able to see 780 or 785 on the
Bibliographical details
8: Apply the patch
9: Refresh and 780 and 785 should be there at the bottom under the
content
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 81b14467af36424183fbf2d3a281262e63d441fa
Author: David Cook <dcook at prosentient.com.au>
Date: Wed Aug 19 15:44:57 2020 +1000
Bug 26249: Set keep_text class correctly in cat-search.inc
This patch sets the keep_text class correctly in cat-search.inc
for the "Search the catalog" tab
To test:
1) Apply the patch
2) Go to /cgi-bin/koha/catalogue/search.pl
3) Type "A" into the search box for "Search the catalog"
4) Click on the "Check out" tab
5) Note that "A" appears in search box
6) Change "A" to "B" in search box
7) Click on the "Search the catalog" box
8) Note that "B" appears in the search box
9) Note no Javascript errors in the console
Signed-off-by: Didier Gautheron <didier.gautheron at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e8522d8231ad096f4cc25b2a7aee8466d03c5bc2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 17 10:53:20 2020 +0000
Bug 26478: Display issue with buttons on the self checkout screens
This patch adds missing Bootstrap classes to a few buttons on the self
checkout page. Without the classes the buttons are not styled correctly.
To test, apply the patch and open the self checkout page for a patron
with multiple checkouts, some renewable and some non-renewable.
In the table of the user's checkouts the "Renew item" button should be
styled as a green button. The "Check in item" button should be styled as
a blue button.
Try to check out an item which cannot be circulated. On the page warning
you "Item cannot be checked out," the "Return to account summary" button
should be styled as a blue button.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5baffbee313c8d70d9abe9517fd9d4fda6efe9cd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Sep 23 11:48:00 2020 +0000
Bug 26512: Display issue with buttons for OPAC checkout note
This patch adds the correct Bootstrap 4 class to the buttons for
submitting checkout notes in the OPAC.
The markup has been updated to use <button> instead of <a> because of a
style conflict with jQueryUI's CSS.
To test, apply the patch and enable the AllowCheckoutNotes system
preference.
- Log in to the OPAC as a patron with checkouts.
- On the "Your summary" page, enter some text into a field in the
"Notes" column of the checkouts table.
- Upon typing in the field a button should appear, "Submit note."
- The button should be styled as a green button.
- Submit the note.
- Make a change to the text in the field. A button should appear,
"Submit changes." It should also be styled correctly.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 68ec27562fbb89c68058505b35c14aab7accc7fb
Author: David Cook <dcook at prosentient.com.au>
Date: Wed Aug 26 00:58:36 2020 +0000
Bug 16357: Only use Log4perl middleware if appenders defined
This patch checks that the loggers used by the middleware
actually have appenders defined.
Without this patch, if the loggers don't have appenders
defined in the log4perl file, the logs will just be lost.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5651facf0574f028250aeb8f30d6d8e2a5ebaabe
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Tue Aug 25 12:22:29 2020 +0000
Bug 16357: (QA follow-up) Add log4perl configs during package upgrade
If plack.psgi is updated to the newer version and the log4perl.conf file
is not then the warnings will not be logged anywhere. This adds the
log4perl configurations that are needed for logging for pre-existing Koha
installation which are upgraded.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0bc0aa708c5903c8ae2b7c45643600d0fc59ae03
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Tue Aug 25 12:10:20 2020 +0000
Bug 16357: (QA follow-up) Only initialize Log4perl module
Koha::Logger->get was setting up some extra variables
which are not used nor needed for the Plack::Middleware::Log4perl
middleware to work. According to documentation at
https://metacpan.org/pod/Plack::Middleware::Log4perl#SYNOPSIS
only running Log::Log4perl::init, enabling Log4Perl middleware and
setting up the logging category is enough. Koha::Logger->_init runs the
Log::Log4perl::init and enabling and setting category is handled
directly in plack.psgi.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 79b2b85f82875664e47cfff1cf1922605f94b03c
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Aug 25 18:08:28 2020 +1200
Bug 16357: Plack error logs are not time stamped
add libplack-middleware-logwarn-perl dependency to cpanfile
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ef021268bbe9519ac3eb070450591c2b761ac1c3
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Jun 26 02:25:10 2020 +0000
Bug 16357: Use separate Log4Perl logger for each Plack app
This patch creates separate timestamped Log4Perl loggers
for each Plack app, so that the Intranet, OPAC, and API are logged
to separate files.
To Test:
0) apt-get install libplack-middleware-logwarn-perl
1) Apply "Alternative" patches
2) Copy PLACK block from etc/log4perl.conf to
/etc/koha/sites/kohadev/log4perl.conf and replace __LOG_DIR__ appropriately
3) Copy debian/templates/plack.psgi to /etc/koha/sites/kohadev/plack.psgi
4) Temporarily add 'warn "TEST"' to opac-main.pl and mainpage.pl
5) koha-plack --restart kohadev
6) Go to /cgi-bin/koha/mainpage.pl and /cgi-bin/koha/opac-main.pl
7) Open /var/log/koha/kohadev/plack-opac-error.log and
/var/log/koha/kohadev/plack-intranet-error.log
7) Observe a log line like the following:
[2020/06/22 03:51:23] [WARN] TEST at <SCRIPT and line #>.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 57c62a612d7a8c590a2b5ef0ce75d9915471e19a
Author: David Cook <dcook at prosentient.com.au>
Date: Mon Jun 22 03:53:16 2020 +0000
Bug 16357: Override __WARN__ in Plack to use Log4Perl
This patch overrides __WARN__ in Plack to use Log4Perl to add
timestamps to error output. The Log4Perl config uses a screen
appender so the output still goes to STDERR so that it is still
managed by Starman.
This patch adds a Plack::Middleware::LogWarn package dependency.
(The dependency is very simplistic, so we could always do out own
version if we would prefer to skip the external dependency.)
To Test:
0) apt-get install libplack-middleware-logwarn-perl
1) Apply patch
2) Copy PLACK block from etc/log4perl.conf to
/etc/koha/sites/kohadev/log4perl.conf
3) Copy debian/templates/plack.psgi to /etc/koha/sites/kohadev/plack.psgi
4) Create some output on STDERR (it might be necessary to add
a 'warn "TEST";' line to the intranet or OPAC)
5) koha-plack --restart kohadev
6) Open /var/log/koha/kohadev/plack-error.log
7) Observe a log line like the following:
[2020/06/22 03:51:23] [WARN] TEST at /kohadevbox/koha/opac/opac-user.pl line 59.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d924e892a897b723664aa950938f1fbc06e7e3a4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Apr 14 11:42:22 2020 +0000
Bug 17458: Remove use of datereceived from order receive page
Before this patch the order receive page (parcel.pl) would show
... Received by: <current user> On: <current date>
This is not really helpful. Whenever you viewed an invoice, it
would tell you it was _you_ who received that _today_.
As we don't store a creator of an invoice and the order lines
in an invoice could have been received by different people (which
we also don't know about), the "Received by" is removed by this patch.
Instead of today's date, we can show the shipment date entered for
the invoice. Again: different order lines could have been received
on different dates for this shipment. So only the shipment date makes
sense as it's on invoice level.
This also makes changes to the page title, breadcrumby and page heading:
When the invoice is closed, they will read:
Receipt summary for [vendor] ...
When the invoice is not closed, they wil read:
Receive orders from [vendor] ...
To test:
- Create a basket with some orders in acq
- Close the basket
- Receive shipment and create an invoice
- Make sure shipment date is not set to today
- Verify the information shown on top of parcel.pl is you and today
- Change staff users
- Go to your invoice, it's now this user and today
- Apply patch
- Received by: should be gone and the On: replaced by Shipment date:
with the date you selected
- Check the page title, breadcrumbs and headings read all the same 'Receive orders...'
- Finish receiving and close the invoice
- "Go to receipt page"
- Verify they now read "Receipt summary.."
If you have older invoices in your system, it would work
even better with these as you'd see that always today's date
is displaying without the patch.
Signed-off-by: Marjorie <marjorie.barry-vila at collecto.ca>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fe84c3acba33af7a2fb27643f6b5f9129c329b36
Author: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Date: Wed Sep 16 11:18:49 2020 +0000
Bug 23485: Show barcode in holds to pull
Updated to only show one barcode number, with either an "only" or an "or any available" depending on whether it's an item or bib hold.
Also incorporating feedback to simplify the TT logic and remove list formatting.
To test:
1 - Place an item level hold on a bib with several items with the same callnumber
2 - View the holds to pull report
3 - Try to guess which one on the shelf is right?
4 - Apply patch
5 - See the barcode in holds to pull report
6 - You can now grab the correct item (but don't yet)
7 - Place a next available hold on the same title
8 - See the report now shows one possible valid barcode with the text "or any available."
9 - Check in a different item that fills the next available hold
10 - Now the report shows the single item for the borrower
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0afcf3936a6ceeb865fdf0159cf54618400847d7
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Sep 24 23:52:33 2020 +0200
Bug 24780: Make items.stocknumber show up in batch item modification
It looks like the field was intentionally removed from the list
of batch editable fields in the past. This makes sense as we
used to have a unique index on it at some point - but we do have
no more.
This removes the exception so that the invendory number behaves
like the other fields on the batch item edit form.
To test:
- Create some items with and without stocknumber
- Go to tools > batch item modification
- Enter the barcodes of your selected items in the list or
upload a file with them
- Verify that the stocknumber/inventory number is not showing
in the item edit form below
- Apply patch
- Reload the page - inventory number is there now
- Batch edit the inventory number and verify it works as expected
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit aa8ee99fb77f3de1904efe52d0bbd847cc4e63aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 1 15:07:49 2020 +0200
Bug 25624: Add --where option to update_patrons_category.pl
The script did not allow to find empty fields or use wildcards
With this new option we will now have the ability to filter patrons by
some of their attributes.
Test plan:
1 - Run the script with no parameters and verify the help explains the parameters
2 - Try the script with one or more --where parameters, like:
--where "firstname='koha'"
3 - Test null values
--where "firstname IS NULL"
4 - Test like values with wildcards
--where "firstname LIKE '%a%'
5 - Test like with the word null to find fields containing the word rather than being unset
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5d5a49a7ef165b7b47dda6357aaf2953dacfa362
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Aug 17 10:16:14 2020 +0000
Bug 26224: Prevent double submit of header check in form
To test:
1 - Browse to Home
1 - In the header bar select the 'Check in' tab
2 - Type a barcode into the box
3 - Hit Enter as many as times as you can
4 - Check the statistics table:
SELECT * FROM statistics WHERE itemnumber={itemnumber} AND DATE(datetime)=CURDATE();
5 - Note you have multiple lines for the same item at the same time
6 - Apply patch
7 - Reload the page
8 - Type the barcode
9 - Press Enter even more fast and more furiously
10 - Check the statistics table
11 - Only one entry, huzzah!
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bd6598d018d0a27b0704aed95e299f6fe0f1c2c1
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Sep 25 16:28:17 2020 +0000
Bug 26323: (QA follow-up) Fix syntax errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9bbf90969304943210e24dcd69422c9fe7d28303
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 25 16:53:52 2020 +0100
Bug 26323: (follow-up) Add new cases introduced
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1e502efa0aef9ca865ff0af6c6ecefee73cc4ee1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 3 15:59:22 2020 +0200
Bug 26323: Retrieve the correct values for LOST, DAMAGED, LOC and CCODE
Same as previously
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5da1e809b7b5476a2d8a740b1441415ce529fc3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 3 15:37:15 2020 +0200
Bug 26323: Retrieve the correct NOT_LOAN value
From the template we are assuming that items.notforloan is mapped with
the NOT_LOAN authorised value category, but that is not necessarily the
case.
We must retrieve the correct AV category
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3cd40f7bafe99c72b804dc1d6ff993fbc71f2d85
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 28 15:32:52 2020 +0200
Bug 26414: Tidy the tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b048d155bf18d794d2ac97eaafc6f0fc00996018
Author: Alexis Ripetti <alexis.ripetti at inLibro.com>
Date: Fri Sep 11 16:11:55 2020 -0400
Bug 26414: Unable to export Withdrawn status using CSV profile
When using CSV profiles to export MARC records, it is impossible to export the withdrawn status. I suspect it is because withdrawn is in 952$0 and 0 is considered null rather than an actual 0.
Test Plan :
1) Go to Tools > CSV profiles
2) Click on New CSV profile
3) Enter a profile name (ex. Simple record)
4) In the Profile MARC fields field enter the following (for MARC21)
245a|100a|952o|9520
5) Save your profile
6) Go to Search and search for something
7) Add a couple of things in your cart
8) Go to your cart
9) Click on Download and choose your CSV profile
10) Open the file and notice the 9520 column contains the whole of the 952 field and not just the withdrawn status
11) Apply patch
12) Redo steps 9) and 10)
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 34b9c061f347da750f4565a57012c9caab93f925
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Sep 9 15:34:13 2020 +0100
Bug 26418: Fix translatability of REFUND credit type
The description of REFUND type accountline credits introduced with the "issue refund" feature is not translatable.
To test:
- Make sure a language with a complete translation is installed
- Switch to the language
- Go to any user account
- Add a manual invoice
- Pay it off fully or partially
- Click on "issue refund"
- Confirm the refund
- Check the description of the line in the patron account is not translated.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 340c8019d2630cc2442b51ae6dfbed5526813699
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Sep 10 15:12:39 2020 +0200
Bug 26424: Better performance of svc/checkouts
Ajax script svc/checkouts display checkouts of a patron.
For each item, it fetches a Koha::ItemType object and a Koha::AuthorisedValues object for location,ccode,lost and damaged.
For performance on huge number of checkouts :
Item types should be fetch once before the loop.
authorised values should call Koha::AuthorisedValues->get_description_by_koha_field because it uses a cache.
I've tested with Plack :
Without patch :
100 checkouts = 6 seconds
1000 checkouts = 60 seconds
With patch :
100 checkouts = 5 seconds
1000 checkouts = 44 seconds
Patch also changes the fact that authorised value categories are no longer hardcoded LOC,CCODE,LOST and DAMAGED, they depend on default framework.
Like is doing Bug 26323.
Test plan :
1) Dont apply patch
2) Use sql to define some items lost and damaged
3) Look at checkouts table on a patron with a lot of checkouts
4) Apply patch
5) Look at checkouts table again
6) Check infos are the same : record level item type, item type, location, collection, lost, damaged
7) Check infos are the same in "Number of checkouts by item type"
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dc7f187743b614cda367a032d89f4e55a35d311b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Sep 20 22:06:32 2020 +0000
Bug 26490: Fix column configuration for fines trasactions
Hiding the last columns on the fines transactions in the
patron account in staff didn't work correctly as we had missed
adding Home library to the configuration options when it was
added.
This adds the missing definition and now all columns can be
toggled correctly.
To test:
- Go to any patron account in staff
- Go to Accounting > tab transactions (maybe add some fines)
- Toggle the columns on the table using the menu, especially
- notes, home library and checkout date
- Go to Administration > Table configuration
- Verify the settings for the table work well from there too -
with the patch, home_library will show as new option
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit be7c705d3bfba2044d4656e86b9e94c537c26945
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Sep 21 10:59:56 2020 +0000
Bug 26497: "Hide all columns" throws Javascript error on aqplan.pl
This patch updates the JavaScript for checking and unchecking checkboxes
on the Acquisitions planning page so that it doesn't require the
checkboxes plugin.
To test, apply the patch and go to Administration -> Budgets -> Budget
details -> Planning.
On the planning page, test the "Show all columns" and "Hide all columns"
checkboxes. They should work correctly to show and hide the correct
columns.
Signed-off-by: Henry Bolshaw <bolshawh at parliament.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f8d9a7a42706b3f38c373b3d0fe7baeae8a3101e
Author: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Date: Fri Sep 25 21:09:03 2020 +0000
Bug 26541: Remove percent sign from discount button
Realized I'd left a stray tag, fixed.
To test:
1 - go to borrower account, apply manual fee
2 - go to Transactions tab and see that fee has "% Apply discount" button
3 - apply patch, restart, reload page
4 - button just says "Apply discount"
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Record.pm | 6 +-
acqui/parcel.pl | 4 +-
admin/columns_settings.yml | 2 +
circ/pendingreserves.pl | 3 +
cpanfile | 1 +
debian/control | 2 +
debian/koha-common.postinst | 48 +++++
debian/templates/log4perl-site.conf.in | 25 +++
debian/templates/plack.psgi | 29 ++-
etc/log4perl.conf | 25 +++
.../intranet-tmpl/prog/en/includes/accounts.inc | 2 +-
.../intranet-tmpl/prog/en/includes/cat-search.inc | 2 +-
.../en/includes/catalogue/itemsearch_item.csv.inc | 2 +-
.../en/includes/catalogue/itemsearch_item.json.inc | 6 +-
.../intranet-tmpl/prog/en/includes/facets.inc | 2 +-
.../prog/en/includes/member-alt-address-style.inc | 2 +-
.../prog/en/includes/member-main-address-style.inc | 2 +-
.../prog/en/includes/waiting_holds.inc | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 19 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 +-
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/catalogue/results.tt | 6 +-
.../prog/en/modules/circ/article-requests.tt | 8 +-
.../prog/en/modules/circ/branchtransfers.tt | 6 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 4 +-
.../prog/en/modules/circ/on-site_checkouts.tt | 2 +-
.../prog/en/modules/circ/pendingreserves.tt | 8 +-
.../prog/en/modules/circ/reserveratios.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 16 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 4 +-
.../en/modules/course_reserves/course-details.tt | 10 +-
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/reports/itemslost.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 10 +-
.../prog/en/modules/serials/serials-search.tt | 2 +-
.../en/modules/serials/subscription-batchedit.tt | 2 +-
.../prog/en/modules/suggestion/suggestion.tt | 31 ++-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 228 +++++++++++---------
koha-tmpl/intranet-tmpl/prog/js/acq.js | 8 +-
koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 2 +
.../bootstrap/en/includes/account-table.inc | 43 ++--
.../bootstrap/en/includes/item-status.inc | 6 +-
.../bootstrap/en/includes/opac-facets.inc | 2 +-
.../bootstrap/en/modules/opac-course-details.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 10 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 234 +++++++++++----------
misc/cronjobs/update_patrons_category.pl | 33 ++-
pos/register.pl | 2 +-
suggestion/suggestion.pl | 21 +-
svc/checkouts | 36 ++--
t/db_dependent/Record/marcrecord2csv.t | 37 +++-
tools/batchMod.pl | 5 +-
54 files changed, 638 insertions(+), 346 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list