[koha-commits] main Koha release repository branch master updated. v18.05.00-897-g051eef7
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 2 02:24:04 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 051eef767ab3723a63e1bfff50864ab441e05f23 (commit)
via 4859e49539e37f08689df3ba001739711f1332a4 (commit)
via c6e44c9c6bb78bfb3edeacf877c5edb114aab558 (commit)
via d1bf2238c49bad5471b467aae4a5f680639cee97 (commit)
via 15670cd590e4a1efc01bb9bd1648162781486f5b (commit)
via 8b1c37929509ea880eafdd0f0650f301d314b034 (commit)
via 7858cae1bf5fbdfa07a2d03fee534d1613553146 (commit)
via b3dee0daf29c4593aee2781307853845a6cd3735 (commit)
via 5e6f4f1f4fb346351dcfc6c580888022641d4b6a (commit)
via 3f20c8c65172c1a32e7d2b20ed2506199423f103 (commit)
via 17db3ab05cb25d08f0790cff9eed5f0f75ca8107 (commit)
via 08386cd3f05c5bc4dc6306e3a1d6c4878cce7c86 (commit)
via 11885e75c04fa53cd88daae1ec0dc4a2a8ecd1f7 (commit)
via fca98de0e8663c4e7049e55ac2cc2600c9b659a5 (commit)
via b04df7d606afa7ec7a43c788dcfcd06e595ccabd (commit)
from ccc40975e3cda7966b67be297dd16891aa8dc314 (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 051eef767ab3723a63e1bfff50864ab441e05f23
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 2 00:09:12 2018 +0000
Bug 18639: (follow-up) Remove debugging code
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4859e49539e37f08689df3ba001739711f1332a4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 2 00:05:22 2018 +0000
Bug 21403: DBRev 18.06.00.035
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c6e44c9c6bb78bfb3edeacf877c5edb114aab558
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 12:14:17 2018 -0300
Bug 21403: Do not overwrite the options if modified locally
Just in case...
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d1bf2238c49bad5471b467aae4a5f680639cee97
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 25 13:16:09 2018 +0000
Bug 21403: Add Indian Amazon Affiliate option to AmazonLocale setting
This patch adds an "IN" option to the AmazonLocale setting, allowing
Indian libraries to use their Amazon Affiliate ID in Koha's links to
Amazon.
To test, apply the patch and run updatedatabase.
- Go to Administration -> System preferences -> Enhanced content.
- Enable the OPACAmazonCoverImages preference.
- Enter a dummy ID in the AmazonAssocTag preference.
- Confirm that you can select "Indian" for the AmazonLocale preference.
- Select "Indian" and save.
- Open a record in the OPAC and confirm that the cover image links to
Amazon.in and includes the ID you entered in AmazonAssocTag.
- Do the same with a record in the staff client.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 15670cd590e4a1efc01bb9bd1648162781486f5b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 27 12:59:01 2018 +0000
Bug 21430: Update two-column templates with Bootstrap grid: Reports part 3
This patch modifies several reports templates to use the
Bootstrap grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Reports -> Items with no checkouts
- Reports -> Catalog statistics wizard
- Reports -> Guided reports dictionary
- Reports -> Guided reports, saved SQL reports
- Reports -> Average loan time
- Reports -> Circulation statistics wizard
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8b1c37929509ea880eafdd0f0650f301d314b034
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 3 12:49:35 2018 +0000
Bug 21429: Update two-column templates with Bootstrap grid: Reports part 2
This patch modifies several reports templates to use the
Bootstrap grid instead of YUI.
A couple of markup errors have been fixed in reports/itemslost.tt.
This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Reports -> Lost items
- Reports -> Catalog by item type
- Reports -> Orders by fund
- Reports -> Holds statistics wizard
- Reports -> Serials statistics wizard
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7858cae1bf5fbdfa07a2d03fee534d1613553146
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 3 11:58:10 2018 +0000
Bug 21428: Update two-column templates with Bootstrap grid: Reports part 1
This patch modifies several administration templates to use the
Bootstrap grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Reports -> Acquisitions statistics wizard
- Reports -> Patrons with the most checkouts
- Reports -> Patrons who haven't checked out
- Reports -> Patrons statistics wizard
- Reports -> Cash register statistics wizard
- Reports -> Most-circulated items
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b3dee0daf29c4593aee2781307853845a6cd3735
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 11:38:04 2018 -0300
Bug 21385: Define the Koha object class for orders
It fixes the following issue:
t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t .. 1/40 Can't
locate object method "_new_from_dbic" via package "Koha::Aqorder"
(perhaps you forgot to load "Koha::Aqorder"?) at
/home/vagrant/kohaclone/Koha/Object.pm line 230.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5e6f4f1f4fb346351dcfc6c580888022641d4b6a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 24 13:33:59 2018 +0100
Bug 21385: (follow-up) make query consistent
The expected items query wasn't consistent with other queries in this
module with regards to identifying cancelled orders
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3f20c8c65172c1a32e7d2b20ed2506199423f103
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 24 13:23:25 2018 +0100
Bug 21385: Add Unit Tests
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 17db3ab05cb25d08f0790cff9eed5f0f75ca8107
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 21 15:10:15 2018 +0100
Bug 21385: Correctly count all items in basket for booksellers list
To reproduce:
1) Create a basket with 2 biblios, one with 2 items and one with 1 item
2) Search for vendors and note the basket above should contain 'Item
count 3', 'Biblio count 2', 'Items expected 3'
3) Receive shipment, and only receive 1 of the items on the biblio with
2 items above.
4) Search for vendors and note that the 'Item count' for the basket
above is now '2'.
The item count for a closed basket should remain the same and should
differ from the 'items expected' count some items have been recieved.
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch:
FAIL C4/Acquisition.pm
FAIL spelling
RECIEVED ==> RECEIVED
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 08386cd3f05c5bc4dc6306e3a1d6c4878cce7c86
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 16:04:56 2018 -0300
Bug 21448: Fix copy repeated subfields when linking an authority with 6xx
The reported issue was:
On field 606, if I use an Authority with multiple "x" subfields, it will
add just the first "x"
Error in the logs:
Odd number of elements in anonymous hash at /home/vagrant/kohaclone/authorities/blinddetail-biblio-search.pl line 97.
We should pass a ref (!), caused by
commit a7df1f9f8eb9ed16246964d94dd8a69b756b6551
Bug 18904: (follow-up) Retrieve subfield in the order they are stored
Test plan:
Edit an authority and add several $x to 600
Link this authority to a bibliographic record
=> Without this patch only the first subfield is copied
=> With this patch applied they are all copied
Signed-off-by: José Anjos <joseanjos at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 11885e75c04fa53cd88daae1ec0dc4a2a8ecd1f7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 13 13:23:00 2018 -0300
Bug 21176: Fix due date calculation when high holds and TimeFormat is 12hr
What we were doing was wrong and is still wrong. The output_pref should not be done
in modules or script, only template side.
Much more work would be needed to clean the situation. This patch provides less changes
as possible to, hopefully, not introduce side-effects.
To recreate:
1 - Enable decreaseLoanHighHolds, set to 1 day and more than 0 holds
2 - Set TimeFormat to 12 hour
3 - Find or create a record with two items
4 - Place a hold on one of them
5 - Checkout the other to a different patron
6 - Note the warning message display correct time
7 - Confirm the checkout
8 - Note the item is due at 11:59AM
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fca98de0e8663c4e7049e55ac2cc2600c9b659a5
Author: Johan Larsson <johan.larsson at ub.gu.se>
Date: Mon Oct 1 14:48:54 2018 +0200
Bug 21462: (bug 15136 follow-up) Shift column numbering
Wrong column was selected for filtering the table.
This was caused by changing the hmtl-structure of the table
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b04df7d606afa7ec7a43c788dcfcd06e595ccabd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 14:18:15 2018 -0300
Bug 17602: Add missing html filters
RM update: Remove accidental tabs from updatedatabase.pl
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 8 ++-
C4/Circulation.pm | 4 +-
C4/External/Amazon.pm | 1 +
Koha.pm | 2 +-
Koha/Schema/Result/Aqorder.pm | 7 +-
acqui/finishreceive.pl | 1 -
authorities/blinddetail-biblio-search.pl | 2 +-
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 17 +++--
.../admin/preferences/enhanced_content.pref | 1 +
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/reports/acquisitions_stats.tt | 27 ++++----
.../prog/en/modules/reports/bor_issues_top.tt | 26 +++----
.../prog/en/modules/reports/borrowers_out.tt | 26 +++----
.../prog/en/modules/reports/borrowers_stats.tt | 26 +++----
.../prog/en/modules/reports/cash_register_stats.tt | 29 ++++----
.../prog/en/modules/reports/cat_issues_top.tt | 26 +++----
.../prog/en/modules/reports/catalogue_out.tt | 26 ++++---
.../prog/en/modules/reports/catalogue_stats.tt | 27 ++++----
.../prog/en/modules/reports/dictionary.tt | 26 ++++---
.../en/modules/reports/guided_reports_start.tt | 42 ++++++------
.../prog/en/modules/reports/issues_avg_stats.tt | 27 ++++----
.../prog/en/modules/reports/issues_stats.tt | 26 +++----
.../prog/en/modules/reports/itemslost.tt | 25 ++++---
.../prog/en/modules/reports/itemtypes.tt | 27 ++++----
.../prog/en/modules/reports/orders_by_budget.tt | 25 ++++---
.../prog/en/modules/reports/reserves_stats.tt | 27 ++++----
.../prog/en/modules/reports/serials_stats.tt | 28 ++++----
.../bootstrap/en/includes/opac-bottom.inc | 2 +-
.../en/modules/opac-recordedbooks-search.tt | 10 +--
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
.../Acquisition/GetBasketsInfosByBookseller.t | 72 +++++++++++++++++++-
34 files changed, 366 insertions(+), 241 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list