[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.05-78-gb090cad820
Git repo owner
gitmaster at git.koha-community.org
Thu May 7 19:58:37 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, 19.11.x has been updated
via b090cad82064d2f02440ff53a2b17856f5aeb746 (commit)
via fef648e9027162b6cae91a6f75ca612ef9e3cfc2 (commit)
via b7e9de9a436d59c811f459758094b9bb1ab86a59 (commit)
via 017d03b7414dd794046a883745e4e696ba4c8076 (commit)
via 88526da244ce7ce3ec69bd5c167e016f021b3f08 (commit)
from 8ed0d57c95f36cfb960a998dc5b2fda6cfa44ef4 (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 b090cad82064d2f02440ff53a2b17856f5aeb746
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 11 12:56:41 2020 +0100
Bug 24800: Add tests
Signed-off-by: Clemens Elmlinger <clemens.elmlinger at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit fef648e9027162b6cae91a6f75ca612ef9e3cfc2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 11 13:01:52 2020 +0100
Bug 24800: Handle inexistent return date on self checking
See bug 24800 comment 0 for a description of the problem.
We do not want the SIP server to crash if it receives a checkin request
with a return date that is not given.
The option this patch chose is to parse it only if provided.
Signed-off-by: Clemens Elmlinger <clemens.elmlinger at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit b7e9de9a436d59c811f459758094b9bb1ab86a59
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 12:44:13 2020 +0200
Bug 25069: Fix AddressFormat="fr" behavior
Something went wrong during a rebase of bug 13618
commit dcd1f5d48c758aee17b6c6f069c6146b42efe117
Bug 13618: Add html filters to all the variables
Several changes related to AddressFormat are wrong:
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-main-address-style-us.inc' %]
- [% END %]
+ [% SWITCH Koha.Preference( 'AddressFormat' ) %]
+ [% CASE 'de' %]
+ [% INCLUDE 'member-main-address-style-de.inc' %]
+ [% CASE # us %]
+ [% INCLUDE 'member-main-address-style-us.inc' %]
+ [% END %]
Test plan:
Create a patron with all the address fields filled
Play with the 3 option values of AddressFormat, and confirm that the address is displayed correctly
on the patron's view, and in the patron module (top left)
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 017d03b7414dd794046a883745e4e696ba4c8076
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 26 11:05:32 2020 +0000
Bug 24840: [19.11.x] Replace DateTime->now with dt_from_string
We should use Koha::DateUtils instead of Date::Time directly
This patch simplay replaces calls to now() with a call to dt_from_string()
which does effectively the same thing.
Probably reading the code and verifying changes is sufficient but...
To test:
1 - confirm the files all compile
2 - confirm all tests pass
3 - confirm Koha still works
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 24840: Catch some further cases of DateTime->now
This patch corrects a few additional cases where DateTime->now is called
directly instead of via Koha::DateUtils.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 88526da244ce7ce3ec69bd5c167e016f021b3f08
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Feb 10 18:18:45 2020 +0000
Bug 24620: [19.11.x] Close existing transfer when hold set to waiting (squashed)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 24620: Close existing transfers when setting item to waiting
This patch adds a clause in ModReserveAffect to check if there
are existing transfers and close them when setting a hold to waiting
To test:
1 - Set AutomaticItemReturn to Do
2 - Checkin an item from Library B at Library A
3 - Confirm item is in transfer (check the details page)
4 - Place a item level hold for pickup at library A
5 - Checkin the item at Library A
6 - Confirm the hold
7 - View the details page
8 - Note the item is in transit and waiting
9 - Apply patch
10 - Delete hold and repeat
11 - Confirm that transfer is closed when hold marked waiting
Signed-off-by: Sally <sally.healey at cheshirewestandchester.gov.uk>
Signed-off-by: Stina Hallin <stina.hallin at ub.lu.se>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 24620: Fix test, remove replaced code, use dt_from_string
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 20 ++++----
C4/Letters.pm | 2 +-
C4/MarcModificationTemplates.pm | 3 +-
C4/Reserves.pm | 13 ++++-
C4/SIP/ILS/Transaction/Checkin.pm | 27 ++++++-----
Koha/Calendar.pm | 2 +-
Koha/Checkout.pm | 3 +-
Koha/Checkouts.pm | 3 +-
Koha/EDI.pm | 5 +-
Koha/Edifact/Order.pm | 3 +-
Koha/Edifact/Transport.pm | 3 +-
Koha/Illrequest.pm | 3 +-
Koha/Patron/Password/Recovery.pm | 3 +-
Koha/Sitemapper/Writer.pm | 4 +-
Koha/StockRotationItem.pm | 12 ++---
circ/overdue.pl | 2 +-
circ/returns.pl | 6 +--
.../fix_unclosed_nonaccruing_fines_bug17135.pl | 2 +-
installer/data/mysql/updatedatabase.pl | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 9 ++--
.../prog/en/modules/members/memberentrygen.tt | 21 ++++----
members/summary-print.pl | 3 +-
misc/cronjobs/fines.pl | 2 +-
misc/cronjobs/overdue_notices.pl | 4 +-
misc/cronjobs/update_totalissues.pl | 3 +-
opac/opac-ics.pl | 2 +-
t/Circulation/AgeRestrictionMarkers.t | 5 +-
t/db_dependent/Circulation.t | 38 ++++++++++++++-
t/db_dependent/DecreaseLoanHighHolds.t | 5 +-
t/db_dependent/Letters/TemplateToolkit.t | 2 +-
t/db_dependent/OAI/Server.t | 2 +-
t/db_dependent/Passwordrecovery.t | 11 +++--
t/db_dependent/SIP/Transaction.t | 56 +++++++++++++++++++++-
t/db_dependent/Sitemapper.t | 3 +-
34 files changed, 198 insertions(+), 86 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list