[koha-commits] main Koha release repository branch master updated. v19.11.00-1381-g287b131369
Git repo owner
gitmaster at git.koha-community.org
Tue Mar 24 12:31:47 CET 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 287b1313696f07568d05fa41b4c4223c734d5757 (commit)
via 2502a54682f1fa02aaa39373515624a2fdd6e7eb (commit)
via 637bb133da798d885189fddedd254c8bb058378d (commit)
via a9a94a2686288565fae3120aa095f6fced1042d6 (commit)
via 02adf70507e6ee7a5bd9abc09c811e38230cee11 (commit)
via fd1bc426e10c6ebf1bc2477c4fbee279a7546cbf (commit)
via ce6229cd7535866d9394605ece70cd35a2a1952a (commit)
via 8986310a60e9174558c24ef6c346bb5fb239332a (commit)
via 817e795df793e85f7238f280ae573db2014c9583 (commit)
via ae89a44a374a7ab2585713eeedc2916a1c8f01f9 (commit)
via 19f2e37468e91d07f0edf2843d013f561b079106 (commit)
via 47dafa24e7b9441c01228ccac701dff843c42e39 (commit)
via 01219b09bae98576344e1844f1acdb87633d10e3 (commit)
via f952067cb23f548a4d804bc64329fcba848b6b29 (commit)
via 661702e6694da80820020c98cb3e63911ef32e8f (commit)
via 15dd83268bf7a6ed05aeefc2280c41e6ca5af342 (commit)
via 03fac5d1a1ca0ba03c17d84a6f40c3dbd1d5e0b6 (commit)
via 7195f371032328242aeb99335f5cbae3e7902063 (commit)
via 3ffe4d162386916d3761cee0ad33c0d50e376b36 (commit)
via ec179067adff3486f740f7fc20600e7a51edc4da (commit)
via 5ff045a83e6f9429aea6f1c4cebc5c2fe773d93c (commit)
via 290d385625521816f1fc858b1c9180182b5ef80c (commit)
via 8dfb0adc8c4ce5b75a8d945b58836fb7e41cb685 (commit)
via 6de018f65fb285620ad17357bd63897f7088b6d5 (commit)
from f46e3fafe63b51747e0d56efeb7edf7d3097117a (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 287b1313696f07568d05fa41b4c4223c734d5757
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Mar 24 11:03:54 2020 +0000
Bug 24953: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2502a54682f1fa02aaa39373515624a2fdd6e7eb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 23 12:24:34 2020 +0000
Bug 24953: Minor corrections to hold ratios report sidebar
This patch makes some minor corrections to the sidebar form on the hold
ratios report page:
- Correct markup errors
- Change the text of labels from "included" to "include"
- Move checkboxes to the left of labels
To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)
- Go to Circulation -> Hold ratios
- In the sidebar, confirm that the labels "Include ordered" and
"Include suspended" appear to the right of their associated
checkboxes.
- Validate the source of the page. There should be no errors.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 637bb133da798d885189fddedd254c8bb058378d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Mar 23 12:32:34 2020 +0000
Bug 24952: Add id to refund modals confirm buttons
This patch adds an ID to the refund confirmation modals for both
borrower account and point of sale register details pages.
Test plan:
1/ Apply patch
2/ Attempt to issue a refund to a patron
3/ Inspect the page and note the presence of an ID for the confirm
button,
4/ Attempt to issue a refund via point of sale register details page
5/ Inspect the page and note the presence of an ID for the confirm
button.
6/ Signoff
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a9a94a2686288565fae3120aa095f6fced1042d6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 19 13:29:50 2020 +0000
Bug 24907: Add 'include suspended' to holds ratio report
Some libraries would like the option to ignore suspended holds when using the holds
ratio report
Note: this report fails with strict mode enabled, please disable to test
To test:
1 - Add enough holds to a record (3) to make it show on the holds ration report
2 - Browse to Circulation->Holds ratio
3 - Run with default settings and confirm the title shows up
4 - Suspend one of the holds
5 - Run report again and confirm title still shows
6 - Apply patch
7 - Reload the report
8 - Note new option
9 - Run report - title does not show
10 - Lower ratio to 2 and confirm the hold shows
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 02adf70507e6ee7a5bd9abc09c811e38230cee11
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Aug 15 10:59:46 2019 +0000
Bug 23409: (follow-up) Allow HTML in circulation note and add line breaks in OPAC user account
This patch makes 2 changes:
- bug 22702 allowed adding HTML to the circulation note, so this patch
restores that ability.
- display OPAC note and messages as multi-line in OPAC
To test:
- Add a circulation and an OPAC note with line breaks and HTML tags
to the patron account
- Add a message with line breaks to the patron account
- Check line breaks don't show on
- OPAC > patron account > my summary page
- Staff > patron account > details
- Apply patches
- Repeat test
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fd1bc426e10c6ebf1bc2477c4fbee279a7546cbf
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Aug 1 14:48:31 2019 +0200
Bug 23409: show borrowernotes and opacnote's lines feeds
Test plan:
- Fill borrowernotes and opacnote with lines separated by lines
endings,
- save and check the content is displayed on a single line,
- apply this patch,
- check lines endings are displayed
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ce6229cd7535866d9394605ece70cd35a2a1952a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 27 09:44:34 2019 +0000
Bug 22589: Remove C4::Overdues::BorType
Test plan:
0) Apply patch
1) try to run affected scripts and ensure the amounts are corectly
calculated for different patron categories:
installer/data/mysql/fix_unclosed_nonaccruing_fines_bug17135.pl
misc/cronjobs/fines.pl
misc/cronjobs/staticfines.pl
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8986310a60e9174558c24ef6c346bb5fb239332a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 21 15:51:22 2020 +0100
Bug 24468: Remove unused C4::Reserves::_get_itype subroutine
Since bug 21206, C4::Reserves::_get_itype is not longer used and should
be removed.
commit 31c29fd31f557306233e6a2936148a5bb10b89a1
Bug 21206: Replace C4::Items::GetItem
UPDATE: In the meanwhile another occurrence was added to Reserves.t, but
easy to replace
Test plan:
% git grep _get_itype
must not return any occurrences.
If one needs it, Koha::Item->effective_itemtype must be used instead.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 817e795df793e85f7238f280ae573db2014c9583
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Mar 22 15:06:35 2020 +0100
Bug 22098: (QA follow-up) Improving documentation
Improves the documentation of the script a bit, but makes one
important change:
-If no prefix is submitted, or prefix does not contain only
-numbers, it returns the inserted code (= keep a field unchanged)
+If no prefix is submitted, or the prefix does contain only
+numbers, it returns the inserted code (= keep the field unchanged).
To test:
- Add an authorised INVENTORY value with 2020 as prefix
- After linking the stocknumberAV.pl to the 952$i in the frameworks
- Edit an item
- Add 2020 in the stocknumber field
- Trigger plugin
- Verify nothing happens
If the prefix contains only numbers... nothing happens.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ae89a44a374a7ab2585713eeedc2916a1c8f01f9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jul 9 00:52:31 2019 +0000
Bug 22098: (follow-up) fix grammar/formating Perldoc
- nubers => numbers
- some vertical spacing
- !}fmt -w65
- "contains of letters" => "containing letters"
TEST PLAN
---------
perldoc cataloguing/value_builder/stocknumberAV.pl
apply patch
perldoc cataloguing/value_builder/stocknumberAV.pl
-- after the patch is more readable.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 19f2e37468e91d07f0edf2843d013f561b079106
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Jan 11 09:25:00 2019 +0000
Bug 22098: Update stocknumberAV cataloguing plugin to use objects
This patch:
- changes SQL to Koha::AuthorisedValues
- remove type param from script tag
- fixes the plugin description
0) Do not apply the patch
1) Set the plugin
1.1) Update a biblio framework and link plugin stocknumberAV.pl to some item
subfield
1.2) Add authorised values category called "INVENTORY"
1.3) Add some authorised values: authorised value is prefix and
description is a current stock/inventory number
2) Add an item and try to use this plugin to ensure you set it
correctly
2.1) Use a defined prefix to see if the number is correct
2.2) Ensure the number is correctly incremented in authorised values
2.3) Use not defined prefix to see the error message
2.4) Insert a not prefix string (eg number) to see it is not changed
3) Apply the patch
4) Repeat 2) and see it is working the same
5) Look into patch and confirm the description does make sense and is
rigth according to what you see in UI
6) Sign off :D
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 47dafa24e7b9441c01228ccac701dff843c42e39
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 20 08:56:03 2020 +0000
Bug 21800: Add tests for _check_split
This new subroutine supports checking the repeatable tag from another
framework. (It will be useful for the item editor.)
Test plan:
Run t/db_dependent/Biblio/TransformKohaToMarc.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 01219b09bae98576344e1844f1acdb87633d10e3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 13 14:35:42 2020 +0000
Bug 21800: Check the correct framework for the repeatable tag
This depends on the framework parameter. Which should be added back to
the call in C4::Items.
Test plan:
[1] Mark in Default framework one subfield A repeatable and B not repeatable.
Go to item editor. (Work on a biblio in Default framework.)
Check saving and reopening these subfields with VAL1 | VAL2.
Subfield A should be cloned, B should be glued as entered.
[2] Mark in another Framework A not repeatable and B repeatable.
Change framework for this biblio.
Go to item editor again. Reopen item. Behavior subfields in reverse?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f952067cb23f548a4d804bc64329fcba848b6b29
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 13 11:33:15 2020 +0000
Bug 21800: Make TransformKohaToMarc aware of non-repeatable subfields
If a kohafield (in Koha to MARC mappings) contains a pipe char (say A | B),
we split it up into two subfields A and B in MARC.
We will only do that for repeatable subfields now. If the field is not
repeatable, the value will just be 'A | B'.
Note 1: As bug 10306 and its friends (19096) made the Default framework
authoritative, we do no longer have the frameworkcode in this routine.
Formally, we should check the corresponding framework.
Note 2: Does this impact the reverse operation in TransformMarcToKoha?
No, the check on repeatable subfields is done in the interface and not
in TransformMarcToKoha. This routine simply translates two instances of the
same subfield, say A and B, into the value 'A | B' for a kohafield. Not
allowing two instances of a non-repeatable subfield is not in the scope of
this report.
Test plan:
[1] Mark an item field as repeatable in the Default framework.
Edit an item. Insert A|B in this field and another not-repeatable
field. Save and reopen. Verify that the repeatable field is duplicated
and the other one contains the pipe character in the text box.
[2] Look for a repeatable subfield in MARC like e.g. 260$c.
Go to the cataloguing editor and add A|B in this field.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 661702e6694da80820020c98cb3e63911ef32e8f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 13 11:55:32 2020 +0000
Bug 21800: Add tests for repeatable subfields
Test plan:
Do not apply the second patch [note 1].
Run t/db_dependent/Biblio/TransformKohaToMarc.t
Run t/db_dependent/Biblio/TransformMarcToKoha.t
Apply the second patch and run them again. Both tests should pass now.
Note 1: The TransformKohaToMarc test should fail with something like:
# Failed test 'Check 260e'
# at t/db_dependent/Biblio/TransformKohaToMarc.t line 60.
# got: 'A'
# expected: 'A | B'
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 15dd83268bf7a6ed05aeefc2280c41e6ca5af342
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Thu Nov 19 09:52:04 2015 +0100
Bug 15214: bulkmarcimport should log if an authority has been updated
When importing with bulkmarcimport, authorities may or may not be updated based
on which authority is newer (005 are compared). This patch allows to keep track
in the result yaml file if an authority has been updated or not:
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 03fac5d1a1ca0ba03c17d84a6f40c3dbd1d5e0b6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Mar 24 10:54:00 2020 +0000
Bug 24759: DBRev 19.12.00.051
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7195f371032328242aeb99335f5cbae3e7902063
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 20 15:07:27 2020 +0000
Bug 24759: (follow-up) Fix tests
Earlier tests delete borrowers before issues, can cause a constraint failure
Wrong test count
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3ffe4d162386916d3761cee0ad33c0d50e376b36
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 3 14:26:06 2020 +0100
Bug 24759: Test intranet at the same time
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ec179067adff3486f740f7fc20600e7a51edc4da
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 3 14:22:06 2020 +0100
Bug 24759: Simplify tests
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5ff045a83e6f9429aea6f1c4cebc5c2fe773d93c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 2 17:01:42 2020 +0000
Bug 24759: Rename renewalbranch to renewal_branchcode
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 290d385625521816f1fc858b1c9180182b5ef80c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jun 26 07:43:53 2019 -0400
Bug 24759: Unit tests for AddRenewal
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8dfb0adc8c4ce5b75a8d945b58836fb7e41cb685
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 28 13:23:44 2020 +0000
Bug 24759: CleanUp OpacRenewalBranch values
We had a unique behvaiour where the syspref was set to string 'NULL'
as opposed to undef, we need to clean that up
To test:
1 - Set OpacRenewalBranch to 'NULL' in staff interface
2 - Renew via opac
3 - Check statistics to ensure branch is blank
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6de018f65fb285620ad17357bd63897f7088b6d5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 28 13:09:29 2020 +0000
Bug 24759: Move OpacRenewalBranch code to Koha::Item
This patchset moves all code to calculate the correct renewal branch into Koha::Item.pm
When interface is opac we follow the syspref, otherwise we use the current userenv, or pass through
a defined branch
To test:
1 - Check out an item to a patron
2 - Set allowed renewals in the circ rules to 100 (just so you can keep testing)
3 - Renew the item in staff interface, confirm it is recorded correctly in statistics table (as signed in branch)
4 - Renew via the opac, testing with each setting of OpacRenewalbranch
5 - prove -v t/db_dependent/Koha/Item.t
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 21 ++++++-
C4/Circulation.pm | 6 +-
C4/Items.pm | 2 +-
C4/Overdues.pm | 32 ----------
C4/Reserves.pm | 27 --------
Koha.pm | 2 +-
Koha/Item.pm | 36 +++++++++++
cataloguing/value_builder/stocknumberAV.pl | 40 ++++++------
circ/reserveratios.pl | 4 ++
.../fix_unclosed_nonaccruing_fines_bug17135.pl | 9 +--
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 17 ++++++
.../intranet-tmpl/prog/css/src/staff-global.scss | 1 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/circ/reserveratios.tt | 17 ++++--
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 8 +--
.../intranet-tmpl/prog/en/modules/pos/register.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +-
.../opac-tmpl/bootstrap/en/includes/opac-note.inc | 4 +-
misc/cronjobs/fines.pl | 8 ++-
misc/cronjobs/staticfines.pl | 15 ++---
misc/migration_tools/bulkmarcimport.pl | 2 +
opac/opac-renew.pl | 21 +------
t/db_dependent/Biblio/TransformKohaToMarc.t | 31 +++++++---
t/db_dependent/Biblio/TransformMarcToKoha.t | 19 +++++-
t/db_dependent/Circulation/issue.t | 71 +++++++++++++++++-----
t/db_dependent/Koha/Item.t | 51 +++++++++++++++-
t/db_dependent/Reserves.t | 3 +-
30 files changed, 292 insertions(+), 167 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list