[koha-commits] main Koha release repository branch master updated. v18.05.00-32-g63673d7
Git repo owner
gitmaster at git.koha-community.org
Mon Jun 4 19:51:15 CEST 2018
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 63673d70cd08b198d3b904b73da82f1e06d64f7b (commit)
via 33f441889958b4bd245fdace0d2c787fcb4152a6 (commit)
via 777b24bbb4a768f7895b6d50bdf8dd4bcb067c91 (commit)
via 2c1f7d22810be37c4220566a675b3620d1ff4002 (commit)
via 4f0c8e3c88cb43f21f70e4d776442b489ee3f5dc (commit)
via 9b3f7a001163f8aa230cc6b0e91d48a5593fe56c (commit)
via de32d9d3e2a3371665365a0a6d8a4343f6978940 (commit)
via e5896f56837bdea7a98e7f5ac4c278e7d8fe76f3 (commit)
via 73b0542354a415bfa4c250194f78c145c1088661 (commit)
via b79ce63f65d8b18621e0dd381b7b267b4942ca9b (commit)
via 819e6216e666b61077d2b9043d25f546708bbfc3 (commit)
via 9bd9d2887495efb472b5fcc7382479588b990473 (commit)
via 5530ed6b9d4a45bcca93f3a68371381b87c8eed2 (commit)
via 7b16c9a841fc28a9b994d0a1a9ccce77a7e94868 (commit)
via f9d62f158517a444f5147a2282e21b1aee589687 (commit)
from 35f1fbfedbf628d8e0a043a011bba1c8627858af (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 63673d70cd08b198d3b904b73da82f1e06d64f7b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 30 13:07:39 2018 +0000
Bug 17561: (follow-up) Pass itemnumber on returns and correct itemnumber param in circulation
To test:
1 - Place two holds on a bib for a single patron
2 - Check in both items, confirm the screen message and slip are correct
3 - Checkout both items to another patron, confirm the screen message
and slip are correct
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 33f441889958b4bd245fdace0d2c787fcb4152a6
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri May 18 08:00:03 2018 -0400
Bug 17561: (QA follow-up) Update existing unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 777b24bbb4a768f7895b6d50bdf8dd4bcb067c91
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri May 18 07:20:06 2018 -0400
Bug 17561: (QA follow-up) Simplify new ReserveSlip code
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2c1f7d22810be37c4220566a675b3620d1ff4002
Author: Benjamin Rokseth <benjamin.rokseth at deichman.no>
Date: Thu Mar 15 12:57:37 2018 +0100
Bug 17561: ReserveSlip needs itemnumber for item level holds on same biblio
This patch fixes a regression after bug 14695.
This patch adds itemnumber and barcode as optional params in ReserveSlip used
by hold-transfer-slip.pl to generate HOLD_SLIP. This is for ReserveSlip to be
able to generate correct slips when items in multi-item holds are checked in.
Test plan:
1) activate a circulation rule with multi-item holds
2) Place two holds on same biblio for patron
3) for debugging, either use browser console to observe POST request and responses
or use info from reserves, e.g. reserve_id in the HOLD_SLIP
4) checkin two items from same biblio on pickup branch
5) note that both holds are effectuated, but reserve_id is the same on both slips
6) also note that there is no itemnumber or barcode in the requests from returns.pl
7) Apply this patch
8) repeat 2-4
9) note that reserve_id is now different on the two slips
and/or:
Run tests:
t/db_dependent/Reserves/ReserveSlip.t
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Maksim Sen <maksim.sen at inlibro.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4f0c8e3c88cb43f21f70e4d776442b489ee3f5dc
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jun 3 10:09:23 2018 +0200
Bug 20861: Correct EDI permissions on EDI messsages
The permission for EDI is edi_manage, but 2 pages asked
for manage_edi, allowing users not to access those.
To test:
- Add edi_manage to your permissions
- Try to access the EDIFACT messages from the
acq start page
- Verify it doesn't work
- Apply patch and try again
- You should be able to access the page now
- Try to access the other page directly (if you don't
have EDI data):
/cgi-bin/koha/acqui/edimsg.pl
- Verify you can access the page and don't get a
permission error
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9b3f7a001163f8aa230cc6b0e91d48a5593fe56c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 1 11:39:52 2018 -0300
Bug 20838: Add 2 small tests to check ref
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit de32d9d3e2a3371665365a0a6d8a4343f6978940
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 30 14:53:28 2018 -0300
Bug 20838: Make Koha::Library::Group->all_libraries return a list of Koha::Libraries
Instead of a list of Koha::Library::Group
Ideally it should be a Koh::Libraries iterator
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: Nick Clemens <nick at bywatersolutions.com>
commit e5896f56837bdea7a98e7f5ac4c278e7d8fe76f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 30 14:41:14 2018 -0300
Bug 20838: (bug 16735 follow-up) Fix search by group of libraries
In the last patches of bug 16735, we completely broke the feature!
The limit is using library_groups.id instead of branches.branchcode.
Test plan:
Create a group of library with the search feature
Search (OPAC and staff interfaces) using this limit
=> Without this patch you will see that the generated search query does
not contain branchcodes
=> With this patch applied you will see the branchcodes
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: Nick Clemens <nick at bywatersolutions.com>
commit 73b0542354a415bfa4c250194f78c145c1088661
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jun 4 15:21:06 2018 +0000
Bug 3849: DBRev 18.06.00.001
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b79ce63f65d8b18621e0dd381b7b267b4942ca9b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon May 28 22:17:46 2018 +0000
Bug 3849: (follow-up) Add database update to change descriptions
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 819e6216e666b61077d2b9043d25f546708bbfc3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun May 20 21:06:25 2018 +0200
Bug 3849: Improve descriptions of granular acquisition permissions
The permissions for acquisitions were not very clearly described.
This patch changes the descriptions in the include file (GUI) and
in the default SQL.
To test:
- Go to any patron account in staff
- Go to more > permissions
- Verify that the meaning of each acquisition permission is clear
from the description
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9bd9d2887495efb472b5fcc7382479588b990473
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue May 29 08:49:19 2018 +0000
Bug 20831: Fix KohaTable calls after bug 9573
Test plan:
0) Do not apply the patch
1) Confirm not working datatable on patrons hold history page
2) Apply the patch
3) The table should be working now
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5530ed6b9d4a45bcca93f3a68371381b87c8eed2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 28 16:36:54 2018 -0300
Bug 20763: Remove unecessary Koha::Patron fetch
If $borrowernumber is not set, there is no userenv.
So let's pick the library code set in the userenv instead of fetching
the Koha::Patron->branchcode from DB
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7b16c9a841fc28a9b994d0a1a9ccce77a7e94868
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Mon May 14 08:45:00 2018 -0400
Bug 20763: AllowPurchaseSuggestionBranchChoice triggers error opac-suggestions.pl is visited without logging in
Some code executed in the script opac-suggestions.pl if the system preference AllowPurchaseSuggestionBranchChoice is enabled assumes there is a logged in user. If there is not, patrons will see the error "Internal Server Error".
Test Plan:
1) Enable AllowPurchaseSuggestionBranchChoice
2) Enable AnonSuggestions
3) In the OPAC, perform a search that will have no results,
click the "Make a purchase suggestion" link.
4) Note the error
5) Apply this patch
6) Reload the page
7) The page should load now!
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f9d62f158517a444f5147a2282e21b1aee589687
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 1 13:54:53 2018 -0300
Bug 20840: (bug 2696 follow-up) Fix biblio info fetch
There is no accountlines.biblionumber field, if the account line is
linked to an item, accountline-details.pl will explode with:
Template process failed: undef error - The method biblionumber is not
covered by tests!
Test plan:
Create a fine for a given item
Pay the fine
View the detail of the account line
=> Without this patch you get a software error
=> With this patch applied you will see the biblio's title
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 45 +++++-
Koha.pm | 2 +-
Koha/Library/Group.pm | 3 +-
acqui/edifactmsgs.pl | 2 +-
acqui/edimsg.pl | 2 +-
catalogue/search.pl | 2 +-
circ/hold-transfer-slip.pl | 12 +-
circ/returns.pl | 1 +
installer/data/mysql/updatedatabase.pl | 15 ++
installer/data/mysql/userpermissions.sql | 18 +--
.../intranet-tmpl/prog/en/includes/permissions.inc | 18 +--
.../prog/en/modules/circ/circulation.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../prog/en/modules/members/accountline-details.tt | 3 +-
.../prog/en/modules/members/holdshistory.tt | 2 +-
opac/opac-search.pl | 2 +-
opac/opac-suggestions.pl | 15 +-
t/db_dependent/Letters/TemplateToolkit.t | 8 +-
t/db_dependent/LibraryGroups.t | 4 +-
t/db_dependent/Reserves.t | 2 +-
t/db_dependent/Reserves/ReserveSlip.t | 165 ++++++++++++++++++++
21 files changed, 274 insertions(+), 53 deletions(-)
create mode 100644 t/db_dependent/Reserves/ReserveSlip.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list