[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.02-70-g005a799
Git repo owner
gitmaster at git.koha-community.org
Tue Jul 30 08:35:30 CEST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 19.05.x has been updated
via 005a799051b38edb1c65070581996654b21a8e87 (commit)
via d673e0387e040170830b57cba0db9ce3aa8c67b0 (commit)
via d8bddf489e40274a822d444729247d5de717b6dc (commit)
via cea0189b1555859a7ae55cdc6763e6e0dc43574a (commit)
via 02e09a87951b6f9214c6c89d0dcbbda70e0189ab (commit)
via 9c9594ecfad469e0fb1e1f85db7990ab85a80b23 (commit)
via 7c5bc84508588261c0b4946fca363e2174325651 (commit)
via 444727e3e75b0f33c6b93006455debec15e725fe (commit)
via f48f1a981c13738c104ae91fce944ad557700599 (commit)
via a0f015884c978ee2df5cf39da7c15a5138e5389f (commit)
via 357d2c58e47e9abe72b8b0221d066f49c0707176 (commit)
via 87e0e88468e4af97426e4027b96d3c18d23d3e98 (commit)
via 55ace0434aa16511b69b5fd6bc20916a61c3897a (commit)
from ede934b90799b0127ae75018e126abe865a4dbed (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 005a799051b38edb1c65070581996654b21a8e87
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jun 10 18:54:30 2019 +0000
Bug 12537: Don't retrieve XISBN results for the same biblionumber
For a biblio with multiple ISBNS we sometimes get our own record back when
check XISBN, we should test for this
To test:
1 - Edit a record in the catalogue, add two isbns:
0521240670
0521284198
2 - Enable ThingISBN and FRBRizeEditions and OPACFRBRizeEditions
3 - View the record in staff and OPAC
4 - You should see editions tab pointing to the same record
5 - Apply patch
6 - Reload the record details, you should no longer see editions tab
7 - Add the second ISBN to another record
8 - Reload details for original record, you shoudl see editions linking to the record with second ISBN
9 - prove -v t/db_dependent/XISBN.t
NOTE: Current tests don't work under elasticsearch, but the code does, tests should be rewritten on another bug
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bouzid Fergani <bouzid.fergani at inlibro.com>
Signed-off-by: Arthur Bousquet <arthur.bousquet at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit fd5686b156ceb10958cab728b7695aa2b39b9933)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d673e0387e040170830b57cba0db9ce3aa8c67b0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jun 24 11:54:56 2019 +0000
Bug 23192: Correct tab input on waiting_holds.inc
To test:
1 - Place 2 holds
2 - Confirm the holds
3 - In the db change the expiration date:
UPDATE reserves SET expirationdate = '2019-01-01';
4 - Go to Home->Circulation->Holds awaiting pickup
5 - View your holds on the 'Holds waiting over' tab
6 - Inspect the cancel button for one of the holds, note tab = "holdswaiting"
7 - Apply patch
8 - Refresh the page
9 - Inspect the buttton, note tab = "holdsover"
10 - Cancel the hold
11 - Note you return to the holds over tab
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f45516e73ab6ac8c2240f206bd11a88e4935359c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d8bddf489e40274a822d444729247d5de717b6dc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 4 12:57:17 2019 +0000
Bug 23266: Add to cart fires twice on shelf page
Remove some duplicate functionality between opac-bottom and opac-shelves.
Test plan:
[1] Before this patch, add to cart from a shelf page. Observe that the
basket count is incremented with 2.
[2] After this patch, it should be incremented with 1.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 076d5be767d0b6667ce8aab0ae7b56116e48d48f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cea0189b1555859a7ae55cdc6763e6e0dc43574a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 25 11:44:12 2019 +0000
Bug 23194: Fix other occurences
Throughout staff client and course reserves we also show the field with HTML filter, maybe we shouldn't?
The items lost report also included the note as a title element on title and barcode links, I removed this
as the note displays in that table
To test:
1 - Add a link to publicnotes for an item
<a href="www.google.com">Cats!</a>
2 - View opac details, confirm the note is a link
3 - Same for staff side
4 - Add item to a course reserve
UseCourseReserves preference must be set to 'Use'
From the course reserves module you will need to add a course (and possibly a department first)
Adding should be intuitive
5 - Confirm note is a link in course details on staff and opac
6 - Perform a batch checkout, confirm the itemnote shows as a link
You will need to enable the system preference: BatchCheckouts and add a patron category to: BatchCheckoutsValidCategories
Then a link should be available from checkout for a patron in that category
7 - Mark the item as lost
8 - Go to Reports->Items lost
9 - Confirm the note is a URL and that title and barcode links don't show the note
10 - Click the barcode to go to moredetails for the item - in this case note should display as editable text, not a link
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f447658f850bca5ebcdb6f29a5572c1c1707f942)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 02e09a87951b6f9214c6c89d0dcbbda70e0189ab
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 25 11:39:54 2019 +0000
Bug 23194: Allow HTML in item public notes to be processed on OPAC details
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 3f40c32cbbc63dbc5f00d127edfeaa0732f4ab23)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 9c9594ecfad469e0fb1e1f85db7990ab85a80b23
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 27 13:38:50 2019 +0000
Bug 23227: Remove type attribute from script tags: Reports
This patch removes the "type" attribute from <script> tags in two
reports templates.
To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:
- Reports -> Dictionary
- Delete
- Specifying a date range for a date column
- Reports -> Items lost
- Report results
-> Datatables functionality
-> Selection tools for export
Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit d88709ec2d45df6f2a8e90ae7a94f9724b7e8e7e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7c5bc84508588261c0b4946fca363e2174325651
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 21 18:25:39 2019 +0000
Bug 22957: Remove type attribute from script tags: Staff client includes 1/2
This patch removes the "type" attribute from <script> tags in several
staff client include files. Also removed: Obsolete "//<![CDATA[ //]]>"
markers.
This patch also makes minor indentation changes, so diff using the "-w"
flag.
To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:
- Acquisitions -> Vendor (uses acuisitions-toolbar.inc)
- Acquisitions -> Vendor -> Add to basket -> From a new (empty) record
(uses additem.js.inc)
- Catalog -> Search results -> Bibliographic detail view. (uses
browser-strings.inc, catalog-strings.inc, datatables.inc, and
format_price.inc )
- Tools -> Label creator -> Manage -> Label batches -> Export batch
(uses greybox.inc)
Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0658d84732cadb3bec44126d9efbd12a87547228)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 444727e3e75b0f33c6b93006455debec15e725fe
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 26 12:39:59 2019 +0000
Bug 22951: (follow-up) Fix indentation
This patch fixes indentation related to the markup corrections in the
previous patch. It contains no textual changes.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 178a805a5d3055dd17050111c1227a9d5cef1b96)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f48f1a981c13738c104ae91fce944ad557700599
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 26 12:43:36 2019 +0000
Bug 22951: Markup error in OPAC holds template
This patch makes minor markup changes to the OPAC holds template in
order to fix validation errors.
To test, apply the patch and go through the process of placing a
hold in the OPAC. Test various aspects of the process, including cases
where the hold is blocked and an error message is displayed (for
instance, when there are no items to be placed on hold).
The page should work correctly and validating the source should
return no relevant errors.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Frederik Chenier <frederik.chenier at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e0991ae2358224a15b6880c96b8472a3cd814b1b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a0f015884c978ee2df5cf39da7c15a5138e5389f
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jun 27 20:45:27 2019 -0400
Bug 21000: Force case sensitivity on Getopt::Long
Before patch: -D and -d are mistaken for --debug
$ sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -r ~/debian -v 19.06~git --autoversion -d -D="stretch"
Option d does not take an argument
git status --porcelain -unormal
git rev-parse --short=8 HEAD
dch --force-distribution -D "squeeze-dev" -v "19.06~git+20190627205913.466f99e4-1" "Building git snapshot."
dch warning: Recognised distributions are:
experimental, unstable, testing, stable, oldstable, oldoldstable,
{bullseye,buster,stretch,jessie,wheezy}-proposed-updates,
{testing,stable,oldstable,oldoldstable}-proposed-updates,
{bullseye,buster,stretch,jessie,wheezy}-security,
{testing,stable,oldstable,oldoldstable}}-security, jessie-backports, stretch-backports and UNRELEASED.
Using your request anyway.
NOTE: squeeze-dev in the first dch line and warning about Option d.
Apply patch: -D and -d are differentiated correctly.
$ sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -r ~/debian -v 19.06~git --autoversion -d -D="stretch"
git status --porcelain -unormal
git rev-parse --short=8 HEAD
dch --force-distribution -D "stretch" -v "19.06~git+20190627210316.b3f919a7-1" "Building git snapshot."
dch warning: Previous package version was Debian native whilst new version is not
dch -r "Building git snapshot."
NOTE: No more 'Option d' error, and "stretch" in the first dch line.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5c5d158b1bc37c63196be9ae405e4a2563315dbc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 357d2c58e47e9abe72b8b0221d066f49c0707176
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu May 30 14:15:52 2019 -0400
Bug 23018: Refunding a lost item fee may trigger error if any fee has been written off related to that item
If a lost item fee is written off, it creates a writeoff with the same itemnumber but the amount column is a negative number.
Now, when the lost item is returned, it calls _FixAccountForLostAndReturned which searchs for all accountlines with an account type of 'L' or 'W'.
Then, if the *first* of those lines has an outstanding balance, a credit is created and *all* the lines found are passed to $credit->apply. The apply method then calls is_debit on each line and when it hits the writeoff, it throws an exception ( Koha::Exceptions::Account::IsNotDebit ).
When this happens, the credit is creating but not applied the the outstanding lost item fee, and the librarian is presented with an error page.
It seems like the solution is to only fetch the first result since it seems like that is the only one we should be operating on.
Test Plan:
1) Create a lost item with a fee
2) Create a manual debit using the barcode of the item
3) Write off that manual debit
4) Check in the item, note the error
5) Apply this patch
6) Repeat steps 1-3
7) Check in the item, no error!
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit d4f41cc8aafbb9854b20d1de7115a81e1eb73b9c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 87e0e88468e4af97426e4027b96d3c18d23d3e98
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 31 16:13:20 2017 +0000
Bug 19012: Note additional columns that are required during patron import
This adds surname and cardnumber to the list of required columns on the
import tool screen and help page
To test:
Read the updated notes, verify it is true and understandable
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 67f86868155725b3fec29d38a54e8c161dd72c78)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 55ace0434aa16511b69b5fd6bc20916a61c3897a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 8 17:41:16 2019 +0100
Bug 23280: Silence warning
Corrects a typo in t/db_dependent/selenium/patrons_search.t introduced
by bug 22781.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 481d34613183300bff31f7f6a66abe8aa893e07a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 2 +-
C4/XISBN.pm | 6 +-
catalogue/detail.pl | 2 +-
debian/build-git-snapshot | 2 +-
.../prog/en/includes/acquisitions-toolbar.inc | 12 +-
.../intranet-tmpl/prog/en/includes/additem.js.inc | 28 +-
.../prog/en/includes/browser-strings.inc | 4 +-
.../prog/en/includes/catalog-strings.inc | 2 +-
.../intranet-tmpl/prog/en/includes/datatables.inc | 4 +-
.../prog/en/includes/format_price.inc | 2 +-
.../intranet-tmpl/prog/en/includes/greybox.inc | 2 +-
.../prog/en/includes/waiting_holds.inc | 2 +-
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../prog/en/modules/circ/on-site_checkouts.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 4 +-
.../en/modules/course_reserves/course-details.tt | 2 +-
.../prog/en/modules/reports/dictionary.tt | 2 +-
.../prog/en/modules/reports/itemslost.tt | 8 +-
.../prog/en/modules/tools/import_borrowers.tt | 2 +-
.../bootstrap/en/modules/opac-course-details.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 620 ++++++++++----------
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +-
opac/opac-detail.pl | 2 +-
t/db_dependent/XISBN.t | 20 +-
t/db_dependent/selenium/patrons_search.t | 6 +-
27 files changed, 382 insertions(+), 366 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list