[koha-commits] main Koha release repository branch master updated. v17.05.00-15-g281e125
Git repo owner
gitmaster at git.koha-community.org
Mon Jun 5 16:55:49 CEST 2017
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 281e1253777d2bd635610075fe610bedb2d47360 (commit)
via cbb5096934907ec56df27d6ee3e77d752cd5e401 (commit)
via c470b3e38486e3c6040a10f6b0bf90af069f4566 (commit)
via c59e395b749132080fefb81e5b12f8c0b6654665 (commit)
via 60b31a7a2219dea16f124684bd21e6d12a35c05a (commit)
via 151cdcd133d8618a3faf9b47723d66ac3dc71b4e (commit)
via cc91ce5997fab0e186e75945f3df87ce413ce4fd (commit)
via cf5a1d5e5905664cd1a73691a75ecca40e575b99 (commit)
via 8e7718ee655fd9846b2a44ad436995b9ea9a1f90 (commit)
via f466a856a99f3109985e3867296d9b7467f32e58 (commit)
via e0acd9bdf8500aa3cc2e5aeccbd1631f0b841040 (commit)
via ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f (commit)
via cc54b596c3bb225f45ca0443728452444b807d4e (commit)
via bb22703dcaa53400c17674b8bb7ba1cf76dffac8 (commit)
via fe22e9d99c99881077cc5abf837125b8e1c107c3 (commit)
from 5d94ff751379c9922ce5e197516a915f471b298a (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 281e1253777d2bd635610075fe610bedb2d47360
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Apr 29 17:14:10 2017 +0000
Bug 13913 - Renewal error message in OPAC is confusing
This patch adds some formatting to the error message a patron receives
when there are renewal failures in the OPAC.
This is pretty much the least which could be done to address this
problem. However, I don't think the issue can be fixed without
re-thinking how renewals are processed. Sending error messages back to
opac-user.pl via URL parameter isn't flexible enough.
To test, apply the patch and attempt to renew multiple items in the OPAC
which cannot be renewed for some reason, for instance because they have
been renewed too many times. The error messages should appear in a list
rather than strung together in one long block of text.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cbb5096934907ec56df27d6ee3e77d752cd5e401
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue May 2 01:08:02 2017 +0200
Bug 11122: Follow up - Fix some display issues and typos
This patch fixes the display of copyrightdate for MARC21 installations.
As MARC21 already requires you to add punctuation in cataloguing, there
is usually no need for punctutation in the templates.
Also fixes a template variable name typo and the basket summary page.
To test (all 3 patches):
- Add several order lines to an order, one should be uncertain
- Verify that the publisher and publication year are displayed
- Check the uncertain price page
- Verify that the publisher code and publication year are displayed
- Fix uncertain price and close your order
- Basket summary: Verify... (you know what)
- Cancel one of your orders
- Verify... for cancelled orders
- Receive shipment
- Verify... for unreceived orders
- Receive order
- Verify ... for received orders
- Finish receiving
- Verify ... on the invoice summary page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c470b3e38486e3c6040a10f6b0bf90af069f4566
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Apr 19 20:28:21 2015 -0400
Bug 11122: Address MARC21 vs. UNIMARC issue
In comment #6 and comment #17, Katrin pointed out the discrepancy
between UNIMARC (using publisheryear) vs. Other MARC installations
(using copyrightdate). This was dealt with in invoice.tt already.
This patch does similar logic for the other 3 template files.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c59e395b749132080fefb81e5b12f8c0b6654665
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Oct 23 12:05:23 2013 +0200
Bug 11122 - publisher code and publication year not fetched in acq orders
In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt.
Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails.
The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear.
In uncertainprice.pl those datas are fetch using GetBiblioData.
It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails.
This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume.
This patch also unifies the way biblio datas are displayed :
<a href="link to catalog using biblionumber">[title]</a> <em>by</em> [author] – [isbn]
<em>Publisher:</em> [publishercode], [publicationyear]
Test plan :
- Choose a biblio record containing a data in :
biblio.title,
biblio.author,
biblioitems.isbn,
biblioitems.publishercode,
biblioitems.publicationyear,
biblio.seriestitle,
biblioitems.volume.
- Create an order using this biblio.
- Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl
=> You see publisher code and publication year
- Look at this order in page : invoice.pl
=> You see publisher code, publication year, series title and volume
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 60b31a7a2219dea16f124684bd21e6d12a35c05a
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue May 30 15:17:58 2017 +0100
Bug 18700 Fix grammar (data cannot be pluralized)
data is a mass noun or plural of datum - datas is ungrammatical
and jarring for a native speaker.
Split the awkward sounding sentence into two for more clarity,
thanks to Marc Véron for the suggestion.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 151cdcd133d8618a3faf9b47723d66ac3dc71b4e
Author: Marc Véron <veron at veron.ch>
Date: Thu May 25 23:04:14 2017 +0200
Bug 18673: News author does not display on staff client home page
News authors do not display on staff client homepage, independently of
syspref 'NewsAuthorDisplay'. This patch fixes the issue.
To verify:
- Create news with display location 'All'
- Set syspref NewsAuthorDisplay to 'Staff client only' or 'Both OPAC and staff client'
- Go to staff client
- Verify that news author does not appear (but it should)
To test:
- Applly patch
- Verify that news author is displayed as expected
Followed test plan works as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cc91ce5997fab0e186e75945f3df87ce413ce4fd
Author: Marc Véron <veron at veron.ch>
Date: Sat May 20 11:46:00 2017 +0200
Bug 18643: Remove dead code in reports/statistics 'Till reconciliation'
File koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt contains a link to /cgi-bin/koha/reports/stats.screen.pl with label 'Till reconciliation' that is commented out since years.
Remove this link and the related files:
cgi-bin/koha/reports/stats.screen.pl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt
To test:
- Apply patch
- Verify that Koha > Reports still display the same
- Verify that two files stats.screen.pl and stats_screen.tt are gone and thet they are not used
anywhere in the Koha codebase
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cf5a1d5e5905664cd1a73691a75ecca40e575b99
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 2 10:27:26 2017 +0200
Bug 18279: [QA Follow-up] Correct @EXPORT
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8e7718ee655fd9846b2a44ad436995b9ea9a1f90
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 15 17:47:13 2017 -0300
Bug 18279: Remove C4::Items::GetLostItems
The JOIN done by this subroutine are not always useful (depending on
item-level_itypes). They also search with LIKE when it is not needed.
Since we have now Koha::Items, we can replace this subroutine with a
call to Koha::Items->search with the correct parameters.
A change in previous behaviours can happen: If a items.itemlost contains
a value that is not defined as a LOST authorised value, the item will
not be displayed. I think it's the expected behaviour, even if it should
not happen in correctly configured installations.
Test plan:
To test with item-level_itypes set to item and biblio:
List the lost items you have on your system, using the different
filters available.
The result table should contain the correct item's info.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f466a856a99f3109985e3867296d9b7467f32e58
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 15 19:02:21 2017 -0300
Bug 18295: C4::Items - Remove get_itemnumbers_of
The code from scripts and subroutines using this subroutine was not very
elegant. Most of the time the code was unnecessarily complex.
This patch removes this subroutine and adapt the code to use
Koha::Items instead.
1. C4::Items::get_hostitemnumbers_of
I did not understand why the code was so complicated, it seems that we
only want to know if a given item has a given biblionumber
2. cataloguing/merge.pl
We want to retrieve the itemnumber for a given biblio.
We could also have done that with:
Koha::Biblios->find( $biblionumber )->items;
3. labels/label-item-search.pl
We want to loop over the items for a given biblio, no need to use
get_itemnumbers_of and GetItemInfosOf.
We just need to use:
Koha::Items->search({ biblionumber => $biblionumber })
4. reserve/request.pl
We want to retrieve the itemnumbers of the biblio's items
We could also have done that with:
Koha::Biblios->find( $biblionumber )->items->get_column('itemnumber');
Test plan:
1.You need to create analytical record relationships (
EasyAnalyticalRecords needs to be set). Link an item to a biblio using
the 'Edit > Link to host item' menu from the biblio detail page.
From the staff interface place a hold on the biblio. You should see the
items from the biblio and the one you just linked
2. Merge two bibliographic records (with items), the resulting record
should contain items from both original records
3. Create a new label batch, edit it.
Add items to this batch ('Add items' button).
Fill the input with a barcode.
You should see all the items of a biblio.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e0acd9bdf8500aa3cc2e5aeccbd1631f0b841040
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 15 17:14:56 2017 -0300
Bug 18278: C4::Items - Remove GetItemLocation
This subroutine is no longer in used.
It was previously call from serials/serials-recieve.pl, which was not used and has been removed by
commit 65b7ad030cd5cd0e3148fbbd1496d31b5cf149f7
Bug 13423: Remove unused serials-recieve
Test plan:
git grep GetItemLocation
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 30 16:55:19 2017 -0400
Bug 18704 - File types limit in tools/export.pl is causing issues with csv files generated by MS/Excel
To test:
1 - Save a csv of biblionumber from MS/Excel
2 - Attempt to export records using this file
3 - It fails (mimetype is appliction/vnd.ms-excel)
4 - Apply patch
5 - Try again
6 - It succeeds!
Signed-off-by: Jason Palmer <jpalmer at switchinc.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cc54b596c3bb225f45ca0443728452444b807d4e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 28 12:11:28 2017 -0400
Bug 18179: Update 1 occurrence in booksellers.pl
To test:
1 - Load http://localhost:8081/cgi-bin/koha/acqui/booksellers.pl?booksellerid=1
2 - Should get internal server erro
3 - Apply patch
4 - Reload
5 - Should not get error
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bb22703dcaa53400c17674b8bb7ba1cf76dffac8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 18 13:50:36 2017 -0300
Bug 18179: Update existing calls
This patch updates the existing occurrences of ->find called in a list
context.
There are certainly others that are not easy to catch with git grep.
Test plan:
Confirm that the 4 modified scripts still works as expected.
We need this one ASAP in master to make sure we will not get other
side-effects of this kind and to catch possible uncaught occurrences
before the release.
Tested scripts changed by this patch, they work as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fe22e9d99c99881077cc5abf837125b8e1c107c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 31 15:35:15 2017 -0300
Koha 17.06 - unstable (start of a new dev cycle)
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 3 +
C4/Items.pm | 201 +--------------
Koha.pm | 2 +-
acqui/booksellers.pl | 2 +-
acqui/uncertainprice.pl | 20 +-
cataloguing/merge.pl | 13 +-
installer/data/mysql/updatedatabase.pl | 6 +
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 10 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 14 +-
.../prog/en/modules/acqui/transferorder.tt | 7 +-
.../prog/en/modules/acqui/uncertainprice.tt | 19 +-
.../prog/en/modules/admin/admin-home.tt | 2 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 1 +
.../prog/en/modules/reports/itemslost.tt | 36 +--
.../prog/en/modules/reports/reports-home.tt | 1 -
.../prog/en/modules/reports/stats_screen.tt | 131 ----------
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 24 +-
labels/label-item-search.pl | 34 ++-
members/memberentry.pl | 2 +-
members/pay.pl | 4 +-
opac/opac-user.pl | 2 +-
reports/itemslost.pl | 50 ++--
reports/stats.screen.pl | 265 --------------------
reserve/request.pl | 6 +-
tools/export.pl | 2 +-
26 files changed, 146 insertions(+), 717 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt
delete mode 100755 reports/stats.screen.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list