[koha-commits] main Koha release repository branch master updated. v20.05.00-216-g46d3ec264c
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 9 12:33:32 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 46d3ec264c4e46cc73ee1713b5c39e6c564e5a1a (commit)
via d53b58cab858f06be7f9762b16b89c8bfbce5625 (commit)
via 6250c2dc1556dbf0ef87f2bb36f13534cb2e2368 (commit)
via 5c581265abff940350df83a52228085aa0792fe0 (commit)
via 0b69ff1ed7a775b6fdca8513d1ec5a692e30bbe9 (commit)
via 7b66b90fe707e8ac650a1c85d87560fc2f4a223d (commit)
via 7555ecaafa3bd8bbf0514f3c2672cb41ff7e0aa7 (commit)
via 2ab6018b6e14ae2153093db148f04f71405f4493 (commit)
via 579a3c11edf77d36488f352d88ae373cc4cbfa21 (commit)
via c1e1c233ca69fe9f73efb1c939148f8c7afcf11e (commit)
from d3f0fc135b0b73b7dcf7fee09ca30a42e2e514a3 (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 46d3ec264c4e46cc73ee1713b5c39e6c564e5a1a
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sun May 24 08:51:27 2020 -0300
Bug 25443: (follow-up) surround strings with <span>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d53b58cab858f06be7f9762b16b89c8bfbce5625
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun May 24 02:04:03 2020 +0200
Bug 25443: Improve translation of 'Select the record to link%s to'
Before this patch the title was set in italic, which caused the
translation string to be cut off. Removing the italic formatting in
favor of quotes and splitting the string into 2 sentences (dealing
with title existing and not existing:
Select the host record to link to '[% bibliotitle | html %]'
Select the host record to link
To test:
- Activate EasyAnalyticalRecords system preference
- Search for a record in staff
- Use Edit > Link to host record
- Verify the text is shown as above with the reord's title
- The second case is a bit theoretical:
- Delete 245$a from the record or empty out biblio.title using SQL
- Verify the string still shows but without the 'to...' part.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6250c2dc1556dbf0ef87f2bb36f13534cb2e2368
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jun 29 11:04:59 2020 +0000
Bug 25890: Update sorting column for checkouts table
Test plan:
- Check some items out, all from different libraries
- Modify the checkout and due dates, like:
2018-10-22
2018-01-23
2018-05-27
- Sort by checkout date, verify it is actually sorting on homebranch
- Apply patch
- Reload page
- Note you can now sort items correctly
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 5c581265abff940350df83a52228085aa0792fe0
Author: Slava Shishkin <slavashishkin at gmail.com>
Date: Thu Jun 18 12:11:29 2020 +0300
Bug 25695: merge of similar code blocks after circulation_rules update
In onboarding.pl we have second block with adding just one more
rule parameter (maxissueqty) which can be merged to first one
after all parameters now stored in circulation_rules table.
Also this eliminates the need of adding forgotten "warn $@" after
the second eval block.
Mentored-by: Andrew Nugged <nugged at gmail.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 0b69ff1ed7a775b6fdca8513d1ec5a692e30bbe9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jul 2 08:32:51 2020 -0400
Bug 25914: Fix incorrect variable name causing relative's checkouts column to be empty in OPAC
In the OPAC, the title column in the relatives checkouts table is always empty.
Test Plan:
1) Enable viewing of relative's checkouts in OPAC
2) Check some items out to a patron
3) Log into the OPAC as a relative of that patron that should be able to
view them
4) Note the title column is empty in the relative's checkouts tab
5) Apply this patch
6) Reload the page
7) Titles should appear in the title column!
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7b66b90fe707e8ac650a1c85d87560fc2f4a223d
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sun Jun 14 22:41:03 2020 +0000
Bug 25750: fix fallback to ecost_tax_included/ecost_tax_excluded
If 'Actual cost' has not been set then it has the value of 0.00 which
Perl evaluates to true so this patchset resets it to 0, so the fallback
to ecost_tax_included/ecost_tax_excluded happens.
Test plan:
1. Add item to acquisition basket (make sure the vendor has: tax rate: 15%, 'List prices: Include tax', 'Invoice prices: Include tax')
2. Set 'Vendor price' = 10 and do not set 'Actual cost'
3. Save order
4. Observe basket.pl shows 'Total tax exc.' has a value of 0.00 and GST
column has value of -8.70
5. Jump into the database:
select tax_value_on_ordering from aqorders where
ordernumber=<ordernumber>;
[You can get the ordernumber from clicking on the 'Modify' line the item
is listed in]
6. Observe a negative value: -8.70
7. Apply patch and restart plack
8. Add a second item to the basket
9. Set 'Vendor price' = 10 and don't set 'Actual cost'
10. Save order
11. Observe basket.pl shows 'Total tax exc' has value of 8.70 and GST
has value of 1.30
12. Repeat step 5 and observe tax_value_on_ordering = 1.30
13. Run t/Prices.t unit test:
sudo koha-shell <instancename>
prove t/Prices.t
Sponsored-by: Horowhenua District Council, NZ
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7555ecaafa3bd8bbf0514f3c2672cb41ff7e0aa7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 15 16:11:49 2020 +0200
Bug 25752: Stay in cwd after koha-shell
After bug 25538, after a koha-shell we are not longer in the current directory:
root at cec7bffd8100:koha(master)$ pwd
/kohadevbox/koha
root at cec7bffd8100:koha(master)$ sudo koha-shell kohadev
kohadev-koha at cec7bffd8100:~$ pwd
/var/lib/koha/kohadev
Test plan:
Repeat the commands above and confirm that with this version of the
script you get /kohadevbox/koha inside the koha-shell
Search for possible regressions
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2ab6018b6e14ae2153093db148f04f71405f4493
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 24 12:20:03 2020 +0000
Bug 25864: Lower case fields for searching
To recreate:
1 - Have Koha using ES5 and Elasticsearch as search engine
2 - Enable DumpTemplateVarsIntranet and DumpSearchQueryTemplate
3 - Do a search in authorities using 'Search entire record' (abduction if using sample db)
4 - Note no results
5 - View the page source and find 'search_query'
6 - Note the uppercased fields
7 - curl 'es:9200/koha_kohadev_authorities/data/417?pretty'
8 - Note all fields lower-cased
9 - Apply patch
10 - Repeat search
11 - It works!
Signed-off-by: Heather Hernandez <heather_hernandez at nps.gov>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 579a3c11edf77d36488f352d88ae373cc4cbfa21
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 24 12:22:48 2020 +0000
Bug 25864: Unit test adjustment
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c1e1c233ca69fe9f73efb1c939148f8c7afcf11e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 24 08:37:18 2020 +0200
Bug 25851: (bug 18928 follow-up) Remove holdallowed rule is value is an empty string
On the interface, if "Hold policy" is "Not set", the rule does not exist
in the table. We should reflect that during the update DB process.
Test plan:
1. Set "Hold policy" to "Not set"
2. Confirm that you can place holds
3. Confirm that the rule does not exist in the DB table
4. Set the value to an empty string (manually)
5. Confirm that you cannot longer place holds
6. Go to the circulation rules page and confirm that the value of "Hold
policy" is "Not set"
7. Execute the update DB entry
8. Confirm that you can place holds
9. Confirm that the rule does not exist in the DB table
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 1 +
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +-
acqui/basket.pl | 2 +
debian/scripts/koha-shell | 3 +-
installer/data/mysql/atomicupdate/bug_25851.perl | 7 +++
installer/data/mysql/updatedatabase.pl | 3 ++
installer/onboarding.pl | 23 +---------
.../prog/en/modules/cataloguing/linkitem.tt | 8 +++-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
t/Prices.t | 52 +++++++++++++++++++++-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 4 +-
12 files changed, 81 insertions(+), 30 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_25851.perl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list