From gitmaster at git.koha-community.org Mon Jun 4 13:21:36 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Jun 2018 11:21:36 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-1-gfe8892e Message-ID: 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, 17.11.x has been updated via fe8892ede93a847df0dc069838e0a4af73d1cf25 (commit) from 5f846a33abe89599fa7b9a37cb3c00632d30ec90 (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 fe8892ede93a847df0dc069838e0a4af73d1cf25 Author: Jonathan Druart Date: Mon May 7 15:04:33 2018 -0300 Bug 20722: Display search results when searching only by ITEMTYPECAT - Create an entry for the ITEMTYPECAT authorised value category. Make sure to fill in the OPAC description. - Go to administration > itemtypes and add the new category to 2 item types. - Go to the OPAC and check that the advanced search shows your new itemtype group instead of the individual itemtypes. - Check the checkbox and Search. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 4200ffb720f1864a6ee02c071dc5aa09ee258f42) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: opac/opac-search.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 4 19:51:15 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Jun 2018 17:51:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-32-g63673d7 Message-ID: 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 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 Signed-off-by: Nick Clemens commit 33f441889958b4bd245fdace0d2c787fcb4152a6 Author: Kyle M Hall Date: Fri May 18 08:00:03 2018 -0400 Bug 17561: (QA follow-up) Update existing unit tests Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 777b24bbb4a768f7895b6d50bdf8dd4bcb067c91 Author: Kyle M Hall Date: Fri May 18 07:20:06 2018 -0400 Bug 17561: (QA follow-up) Simplify new ReserveSlip code Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 2c1f7d22810be37c4220566a675b3620d1ff4002 Author: Benjamin Rokseth 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 Signed-off-by: Maksim Sen Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 4f0c8e3c88cb43f21f70e4d776442b489ee3f5dc Author: Katrin Fischer 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 9b3f7a001163f8aa230cc6b0e91d48a5593fe56c Author: Jonathan Druart Date: Fri Jun 1 11:39:52 2018 -0300 Bug 20838: Add 2 small tests to check ref Signed-off-by: Nick Clemens commit de32d9d3e2a3371665365a0a6d8a4343f6978940 Author: Jonathan Druart 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 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit e5896f56837bdea7a98e7f5ac4c278e7d8fe76f3 Author: Jonathan Druart 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 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 73b0542354a415bfa4c250194f78c145c1088661 Author: Nick Clemens Date: Mon Jun 4 15:21:06 2018 +0000 Bug 3849: DBRev 18.06.00.001 Signed-off-by: Nick Clemens commit b79ce63f65d8b18621e0dd381b7b267b4942ca9b Author: Katrin Fischer Date: Mon May 28 22:17:46 2018 +0000 Bug 3849: (follow-up) Add database update to change descriptions Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 819e6216e666b61077d2b9043d25f546708bbfc3 Author: Katrin Fischer 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 9bd9d2887495efb472b5fcc7382479588b990473 Author: Josef Moravec 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 5530ed6b9d4a45bcca93f3a68371381b87c8eed2 Author: Jonathan Druart 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 Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 7b16c9a841fc28a9b994d0a1a9ccce77a7e94868 Author: Kyle M Hall 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit f9d62f158517a444f5147a2282e21b1aee589687 Author: Jonathan Druart 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 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- 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 From gitmaster at git.koha-community.org Tue Jun 5 11:13:45 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 09:13:45 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-4-gf745ba2 Message-ID: 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, 17.11.x has been updated via f745ba2bc7c3450e744416cf9692ed399528bcdc (commit) via 5c63236dccd70af5f33886c2599370d2c1c2709e (commit) via aec676d8cbf419a1b4e76097eaf4b50ba15ad12b (commit) from fe8892ede93a847df0dc069838e0a4af73d1cf25 (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 f745ba2bc7c3450e744416cf9692ed399528bcdc Author: Julian Maurice Date: Wed Apr 18 15:20:02 2018 +0200 Bug 20343: Put translatable strings in strings.tt Also add a CSS class on
for easier styling and change the list style so it take less space on screen Signed-off-by: Jonathan Druart (cherry picked from commit 618ccd243ea9bdd2daa115415bafb5a4c864333b) Signed-off-by: Fridolin Somers commit 5c63236dccd70af5f33886c2599370d2c1c2709e Author: Julian Maurice Date: Tue Mar 6 14:47:46 2018 +0100 Bug 20343: Show number of checkouts by itemtype in circulation.pl It is sometimes useful to have the number of checkouts grouped by itemtype (to see if we're approaching the maximum number of checkouts allowed for instance). This patch adds this information above the checkouts table, in circ/circulation.pl Test plan: 1. Check out some items with various item types to a patron 2. In circ/circulation.pl, click on 'Show checkouts' button to display the table 3. Notice the line "Number of checkouts by item type" above the table, click on it 4. See that the list of item types is displayed with a count in front of each one 5. Compare the numbers to the checkouts in the table and verify that the numbers are correct Signed-off-by: claude Signed-off-by: Jesse Maseto Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 67d905d49f2871c884dc868bd1b50517624dcdbf) Signed-off-by: Fridolin Somers commit aec676d8cbf419a1b4e76097eaf4b50ba15ad12b Author: Owen Leonard Date: Thu Jun 15 12:32:43 2017 +0000 Bug 18799: XSLTresultsdisplay hides the icons If item-level_itypes is turned off and XSLTResultsDisplay is turned on, biblio-level itemtype images are not shown in staff client search results. This patch corrects the problem. This patch also adds some markup and CSS to the itemtype image to make it look a litte cleaner and work better in result sets in which some titles have images and some don't. To test, apply the patch and view the staff client search results page with various settings: - XSLT turned on and off - item-level_itypes turned on and off - noItemTypeImages turned on and off Confirm that item type images are shown or not shown correctly according to each setting. The difference between this patch and the other patch currently on this bug is that this patch continues the practice of hiding biblio-level itemtype information when item-level_itypes is ON. Signed-off-by: Victor Grousset Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 3c5843b1564cc2f1cab2c6bb8be7556b51730631) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 41 +++++++++++++++++++- .../intranet-tmpl/prog/en/includes/strings.inc | 2 + .../prog/en/modules/catalogue/results.tt | 25 ++++++------ koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 20 +++++++++- 4 files changed, 72 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 11:36:22 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 09:36:22 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-2-g359cbe9 Message-ID: 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, 18.05.x has been updated via 359cbe9c5cae9165b22aa21e294695b932216694 (commit) via 721f05371e2877e83e5f2adb6b523c5086333f4b (commit) from df8716197ad36f168689b98994fd693893c9d5d3 (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 359cbe9c5cae9165b22aa21e294695b932216694 Author: Jonathan Druart Date: Mon May 28 11:24:43 2018 -0300 Bug 20825: (bug 19943 follow-up) call notforloan on itemtype instead of biblioitem On bug 19943: - elsif ($biblioitem->{'notforloan'} == 1){ + elsif ($biblioitem->notforloan == 1){ The biblioitems table does not contain a notforloan column, this comes from the item type. This bug only appears when item type is defined at biblio level (item-level_itypes=0) Test plan: Set item-level_itypes = biblio Check an item out Without this patch it explodes with "The method notforloan is not covered by tests!" Signed-off-by: Tomas Cohen Arazi I reproduced the error condition and verified the tests failed without this patch. After this patch is applied, tests pass and checkout succeeds. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 721f05371e2877e83e5f2adb6b523c5086333f4b Author: Jonathan Druart Date: Mon May 28 11:20:32 2018 -0300 Bug 20825: Add regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 17 ++++++++++------- t/db_dependent/Circulation.t | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 11:42:15 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 09:42:15 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-3-gc6c1ff7 Message-ID: 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, 18.05.x has been updated via c6c1ff70c270c8ab147c7da315e79ca36054acd7 (commit) from 359cbe9c5cae9165b22aa21e294695b932216694 (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 c6c1ff70c270c8ab147c7da315e79ca36054acd7 Author: Nick Clemens Date: Tue May 29 15:53:59 2018 +0000 Bug 20825: (QA follow-up) set biblioitemnumber with correct value Both biblionumber and biblioitemnumber for item were set to biblionumber, when they don't line up tests fail Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 11:58:11 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 09:58:11 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-4-g934ec2d Message-ID: 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, 18.05.x has been updated via 934ec2dcd3f55af3b3c2acc727837076758fbfc6 (commit) from c6c1ff70c270c8ab147c7da315e79ca36054acd7 (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 934ec2dcd3f55af3b3c2acc727837076758fbfc6 Author: Jonathan Druart Date: Mon May 28 15:11:09 2018 -0300 Bug 20822: (bug 18789 follow-up) Fix HOLD_SLIP Caused by commit ab47e46ea0ade643b308a8b00708d57995c57050 Bug 18789: Pass a Koha::Patron object from returns.pl circ/returns.pl does not send a $patron Koha::Patron object to the template in case print_slip is set Test plan: Confirm a hold and print the slip Signed-off-by: Katrin Fischer Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: circ/returns.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:11:33 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:11:33 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-5-g0f4f2c1 Message-ID: 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, 18.05.x has been updated via 0f4f2c1fd8e653b511d94e8b209169c898a2a56b (commit) from 934ec2dcd3f55af3b3c2acc727837076758fbfc6 (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 0f4f2c1fd8e653b511d94e8b209169c898a2a56b Author: Jonathan Druart Date: Tue Apr 24 15:38:41 2018 -0300 Bug 20652: Fix result sorting after search on limit only 1 chomp was missing, spaces were replaced with %20 This patch adds extra chomps, but it does not hurt Test plan: Advanced Search Choose an Item type (do not enter any other search limits) Search Click on Sort (it doesn't appear to matter what you sort on) Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:16:13 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:16:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-6-gdc39675 Message-ID: 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, 18.05.x has been updated via dc396756a050bf3fe07bb3141df6535a27fd9afb (commit) from 0f4f2c1fd8e653b511d94e8b209169c898a2a56b (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 dc396756a050bf3fe07bb3141df6535a27fd9afb Author: Jonathan Druart Date: Mon May 28 11:40:20 2018 -0300 Bug 20827: Display Fund's owner name when selected When a fund is created or edited and does not have a owner yet, the name of the patron will not be displayed when selected. The HTML element the JS code expects is not present in the DOM. Test plan: - Create a fund, set a owner - remove the owner, edit, etc. - Save - Edit again Make sure it works as expected. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:18:45 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:18:45 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-7-g96ce61f Message-ID: 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, 18.05.x has been updated via 96ce61f54dfa1bf6f6355077fc665268ac69acdf (commit) from dc396756a050bf3fe07bb3141df6535a27fd9afb (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 96ce61f54dfa1bf6f6355077fc665268ac69acdf Author: Katrin Fischer Date: Fri May 18 05:39:19 2018 +0000 Bug 20791: Correct capitalization on 'Notices & slips' page - Standardizes spelling to 'Notices & slips' Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:21:04 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:21:04 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-8-g7fd7616 Message-ID: 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, 18.05.x has been updated via 7fd76164079c0a791bbbe06640d339e87f99b0cf (commit) from 96ce61f54dfa1bf6f6355077fc665268ac69acdf (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 7fd76164079c0a791bbbe06640d339e87f99b0cf Author: Katrin Fischer Date: Thu May 10 17:54:38 2018 +0000 Bug 20752: Fix capitalization on the files tab for patron files - Activate EnableBorrowerFiles - Go to any patron account in staff - Go to the files tab - Check that strings on the page ar all properly capitalized - button - legend on section Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:26:00 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:26:00 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-9-gb5d2f2c Message-ID: 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, 18.05.x has been updated via b5d2f2cee12e02d5f578b66247a71f3975190835 (commit) from 7fd76164079c0a791bbbe06640d339e87f99b0cf (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 b5d2f2cee12e02d5f578b66247a71f3975190835 Author: Owen Leonard Date: Thu May 17 11:38:39 2018 +0000 Bug 20774: Trivial HTML error in itemslost.tt This patch makes a minor correction to the markup of the lost items report template. To test, apply the patch and run the lost items report with parameters which will return results. The report results should look correct, and the page should validate with no relevant errors. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:28:12 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:28:12 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-10-g82908dc Message-ID: 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, 18.05.x has been updated via 82908dc5bfa387742e2130330fdf1664b9d69c88 (commit) from b5d2f2cee12e02d5f578b66247a71f3975190835 (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 82908dc5bfa387742e2130330fdf1664b9d69c88 Author: Katrin Fischer Date: Wed May 16 02:45:02 2018 +0200 Bug 3886: Fix mismatch of required permissions for printing slips - Print summary (summary-print.pl) - Print quick slip (printslip.pl) - Print slip (printslip.pl) - Print overdues (print_overdues.pl) Perl scripts all require circulate_remaining_permissions, while in the template we were checking for edit_borrowers. Now the print pull down will only be visible if the patron has circulate or circulate_remaining_permissions. To test: - Verify that printing the listed slips works for staff users with either circulate or circulate_remaining_permissions and without edit_borrowers. Signed-off-by: Charles Farmer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:35:28 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:35:28 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-11-gb9dffc1 Message-ID: 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, 18.05.x has been updated via b9dffc169ddb7a3a32a071c4a004420814fa3a3f (commit) from 82908dc5bfa387742e2130330fdf1664b9d69c88 (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 b9dffc169ddb7a3a32a071c4a004420814fa3a3f Author: Jonathan Druart Date: Mon May 14 14:04:01 2018 -0300 Bug 20767: Display a stack trace when a method is not covered by tests When a method is not allowed yet (not covered by tests), developers get an error the is not really useful: "The method XXX is not covered by tests!" It would be more useful to have a stack trace in order to know where this error come from. Test plan: Modify some code to display this stack trace and confirm it makes sense to have it, i.e. it will make debug easier Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Object.pm | 6 +++++- Koha/Objects.pm | 10 +++++++++- t/db_dependent/Koha/Objects.t | 27 +++++++++++++++++++++------ 3 files changed, 35 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:49:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:49:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-12-g59989e7 Message-ID: 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, 18.05.x has been updated via 59989e7be4e4c697b0ef316eab53b6450f5edb58 (commit) from b9dffc169ddb7a3a32a071c4a004420814fa3a3f (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 59989e7be4e4c697b0ef316eab53b6450f5edb58 Author: Nick Clemens Date: Fri May 18 14:01:09 2018 +0000 Bug 20781: Set a minimum enrollemnt period 'in months' of 1 To test: 1 - Browse to Admin->Patron Categories 2 - Click '+ New category' 3 - Enter data as required, however, enter 0 in 'Enrolment period' -> 'in months' 4 - Save 5 - View the list of categories, the new category has 'Enrolment period' = 'until' 6 - Create a patron in this category, note their dateexipry is '0000-00-00' 7 - Search for them 8 - internal server error 9 - Delete that patron 10 - Apply patch 11 - Edit the category, note you cannot save with 0 months 12 - Set 1 month and save 13 - Create a patron in this cateogry 14 - Note they have a valid dateexpiry 15 - Search for them 16 - All works 17 - Create a new category and verify you cannot add with 0 months Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/categories.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:51:01 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:51:01 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-13-gddc2f3f Message-ID: 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, 18.05.x has been updated via ddc2f3f7eef9702a88cc0326724583c94dcd3d59 (commit) from 59989e7be4e4c697b0ef316eab53b6450f5edb58 (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 ddc2f3f7eef9702a88cc0326724583c94dcd3d59 Author: Jonathan Druart Date: Thu May 24 16:33:19 2018 -0300 Bug 20818: Add missing QA Manager entry in 18.05.00 release notes Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_18_05_00.html | 6 +++--- misc/release_notes/release_notes_18_05_00.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:53:47 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:53:47 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-14-g66f5b79 Message-ID: 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, 18.05.x has been updated via 66f5b793ed8e52372466122263cac0ddd84dea63 (commit) from ddc2f3f7eef9702a88cc0326724583c94dcd3d59 (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 66f5b793ed8e52372466122263cac0ddd84dea63 Author: Marcel de Rooy Date: Wed May 2 16:13:20 2018 +0200 Bug 20696: Fix a few ugly "eq undef" comparisons in Search.pm Comparisons like $a eq undef should normally raise a warning like: Use of uninitialized value in string eq at ... But unfortunately we still suppress warnings here and there. Test plan: [1] Just read this patch and confirm the small changes. [2] Git grep on "eq undef" and do not find other occurrences. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Passes test plan and QA tools. Searching works correctly. Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 12:57:34 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 10:57:34 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-15-g34b780b Message-ID: 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, 18.05.x has been updated via 34b780bf007239617d372a1923f7d1c3f35bb51e (commit) from 66f5b793ed8e52372466122263cac0ddd84dea63 (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 34b780bf007239617d372a1923f7d1c3f35bb51e Author: Nick Clemens Date: Sun May 13 01:44:28 2018 +0000 Bug 20761: Fix some js includes in rancor To test: 1 - Load the advanced cataloging editor 2 - Inspect the network tab in your browser (F12) 3 - Note failure to load 'cataloging_.js' 4 - Note some other scripts don't have versioning 5 - Apply patch 6 - Reload page 7 - Note cataloging.js loads with version number 8 - Note more js files have versioning Signed-off-by: Katrin Fischer Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:03:39 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:03:39 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-16-gc5dc6ae Message-ID: 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, 18.05.x has been updated via c5dc6aeae728078ca76e88f8af8693772006d842 (commit) from 34b780bf007239617d372a1923f7d1c3f35bb51e (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 c5dc6aeae728078ca76e88f8af8693772006d842 Author: Kyle M Hall Date: Mon May 21 14:56:58 2018 -0400 Bug 20798: Client side validation for for fund selection prevents adding only some records to a basket Bug 19453 "fixed" the fund validation that never actually worked. This validation should be removed altogether instead. It is overly simplistic and simply checks to see if each record in the batch has a fund selected regardless of whether that record will be imported or not. In addition, the code completely ignores items generated by MarcItemFieldsToOrder such that even if items on that page have a fund selected, the javascript forces the librarian to make a selection from the left-hand fund pulldown even though it will not be used. Considering this bad validation is basically 'new' as it never worked before, the most sensible course of action would be to 'undo' the change and remove the validation. Test Plan: 1) Add records to a basket from an import batch 2) Select only some of those items in the batch 3) Note Koha will not let you import them unless you set funds for *all* records in the batch 4) Apply this patch 5) Note Koha no longer forces a budget to be selected in the pulldown Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=20789 Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/acqui/addorderiso2709.tt | 14 -------------- 1 file changed, 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:07:33 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:07:33 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-17-g7351828 Message-ID: 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, 18.05.x has been updated via 73518280966409bc3c112bc37e1f53dcb295b974 (commit) from c5dc6aeae728078ca76e88f8af8693772006d842 (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 73518280966409bc3c112bc37e1f53dcb295b974 Author: Jonathan Druart 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 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/members/accountline-details.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:12:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:12:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-19-g7e025fd Message-ID: 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, 18.05.x has been updated via 7e025fde1ae976cb12d4593b33579e12f5b284ec (commit) via e3cc49a61b13ff863262da6a397eb49a3045b14a (commit) from 73518280966409bc3c112bc37e1f53dcb295b974 (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 7e025fde1ae976cb12d4593b33579e12f5b284ec Author: Jonathan Druart 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 Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit e3cc49a61b13ff863262da6a397eb49a3045b14a Author: Kyle M Hall 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: opac/opac-suggestions.pl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:17:13 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:17:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-20-g76752c4 Message-ID: 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, 18.05.x has been updated via 76752c452dd6a593a3b43a8b80d2b39a21b71aad (commit) from 7e025fde1ae976cb12d4593b33579e12f5b284ec (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 76752c452dd6a593a3b43a8b80d2b39a21b71aad Author: Josef Moravec 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:34:27 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:34:27 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-23-g066223a Message-ID: 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, 18.05.x has been updated via 066223a034076da2f7e7860c3fcc6e84bb00a3a9 (commit) via b0574a0062089a58299d570e93012823f873b273 (commit) via 94eb0052ab6c7c3cbf847be7664c5fc661908870 (commit) from 76752c452dd6a593a3b43a8b80d2b39a21b71aad (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 066223a034076da2f7e7860c3fcc6e84bb00a3a9 Author: Jonathan Druart Date: Fri Jun 1 11:39:52 2018 -0300 Bug 20838: Add 2 small tests to check ref Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit b0574a0062089a58299d570e93012823f873b273 Author: Jonathan Druart 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 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 94eb0052ab6c7c3cbf847be7664c5fc661908870 Author: Jonathan Druart 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 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Library/Group.pm | 3 +-- catalogue/search.pl | 2 +- opac/opac-search.pl | 2 +- t/db_dependent/LibraryGroups.t | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:36:43 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:36:43 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-24-g7883b19 Message-ID: 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, 18.05.x has been updated via 7883b19de5f24551b36bf29133b04bc71ad4d56a (commit) from 066223a034076da2f7e7860c3fcc6e84bb00a3a9 (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 7883b19de5f24551b36bf29133b04bc71ad4d56a Author: Katrin Fischer 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: acqui/edifactmsgs.pl | 2 +- acqui/edimsg.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 5 13:58:50 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Jun 2018 11:58:50 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-28-g183e10c Message-ID: 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, 18.05.x has been updated via 183e10c13f6366b29dd79a7a9549f7d105d73f73 (commit) via 9c4040f37d705f2705fafc7a338695ddd76c1999 (commit) via a088aad171fda8deefca517517d35bee851f7ffc (commit) via a2b9db00cf468b1712263879f6afeddb3553bf61 (commit) from 7883b19de5f24551b36bf29133b04bc71ad4d56a (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 183e10c13f6366b29dd79a7a9549f7d105d73f73 Author: Nick Clemens 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 Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 9c4040f37d705f2705fafc7a338695ddd76c1999 Author: Kyle M Hall Date: Fri May 18 08:00:03 2018 -0400 Bug 17561: (QA follow-up) Update existing unit tests Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit a088aad171fda8deefca517517d35bee851f7ffc Author: Kyle M Hall Date: Fri May 18 07:20:06 2018 -0400 Bug 17561: (QA follow-up) Simplify new ReserveSlip code Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit a2b9db00cf468b1712263879f6afeddb3553bf61 Author: Benjamin Rokseth 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 Signed-off-by: Maksim Sen Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 45 +++++- circ/hold-transfer-slip.pl | 12 +- circ/returns.pl | 1 + .../prog/en/modules/circ/circulation.tt | 4 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- t/db_dependent/Letters/TemplateToolkit.t | 8 +- t/db_dependent/Reserves.t | 2 +- t/db_dependent/Reserves/ReserveSlip.t | 165 ++++++++++++++++++++ 8 files changed, 223 insertions(+), 16 deletions(-) create mode 100644 t/db_dependent/Reserves/ReserveSlip.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 6 14:08:36 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Jun 2018 12:08:36 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-9-g4cc1972 Message-ID: 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, 17.11.x has been updated via 4cc1972a2c992299609b62d8497c0b23e50aac86 (commit) via 04c0ff5fdb49ff4be9bfb49543672dda7151c61c (commit) via f5d754c2e6f6c397cf93897bb2d0b60a9ff3aa66 (commit) via b344b81e24b63e4451c49909436a98cfcc71a622 (commit) via 06e913dbc5d38e3a8047fb1cd98c5b4690f167d1 (commit) from f745ba2bc7c3450e744416cf9692ed399528bcdc (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 4cc1972a2c992299609b62d8497c0b23e50aac86 Author: Katrin Fischer Date: Wed May 16 02:45:02 2018 +0200 Bug 3886: Fix mismatch of required permissions for printing slips - Print summary (summary-print.pl) - Print quick slip (printslip.pl) - Print slip (printslip.pl) - Print overdues (print_overdues.pl) Perl scripts all require circulate_remaining_permissions, while in the template we were checking for edit_borrowers. Now the print pull down will only be visible if the patron has circulate or circulate_remaining_permissions. To test: - Verify that printing the listed slips works for staff users with either circulate or circulate_remaining_permissions and without edit_borrowers. Signed-off-by: Charles Farmer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 82908dc5bfa387742e2130330fdf1664b9d69c88) Signed-off-by: Fridolin Somers commit 04c0ff5fdb49ff4be9bfb49543672dda7151c61c Author: Katrin Fischer Date: Thu May 10 17:54:38 2018 +0000 Bug 20752: Fix capitalization on the files tab for patron files - Activate EnableBorrowerFiles - Go to any patron account in staff - Go to the files tab - Check that strings on the page ar all properly capitalized - button - legend on section Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 7fd76164079c0a791bbbe06640d339e87f99b0cf) Signed-off-by: Fridolin Somers commit f5d754c2e6f6c397cf93897bb2d0b60a9ff3aa66 Author: Katrin Fischer Date: Fri May 18 05:39:19 2018 +0000 Bug 20791: Correct capitalization on 'Notices & slips' page - Standardizes spelling to 'Notices & slips' Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 96ce61f54dfa1bf6f6355077fc665268ac69acdf) Signed-off-by: Fridolin Somers commit b344b81e24b63e4451c49909436a98cfcc71a622 Author: Jonathan Druart Date: Mon May 28 11:40:20 2018 -0300 Bug 20827: Display Fund's owner name when selected When a fund is created or edited and does not have a owner yet, the name of the patron will not be displayed when selected. The HTML element the JS code expects is not present in the DOM. Test plan: - Create a fund, set a owner - remove the owner, edit, etc. - Save - Edit again Make sure it works as expected. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit dc396756a050bf3fe07bb3141df6535a27fd9afb) Signed-off-by: Fridolin Somers commit 06e913dbc5d38e3a8047fb1cd98c5b4690f167d1 Author: Jonathan Druart Date: Tue Apr 24 15:38:41 2018 -0300 Bug 20652: Fix result sorting after search on limit only 1 chomp was missing, spaces were replaced with %20 This patch adds extra chomps, but it does not hurt Test plan: Advanced Search Choose an Item type (do not enter any other search limits) Search Click on Sort (it doesn't appear to matter what you sort on) Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 0f4f2c1fd8e653b511d94e8b209169c898a2a56b) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 7 10:11:09 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Jun 2018 08:11:09 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-24-gcd420d1 Message-ID: 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, 17.11.x has been updated via cd420d1165c72869875236de16e515f4592eeb99 (commit) via 4d441f38bb3a725fc4a19b344c74319e89e314a2 (commit) via 1bc4a4b78f0661f7ed66cae64f3a7f721d08df92 (commit) via 3b63cab416212eab8ea023c196f282e683d56d64 (commit) via cbeed6cf3db342e025b4d837ab135136d39a140e (commit) via d65b20c673eda825d7cb24425abdf43007cfd570 (commit) via 7a6d958bf3cec338adf239a7e69dd6168ab1cdfb (commit) via 3083e0f29462868caf97c841eb73ce3d8ca361ad (commit) via 7f120b8a2b9f57891759e515c31a85a4f3f979fd (commit) via 3f3ba9caf06ab8ca5dfa32551d9a84e52ba68f5d (commit) via 4a1db4935500f465eddef9199a31b5ef158fdb89 (commit) via 232dcacb692d6c2e917767eaa9daab7d139ccf13 (commit) via 140d171e651280d1b4a259d50db3c47d417739d9 (commit) via b6da7967f3b28c32b736b148210e5d5af1ec8a9b (commit) via e1e52c54936f4354584e465dcbd3acbe27effeb7 (commit) from 4cc1972a2c992299609b62d8497c0b23e50aac86 (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 cd420d1165c72869875236de16e515f4592eeb99 Author: Nick Clemens 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 Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 183e10c13f6366b29dd79a7a9549f7d105d73f73) Signed-off-by: Fridolin Somers commit 4d441f38bb3a725fc4a19b344c74319e89e314a2 Author: Kyle M Hall Date: Fri May 18 08:00:03 2018 -0400 Bug 17561: (QA follow-up) Update existing unit tests Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 9c4040f37d705f2705fafc7a338695ddd76c1999) Signed-off-by: Fridolin Somers commit 1bc4a4b78f0661f7ed66cae64f3a7f721d08df92 Author: Kyle M Hall Date: Fri May 18 07:20:06 2018 -0400 Bug 17561: (QA follow-up) Simplify new ReserveSlip code Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit a088aad171fda8deefca517517d35bee851f7ffc) Signed-off-by: Fridolin Somers commit 3b63cab416212eab8ea023c196f282e683d56d64 Author: Benjamin Rokseth 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 Signed-off-by: Maksim Sen Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit a2b9db00cf468b1712263879f6afeddb3553bf61) Signed-off-by: Fridolin Somers commit cbeed6cf3db342e025b4d837ab135136d39a140e Author: Katrin Fischer 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 7883b19de5f24551b36bf29133b04bc71ad4d56a) Signed-off-by: Fridolin Somers commit d65b20c673eda825d7cb24425abdf43007cfd570 Author: Jonathan Druart 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 Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 7e025fde1ae976cb12d4593b33579e12f5b284ec) Signed-off-by: Fridolin Somers commit 7a6d958bf3cec338adf239a7e69dd6168ab1cdfb Author: Kyle M Hall 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit e3cc49a61b13ff863262da6a397eb49a3045b14a) Signed-off-by: Fridolin Somers commit 3083e0f29462868caf97c841eb73ce3d8ca361ad Author: Kyle M Hall Date: Mon May 21 14:56:58 2018 -0400 Bug 20798: Client side validation for for fund selection prevents adding only some records to a basket Bug 19453 "fixed" the fund validation that never actually worked. This validation should be removed altogether instead. It is overly simplistic and simply checks to see if each record in the batch has a fund selected regardless of whether that record will be imported or not. In addition, the code completely ignores items generated by MarcItemFieldsToOrder such that even if items on that page have a fund selected, the javascript forces the librarian to make a selection from the left-hand fund pulldown even though it will not be used. Considering this bad validation is basically 'new' as it never worked before, the most sensible course of action would be to 'undo' the change and remove the validation. Test Plan: 1) Add records to a basket from an import batch 2) Select only some of those items in the batch 3) Note Koha will not let you import them unless you set funds for *all* records in the batch 4) Apply this patch 5) Note Koha no longer forces a budget to be selected in the pulldown Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=20789 Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit c5dc6aeae728078ca76e88f8af8693772006d842) Signed-off-by: Fridolin Somers commit 7f120b8a2b9f57891759e515c31a85a4f3f979fd Author: Marcel de Rooy Date: Wed May 2 16:13:20 2018 +0200 Bug 20696: Fix a few ugly "eq undef" comparisons in Search.pm Comparisons like $a eq undef should normally raise a warning like: Use of uninitialized value in string eq at ... But unfortunately we still suppress warnings here and there. Test plan: [1] Just read this patch and confirm the small changes. [2] Git grep on "eq undef" and do not find other occurrences. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Passes test plan and QA tools. Searching works correctly. Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 66f5b793ed8e52372466122263cac0ddd84dea63) Signed-off-by: Fridolin Somers commit 3f3ba9caf06ab8ca5dfa32551d9a84e52ba68f5d Author: Nick Clemens Date: Fri May 18 14:01:09 2018 +0000 Bug 20781: Set a minimum enrollemnt period 'in months' of 1 To test: 1 - Browse to Admin->Patron Categories 2 - Click '+ New category' 3 - Enter data as required, however, enter 0 in 'Enrolment period' -> 'in months' 4 - Save 5 - View the list of categories, the new category has 'Enrolment period' = 'until' 6 - Create a patron in this category, note their dateexipry is '0000-00-00' 7 - Search for them 8 - internal server error 9 - Delete that patron 10 - Apply patch 11 - Edit the category, note you cannot save with 0 months 12 - Set 1 month and save 13 - Create a patron in this cateogry 14 - Note they have a valid dateexpiry 15 - Search for them 16 - All works 17 - Create a new category and verify you cannot add with 0 months Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 59989e7be4e4c697b0ef316eab53b6450f5edb58) Signed-off-by: Fridolin Somers commit 4a1db4935500f465eddef9199a31b5ef158fdb89 Author: Tomas Cohen Arazi Date: Thu Apr 5 10:06:37 2018 -0300 Bug 20191: (QA follow-up) Require Jessie's Test::MockTime Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit aaea46594215c88b4459cd882f1d869faeb2e2d8) Signed-off-by: Fridolin Somers commit 232dcacb692d6c2e917767eaa9daab7d139ccf13 Author: Mark Tompsett Date: Thu Apr 5 01:31:38 2018 +0000 Bug 20191: Use Test::MockTime to hold time still The problem is the calls to HTTP::OAI::Header, etc. may reference gmtime which is continually changing by the second. By forcing time to lock for all the tests, except the last one, we can be assured things should not fail. TEST PLAN --------- install libtest-mocktime-perl apply the patch restart_all in kshell, prove t/db_dependent/OAI/Server.t run koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit b76ad51b9d45d67746bddf27a9376e810c1b2d1e) Signed-off-by: Fridolin Somers commit 140d171e651280d1b4a259d50db3c47d417739d9 Author: Jonathan Druart Date: Fri Feb 16 12:12:00 2018 -0300 Bug 20191: Use find with unique key combination To prevent unexpected issues later. Signed-off-by: Jonathan Druart (cherry picked from commit 04005f2ea12c270f2895738eb434e5292218b789) Signed-off-by: Fridolin Somers commit b6da7967f3b28c32b736b148210e5d5af1ec8a9b Author: Tomas Cohen Arazi Date: Thu Feb 15 14:14:18 2018 -0300 Bug 20191: Make OAI/Server.t tests use timestamps from the DB Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 2f90cd2be0affbdd2e2bc0c2223bfcf0cf65a13a) Signed-off-by: Fridolin Somers commit e1e52c54936f4354584e465dcbd3acbe27effeb7 Author: Jonathan Druart Date: Mon May 14 14:04:01 2018 -0300 Bug 20767: Display a stack trace when a method is not covered by tests When a method is not allowed yet (not covered by tests), developers get an error the is not really useful: "The method XXX is not covered by tests!" It would be more useful to have a stack trace in order to know where this error come from. Test plan: Modify some code to display this stack trace and confirm it makes sense to have it, i.e. it will make debug easier Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit b9dffc169ddb7a3a32a071c4a004420814fa3a3f) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 + C4/Reserves.pm | 45 +++++- C4/Search.pm | 7 +- Koha/Object.pm | 6 +- Koha/Objects.pm | 10 +- acqui/edifactmsgs.pl | 2 +- acqui/edimsg.pl | 2 +- circ/hold-transfer-slip.pl | 12 +- circ/returns.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/js/categories.js | 3 +- .../prog/en/modules/acqui/addorderiso2709.tt | 13 -- .../prog/en/modules/circ/circulation.tt | 4 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- opac/opac-suggestions.pl | 15 +- t/db_dependent/Koha/Objects.t | 27 +++- t/db_dependent/Letters/TemplateToolkit.t | 8 +- t/db_dependent/OAI/Server.t | 29 +++- t/db_dependent/Reserves.t | 2 +- t/db_dependent/Reserves/ReserveSlip.t | 165 ++++++++++++++++++++ 19 files changed, 297 insertions(+), 61 deletions(-) create mode 100644 t/db_dependent/Reserves/ReserveSlip.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 7 10:34:03 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Jun 2018 08:34:03 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.12-2-g628f777 Message-ID: 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, 17.05.x has been updated via 628f77746e8d471ec288574c1437dc5e56b0b657 (commit) via ccb318bbf76bc10737706c9db99a18eed32ca7d4 (commit) from 203da9a2777ea98d5aaacdef7a7ef02d93e92014 (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 628f77746e8d471ec288574c1437dc5e56b0b657 Author: Katrin Fischer 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 7883b19de5f24551b36bf29133b04bc71ad4d56a) Signed-off-by: Fridolin Somers (cherry picked from commit cbeed6cf3db342e025b4d837ab135136d39a140e) Signed-off-by: Fridolin Somers commit ccb318bbf76bc10737706c9db99a18eed32ca7d4 Author: Jonathan Druart Date: Mon May 28 11:40:20 2018 -0300 Bug 20827: Display Fund's owner name when selected When a fund is created or edited and does not have a owner yet, the name of the patron will not be displayed when selected. The HTML element the JS code expects is not present in the DOM. Test plan: - Create a fund, set a owner - remove the owner, edit, etc. - Save - Edit again Make sure it works as expected. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit dc396756a050bf3fe07bb3141df6535a27fd9afb) Signed-off-by: Fridolin Somers (cherry picked from commit b344b81e24b63e4451c49909436a98cfcc71a622) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/edifactmsgs.pl | 2 +- acqui/edimsg.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 8 07:28:16 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Jun 2018 05:28:16 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-25-gd6da091 Message-ID: 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, 17.11.x has been updated via d6da091d631dc67b0eb4a750a971b7d9dba45c56 (commit) from cd420d1165c72869875236de16e515f4592eeb99 (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 d6da091d631dc67b0eb4a750a971b7d9dba45c56 Author: Jonathan Druart Date: Thu May 3 15:40:11 2018 -0300 Bug 20685: Escape letter template content in textarea Test plan: enter the following text into the Email template for 'HOLD_SLIP' in Home ? Tools ? Notices & Slips ? Modify notice

<>, <>


<> <>
<>
<>, <> <>


Edit it again Without this patch you will get: Signed-off-by: Barton Chittenden Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 305d3c36cb685fabce3ec4357ed769c25b12eb73) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 8 15:58:54 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Jun 2018 13:58:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-55-g6650c7e Message-ID: 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 6650c7efb41072a2937bfb6ce90ef08f5c442066 (commit) via f7176c356de79ef76e9191be4c822ffb5adb622d (commit) via cbb5207c1cc5f196ad2682a24ae1db7fb9301876 (commit) via eeeb15c8f8db59c36108110a417b132a5d8bab85 (commit) via 2529a218eef278278bc6bfbfe28267b4acbf9c17 (commit) via d86ff0f5db72a1291958458e07ac7d9868ac4ac0 (commit) via 3e91d99a15f5882312378a06af4851cbb4237ef8 (commit) via 564e9ce1ee4fbaa4a52bccd3f087abfafb69d985 (commit) via 3f01fcae9723edf0485f431878a34551e814090a (commit) via 870913b3c3a83568c219d6e22b7110ffd217370c (commit) via 20bd2d2bd50e4e8b4f8b40e7d1df521a0e01bc09 (commit) via 11223294b6167822708893dbde3ff84d55155b69 (commit) via d4cf19ac04ce49cc980cdf88dfa351b3c7740130 (commit) via 515cab0c46467efbdcb7e4cbbac7ccdb38e8845a (commit) via f8ea20344b931bb92e6b48639ae626f604853ffe (commit) via 421746dd6337814f96adc6d79a773a2a23f50556 (commit) via 3d68ab447eda3eb5a25444b1ceaeea96b446c64b (commit) via 495512f6eacdc306932290784cca4e5d01a053f9 (commit) via 6491ba0233ac019614487efafef6e35c9ffef6eb (commit) via 6049836023be61771c25fe038f02378ede96fff5 (commit) via 326aa0667d86dc8c0d8a8becf440bfb25d2c76c1 (commit) via 50af8d840f0620196b39e27fbf674bab3ae4463b (commit) via 6123e213e6a4c9353175e0cf2e2a638d03c95b1c (commit) from 63673d70cd08b198d3b904b73da82f1e06d64f7b (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 6650c7efb41072a2937bfb6ce90ef08f5c442066 Author: Marcel de Rooy Date: Fri Jun 1 09:21:48 2018 +0200 Bug 20851: Add module to circ/article-request-slip.pl See bug 20468, comment7. Although the script seems to compile well, we better add the module here. Trivial change. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit f7176c356de79ef76e9191be4c822ffb5adb622d Author: Owen Leonard Date: Mon May 14 15:08:13 2018 +0000 Bug 20756: Compiled CSS This patch contains the compiled CSS file Signed-off-by: S?verine QUEUNE Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit cbb5207c1cc5f196ad2682a24ae1db7fb9301876 Author: Owen Leonard Date: Mon May 14 15:07:42 2018 +0000 Bug 20756: OPAC "Share list" button should be styled with an icon This patch adds a new "share" icon to the sprite image used to style controls in the OPAC. The "share list" links now have a "sharelist" class which is used to style the links with the new icon. Also changed: Fixed the page structure markup of opac-shareshelf.tt. To test you must have the OpacAllowSharingPrivateLists system preference enabled. - Log in to the OPAC and go to Lists -> Your lists. - Create one or more private lists if necessary. - In the table of your lists there should be a "Share" link with the new icon. - View one of these lists and confirm that the "Share" link at the top of the table of list items. - Click through to the share list page and confirm that the page looks correct. Signed-off-by: S?verine QUEUNE Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit eeeb15c8f8db59c36108110a417b132a5d8bab85 Author: Bernardo Gonzalez Kriegel Date: Wed May 2 19:42:22 2018 -0300 Bug 20700: MARC21 add/update leader/007/008 codes This add/updates some codes from updates 22 (Apr/16) and 23 (Nov/16) Update 22 https://www.loc.gov/marc/up22bibliographic/bdapndxg.html Sound Recording 007/03 n (new) Sound Recording 007/10 n (new) Sound Recording 007/01 r (new) Sound Recording 007/01 s (new) Update 23 https://www.loc.gov/marc/up23bibliographic/bdapndxg.html Leader/18 n (new) Music 008/20 p (new), b (renamed) To test: 1) Apply the patch 2) Clean your browser cache 3) Go to cataloguing -> new record 4) Leader plugin: check leader/18, new option 'n' 5) 007 Plugin: a) Sound recording check 007/01 new 'r' check 007/03 new 'n' check 007/10 new 'n' b) Electronic resource check 007/01 new 's' 6) 008 Plugin: Music, check 008/20 renamed 'b', new 'p' Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 2529a218eef278278bc6bfbfe28267b4acbf9c17 Author: Jonathan Druart Date: Wed Jun 6 11:12:24 2018 -0300 Bug 20886: Do not cast undef to 0 (TO_JSON) We should not cast undefined values to 0. Signed-off-by: Andrew Isherwood Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi This was a bug I introduced. I think the fix is right, and if something gets broken for this, it means it was making the wrong assumptions on the data. Signed-off-by: Nick Clemens commit d86ff0f5db72a1291958458e07ac7d9868ac4ac0 Author: Jonathan Druart Date: Mon Jun 4 12:14:10 2018 -0300 Bug 20778: (bug 19777 follow-up) Fix subscription deletion Caused by commit 666a1b276097785c2a7c33e718f26f5512b3d972 Bug 19777: Move template JavaScript to the footer: Serials, part 3 TT vars should not be used in .js files Test plan: Delete a subscription, confirm you see the confirmation popup and that the it deletes the subscription correctly after it has been confirmed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3e91d99a15f5882312378a06af4851cbb4237ef8 Author: Owen Leonard Date: Tue May 1 13:08:18 2018 +0000 Bug 20053: Drop type attribute "text/javascript" in OPAC templates This patch is a reimplementation of the original from Indranil Das Gupta and the QA follow-up from Julian Maurice. Original test plan: Conformance rules for HTML5 is generating warnings for