[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.14-52-gc7642e1
Git repo owner
gitmaster at git.koha-community.org
Sat Jul 29 21:22:29 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, 16.05.x has been updated
via c7642e11be129361c32e4d87191c5426c51c7c9b (commit)
via 46495bbe457d4127b7196f53c419b8035e8a9489 (commit)
via aa630d5567c82255b5c888e28aa522f1ae13ac56 (commit)
via 14a0e72d2cd25cce9d3a0b3d1d5c7b9732d58295 (commit)
via ad0c7f427bae507e1ab6163e8e66908be52698be (commit)
via d322d1e68f4e17e7ee098342d0796cb36b6effaf (commit)
via 61684aea5ca9ce9ecab133d0734c03f7b28f665c (commit)
via e2f92cd5e0ff77bfbfa0d949ced30bf49eb6206c (commit)
via a84990a2114e3912a7d806bb0d04babf9a50b97f (commit)
via c0c2666c5e8f16ecba5231dad221aa49383b8cf7 (commit)
via 4c8acd3460761b4e17aaa4d885b680775c22a7ba (commit)
via 4b9688650d7d11a667aad54f45773509a37215ae (commit)
via 367b9f0241609d31b02ba4b3a15d57c0a4cdcc2f (commit)
via eda5eb7409002be2b899315b518d05aa768ece43 (commit)
via a2b77d876098e791b753e3c9a0164605e0941aa5 (commit)
via 3b2cb8a3c3ae3b83ae596394663c839b0b44ff8a (commit)
via 2f6823b4350f26a9756e8ccc0f12665fdd44348b (commit)
via b2aea8eb88691ecdbb6ec08a28c633cef96deabe (commit)
via b53acaa7b0d95959281a339a6d98203a1b174f78 (commit)
via 82a4caeff148ab1d02b10b072cd6977abc6f893e (commit)
via 92e8dc5c92bcb133a1145d494600084b6c21979d (commit)
via 6c6f7d3ce61bae2da0dda96cdf4cdafa10dd1c16 (commit)
via 9b8e37053c1fe25f77afc27d9e2ad087a33a324b (commit)
via 3a95eb055b4743bfa983c7fd31d7c0d1dfbcc863 (commit)
via 12d0ba3c1388fe03db19d435f53707cae64223d4 (commit)
via 6cce5f0650a50465c38e21d55b8d90d5e2968443 (commit)
via f10ee1346b7dd4881027bf4c53da039b741711f1 (commit)
via 88d9fcf0d92761674750eb26f87cc90553a1b65c (commit)
via 837ea173846bbf3cd641c168bc0abdd537df46ae (commit)
via 3acc91c744c69599c7f856bf0c49eb3a7f5a8333 (commit)
via b5109dba404b2071aff5d007a04568cb3ce477a2 (commit)
via a74ded24d76f70a0ac0f7afd064514dc49af6ab0 (commit)
via d08e4c28a37a8e181ffbb5e941ed2231f97f0918 (commit)
via 560115f9a65da94c75b581b96d6076aa5cece579 (commit)
via 85ffebd9ecf71541c22b42f3d6fd08b8708d19d8 (commit)
via 8eee5b021be6f27b4171ed904abf918b79342992 (commit)
via 15a5c61a8e6a836697e07f1f150325c23b2ed0bc (commit)
via e667bd9c2acae98e629559142bf35b850417a106 (commit)
via fd73fa95fcba81312481546aee188e4733a8f45b (commit)
via d6265f348a378e6835c14a9635da7cb1c9586bfe (commit)
via 2a8513525751c19bddaa5028b38ba4d1fa1f2442 (commit)
via c246ccb0dd11b059420a1e2b1b0b1ca9572bfdf7 (commit)
via 3e6a57c0ed3d35f1b179e0fae468135f41e8d87a (commit)
from 7bc279285b587787c07e2a62d79e4bf27deb3e23 (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 c7642e11be129361c32e4d87191c5426c51c7c9b
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 7 18:07:13 2017 -0400
Bug 18746: Text_CSV_Various parse failures
While it might be an idea to just delete it,
this patch attempts to catch everything and make it
clear that Text::CSV::Unicode (binary) is the parser
that should be used.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Running 'prove xt/author/Text_CSV_Various.t' passes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 89d36585bb3483ac46c87224391b6867ae8468bb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d3ccdd1df3eda8c933cbc841532a0000707cc9e2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 46495bbe457d4127b7196f53c419b8035e8a9489
Author: Marc Véron <veron at veron.ch>
Date: Fri May 26 11:06:56 2017 +0200
Bug 18675: Translatability: Get rid of [%% in translation for csv-profiles.tt
Translation tool for file csv-profiles.tt picks following line:
%s [%% IF csv_profile.encoding == encoding OR NOT csv_profile AND encoding == 'utf8' %%]
It is is due to a line break inside a template directive. This patch removes it.
To test:
- Verify that code change makes sense
- Apply patch
- Verify that csv exports behave as before
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e464f291b8793909400d9f44d0b297d5bee238d7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit aa630d5567c82255b5c888e28aa522f1ae13ac56
Author: Marc Véron <veron at veron.ch>
Date: Mon May 29 20:13:03 2017 +0200
Bug 18690 - Typos in Koha database description (Table "borrowers")
This string patch fixes typos in kohastructure.sql as described in initial
comment.
To test:
- Carefully verify that string changes make sense
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 279126d710233f7925432ab1f8fa6ae9f947889e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7ff2fd6e9a3bcd40e22a4f69c5c303fe0f7d1706)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 14a0e72d2cd25cce9d3a0b3d1d5c7b9732d58295
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 11:23:20 2017 +0200
Bug 18644: Translatability: Get rid of pure template directives in translation for memberentrygen.tt
Translation for memberentrygen.tt exposes a lot of template directives
like the following:
[% UNLESS opduplicate %][% othernames | html %][% END %]
Translators should not be confronted with such code internals.
To test:
- Review code changes
- Verify that creating / editing patrons works as before
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that lines like mentioned above
do no longer appear in aa-AA-staff-prog.po
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5a30dea05b158fd6a77b0495ee047310865072eb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 649cdbb91bffb37b0ea4958e80b55975ddce65bb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ad0c7f427bae507e1ab6163e8e66908be52698be
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 14:27:56 2017 +0200
Bug 18682 - Translatability: Get rid of [%% in translation for 2 files av-build-dropbox.inc
Two files av-build-dropbox.inc has linebreaks inside template directives,
exposing internals (comments and tt code) to translations as mentioned
in initial comment.
Translators should not be confronted with such interal code.
This patch fixes it.
To test
- Verify, that code changes make sense and have no more line breaks insied
tt directives.
- Run QA tools in newest version (checking for line breaks inside tt
directives)
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that lines mentioned above do
no longer appear in aa-AA-staff-prog.po and in aa-AA-opac-bootstrap.po
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 953504a0769a38a60f379a2e9c72bf7b71814fd0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9db81e5ead064b21394c75ee9746cd825ec9954f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d322d1e68f4e17e7ee098342d0796cb36b6effaf
Author: Marc Véron <veron at veron.ch>
Date: Sat May 20 09:18:10 2017 +0200
Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files
Template directives should not be exposed in translation, but lines like the following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All
This patch fixes it.
To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
still work and display the same string as before
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 18641: (RM-followup) for waitingreserves.tt
Code changed for waitingreserves.tt as asked for in comment #7
Bug 18641: Followup for pendingreserves.tt (less %s)
Change as of comment #13 to reduce %s
After creating a new translation for a "language" aa-AA, we have
the following in the file aa-AA-staff-prog.po
msgid ""
"(Inclusive, default is %s days ago to %s days ahead. Set other date ranges "
"as needed.)"
msgstr ""
msgid ""
"(Inclusive, default is %s days ago to today. Set other date ranges as "
"needed.)"
msgstr ""
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 78b30baf3fa975ab9eabc58733a2252b08d22f25)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 485f2cdc7e44b16c90c9c6ba5a9861751e31c215)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 61684aea5ca9ce9ecab133d0734c03f7b28f665c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 10:08:37 2017 -0300
Bug 18759: (follow-up) Try to fix random failure from Circulation.t
If IndependentBranches, CanBookBeRenewed will set ITEMNOTSAMEBRANCH
or BORRNOTSAMEBRANCH flags, if the branches do not match.
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e2f92cd5e0ff77bfbfa0d949ced30bf49eb6206c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 8 11:54:18 2017 -0300
Bug 18759: Try to fix random failure from Circulation.t
Circulation.t is failing randomly on our CI
https://jenkins.koha-community.org/job/Koha_Master_D8/192/console
# Failed test at t/db_dependent/Circulation.t line 1147.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1152.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1156.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1170.
# got: '1'
# expected: '0'
# Failed test at t/db_dependent/Circulation.t line 1184.
# got: '1'
# expected: '0'
# Looks like you failed 5 tests of 23.
Sometimes one of the alert or impossible flags is set.
This patch guesses that it's because of the 'restricted' value of the item that is evaluated to 1.
If it is not fixed by this patch, we will have more info next time (at least know
if alert or impossible is set).
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
The fix is trivial. Using random data will lead to this situations. The good thing is that
it lets us spot places in which tests need more fine-grained data.
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit a84990a2114e3912a7d806bb0d04babf9a50b97f
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 10:47:48 2017 +0200
Bug 18695: Translatability: Get rid of [%% INCLUDE in translation for circulation.tt
The file circ/circulation.tt exposes the following line to translation:
%s %s [%% INCLUDE 'blocked-fines.inc' fines = chargesamount %%] %s %s
Translators should not be confronted with code internals.
This patch fixes it by removing a line break.
To test:
- Verify that code change makes sense
- Run QA tools in newest version (check for line breaks in tt directives)
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
from folder misc/translator, verify that line mentioned above do
no longer appear in aa-AA-staff-prog.po )
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit c0c2666c5e8f16ecba5231dad221aa49383b8cf7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 13:24:07 2017 -0300
Bug 18648: Restore hyphen
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 4c8acd3460761b4e17aaa4d885b680775c22a7ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 6 11:06:29 2017 -0300
Bug 18648: Fix syntax 'unexpected end of input'
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 4b9688650d7d11a667aad54f45773509a37215ae
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 21:10:32 2017 +0200
Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains
template directives inside a div tag:
<span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]">
This is exposed in translation tool.
To test:
- Carefully examine code changes
- Apply patch, verify that the directive is no longer exposed (picked for
po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po
- If you know where / how this macles is used, verify that it behaves as before
(Note: New patch, needs new sign off)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 367b9f0241609d31b02ba4b3a15d57c0a4cdcc2f
Author: Marc Véron <veron at veron.ch>
Date: Sun Jun 4 22:09:14 2017 +0200
Bug 13747: Fix problems with frequency descriptions containing quotes
If a serial frequency description contains quotes or is surrounded by
quotes, the description is empty ("TEST" > empty) or shown without the
quotes part (TEST "sth" > TEST) on editing the frequency.
To verify:
- Create a new frequency with description: "Test"
- Modify frequency
- Verify the description field is empty
To test:
- Apply patch
- Try to recreate, verify that the description field is
correctly filled when editing
- Test also with a name like: 'A "souble quoted" name'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 16307c40343cdb0ed4ff69c9c001fc4d9e1a459f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 17df2459ddc294eb2499fce6d9f6f32d20e6db67)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit eda5eb7409002be2b899315b518d05aa768ece43
Author: Marc Véron <veron at veron.ch>
Date: Tue May 23 07:08:41 2017 +0200
Bug 18653: Possible privacy breach with OPAC password recovery
OPAC password recovery allows to find out which email address belongs to an account. An attacker could systematically guess login names. If they hit an existing one, OPAC displays a message like:
An email has been sent to "xxx at yyy.zz".
Having a combination of login name and email, attackers could use the information e.g. for phishing or other personalized actions.
To reproduce:
- Enable OPAC password recovery (syspref OpacResetPassword)
- 'Guess' a login name e.g. by using a common pattern like ptester for Peter Tester
- If such account exists, you get to know the related email address
This patch removes the email address from the success message. Additionaly, it changes
wording to address Bug 18570 ('will be sent' instead of 'has been sent')
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Simplified the wording. "Will be sent shortly" is used elsewhere too.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit eddf975cf0244c731f987c64af5126090f73f9f2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2d1dad1a4afa1bfaa14715b7953ed8265dbdb398)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a2b77d876098e791b753e3c9a0164605e0941aa5
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>
(cherry picked from commit 281e1253777d2bd635610075fe610bedb2d47360)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 14e8f5bb713bd4f45a85f028e0c9b5738f3eefd5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Changed borrower back to patron as it was before this patch.
commit 3b2cb8a3c3ae3b83ae596394663c839b0b44ff8a
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: Mason James <mtj at kohaaloha.com>
commit 2f6823b4350f26a9756e8ccc0f12665fdd44348b
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: Mason James <mtj at kohaaloha.com>
commit b2aea8eb88691ecdbb6ec08a28c633cef96deabe
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: Mason James <mtj at kohaaloha.com>
commit b53acaa7b0d95959281a339a6d98203a1b174f78
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>
(cherry picked from commit 60b31a7a2219dea16f124684bd21e6d12a35c05a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit ad741d2512e23746ceb009b2c0a7f57403ab3bb5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 82a4caeff148ab1d02b10b072cd6977abc6f893e
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>
(cherry picked from commit ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 283ccd4da55ce950cf7ace02688daf0db7c0e494)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 92e8dc5c92bcb133a1145d494600084b6c21979d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Feb 16 11:04:11 2017 +0000
Bug 17974 (QA Followup)
Use the $biblio_rs variable
In case of Koha::Object you can call new_from_dbic directly, however,
it fails for Koha::Objects so using an intermediary variable should
be done for consistency
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 6c6f7d3ce61bae2da0dda96cdf4cdafa10dd1c16
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jan 21 16:45:34 2017 +0100
Bug 17974: Add the Koha::Item->biblio method
Test plan:
prove t/db_dependent/Koha/Items.t
should return green
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 9b8e37053c1fe25f77afc27d9e2ad087a33a324b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 23 16:11:06 2017 -0400
Bug 18478 - QA Followup
Make sure to build necessary letters
Fix awkward construction
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3a95eb055b4743bfa983c7fd31d7c0d1dfbcc863
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 17 12:58:09 2017 -0400
Bug 18478 - Unit tests
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 12d0ba3c1388fe03db19d435f53707cae64223d4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 17 12:54:44 2017 -0400
Bug 18478 - Some notices sent via SMS gateway fail
It seems that for HOLD and DUE (and maybe more) notices we rely on
C4::Letters::SendQueuedMessages
to populate the correct address.
This patch adjust that subroutine to correctly populate the field and/or
fail messages if no SMS provider available
To test:
1 - Define a messaging prefs for a patron to recieve hold notices via
SMS
2 - Ensure you have defined an SMS message for 'HOLD' letter
3 - Set an SMS alert number for patron
4 - Set the SMS::Send driver to 'Email'
5 - Fill a hold for the patron
6 - Check the db and note the address is null
7 - run process_message_queue.pl
8 - Check db - address is null and message pending
9 - Apply patch
10 - run process_message_queue
11 - Message to_address should be populated and message sent
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4fa3df9462eaa4a6a2399af4d7036d2f3ee990ce)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6cce5f0650a50465c38e21d55b8d90d5e2968443
Author: Olivier Crouzet <kohateam at univ-lyon3.fr>
Date: Sat Apr 22 18:20:48 2017 +0200
Bug 18482 False duplicates detected on adding a batch-[16.11.x]
For applying on 16.11.x
When adding a batch from a stage file with defaut matching on
title/author, if a duplicate is detected, all following records
treated in the batch are discarded from import even if they are not duplicates
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f10ee1346b7dd4881027bf4c53da039b741711f1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 2 17:27:48 2017 -0300
Bug 18512: Add tests 16.11.X version
Remove use of build_object
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 88d9fcf0d92761674750eb26f87cc90553a1b65c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 28 14:11:00 2017 -0400
Bug 18512 - GetAuthorisedValues.GetByCode Template plguin should return code (not empty string) if value not found
To test:
1 - Create or edit a borrower with info in Sort1 and Sort2 field, not
mapped to authorized values
2 - Note this info does not display on moremember.tt
3 - Apply patch
4 - Note value is passed through
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 837ea173846bbf3cd641c168bc0abdd537df46ae
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Sep 12 15:21:18 2014 +0200
Bug 12913 - wrong inventory results when notforloan filter is not used
In inventory tool, there is a test on scanned items notforloan value : if the value is not one of authorized values, the inventory results displays the problem "Change item status".
The bug is that if notforloan filter is not used, the notforloan values array is not filled and so all scanned items are marked with this problem.
Test plan :
- Check you have in default framework an item subfield mapped with items.notforloan and with an authorized value catergory, for example 'NOTFORLOAN'
- Check the authorized value category has at least value '0'
- Create a new value in this category, for example '9'
- Create a biblio with default framework
- Create an item with barcode='000AAA1', callnumber='ZZZAAA1' and notforloan=0
- Create an item with barcode='000AAA2', callnumber='ZZZAAA2' and notforloan=9
- Delete new value created above, for example '9'
- Create a file 'barecodes.txt' containing 2 lines '000AAA1' and '000AAA2'
- Go to inventory tool : /cgi-bin/koha/tools/inventory.pl
- Choose file in 'Barcode file'
- Enter item callnumber between 'ZZZ' and 'ZZZZ'
- Check 'Compare barcodes list to results'
- Submit
=> without patch, you get 2 results with problem 'Change item status' even for item with notforloan=0
=> with patch, you get 1 result with 'Change item status' on item with notforloan=9
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 3acc91c744c69599c7f856bf0c49eb3a7f5a8333
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed May 24 01:54:02 2017 -0400
Bug 5395: Update C4::Acquisition::SearchOrders POD
Comparing the perldoc to the function:
- basketname
- basketgroupname
- budget_id
Were missing. This adds them.
Also, a description of ordernumber and search were
added, as they are not self-evident by their name
alone.
There are no code changes, so all tests should pass
or fail identically before and after patch.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Fixed typo basetgroupname
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit b5109dba404b2071aff5d007a04568cb3ce477a2
Author: David Cook <dcook at prosentient.com.au>
Date: Thu May 25 14:37:21 2017 +1000
Bug 18669 - RewriteCond affecting wrong rule in koha-httpd.conf
One of the RewriteCond directives in koha-httpd.conf was affecting
the wrong RewriteRule after its original RewriteRule was commented out
years ago.
_TEST PLAN_
0) Before applying patch, build Koha from source
*) make
*) make install (or make upgrade)
*) Copy or symlink etc/koha-httpd.conf to your Apache vhost directory
(and enable if you're on a Debian based system)
*) Restart Apache
1) Make sure that you have at least 1 bibliographic record in Koha
(URL like this http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1)
2) Go to http://server:port/bib/1
3) Note that you get a 404 error
4) Apply the patch
5) Rebuild Koha from source as per step 0
6) Go to http://server:port/bib/1
7) Note that you now see the same page as you would if you went to
http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1
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: Mason James <mtj at kohaaloha.com>
commit a74ded24d76f70a0ac0f7afd064514dc49af6ab0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 26 10:25:10 2017 +0200
Bug 18611: [QA Follow-up] Add unit test for GetItemNumbersFromImportBatch
Test plan:
Run t/db_dependent/ImportBatch.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit d08e4c28a37a8e181ffbb5e941ed2231f97f0918
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 26 10:20:00 2017 +0200
Bug 18611: [QA Follow-up] Make SQL query more readable
Make it more explicit by adding join statements.
Test plan:
See next patch for adding a unit test.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 560115f9a65da94c75b581b96d6076aa5cece579
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue May 23 11:03:04 2017 +0000
Bug 18611 - Followup, remove tabs to make qa tools happy
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: Mason James <mtj at kohaaloha.com>
commit 85ffebd9ecf71541c22b42f3d6fd08b8708d19d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 16 05:40:28 2017 -0400
Bug 18611 - Create labels action fails in manage-marc-import.pl if an item has been deleted from the import batch.
To test:
1 - Import a batch with some items
2 - Delete one of the imported items
3 - Browse to Tools->Staged MARC record management
4 - Click (Create label batch) for the batch you imported
5 - Recieve an error
6 - Apply patch
7 - Click (Create label batch)
8 - Batch is created with remaning items from the import
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
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: Mason James <mtj at kohaaloha.com>
commit 8eee5b021be6f27b4171ed904abf918b79342992
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 23 16:16:39 2017 -0300
Bug 18600: Add pref TalkingTechItivaPhoneNotification if missing
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 15a5c61a8e6a836697e07f1f150325c23b2ed0bc
Author: LeireDiez <leire at scanbit.net>
Date: Thu May 11 17:09:22 2017 +0200
Bug 18204 - Authority searches are not saved in Search history
When you search an authority in Authority search, this search is not saved in Search history.
EnableOpacSearchHistory is enabled
Steps to test:
1- Login your account (opac)
2- Search an authority in Authority search
3- Go to Search history -> Authority
4- It says "Your authority search history is empty"
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e667bd9c2acae98e629559142bf35b850417a106
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 23 14:10:20 2017 -0300
Bug 16295: Fix access to MMT admin page
There was a typo in the permission code
Test plan:
Try to access the marc modification templates admin page with the
marc_modification_templates permission (and not all tools permissions)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit fd73fa95fcba81312481546aee188e4733a8f45b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 23 16:16:17 2017 -0300
Bug 18663: Add pref ExportRemoveFields if missing
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit d6265f348a378e6835c14a9635da7cb1c9586bfe
Author: Gus <gel1163 at stacmail.net>
Date: Wed Jan 20 20:44:00 2016 +0000
Bug 15465 - Created README.md file for github
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 2a8513525751c19bddaa5028b38ba4d1fa1f2442
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri May 5 10:23:23 2017 +0000
Bug 18548: Print usage when missing instance name in koha-create script
Test plan:
1. Run: debian/scripts/koha-create --request-db
-> Without patch you see the getent error message
-> With patch you see usage and "Missing instance name" message
Signed-off-by: Dilan Johnpulle <dilan at calyx.net.au>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit c246ccb0dd11b059420a1e2b1b0b1ca9572bfdf7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri May 12 09:38:37 2017 -0400
Bug 18569 - Quick add patron will not copy over details from cities and towns pull down into patron details
Followed test plan and the city value updates in the quick add form correctly.
Signed-off-by: Dilan Johnpulle <dilan at calyx.net.au>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 3e6a57c0ed3d35f1b179e0fae468135f41e8d87a
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Mon May 22 09:49:47 2017 +0200
Update debian/control
Last changes in debian/control as added to 16.11.08
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
https://bugs.koha-community.org/show_bug.cgi?id=17108
Signed-off-by: Mason James <mtj at kohaaloha.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 12 +++-
C4/ImportBatch.pm | 25 ++++---
C4/Letters.pm | 8 +++
Koha/Item.pm | 14 ++++
Koha/Template/Plugin/AuthorisedValues.pm | 8 ++-
README.md | 2 +-
acqui/addorderiso2709.pl | 7 +-
acqui/uncertainprice.pl | 20 +-----
debian/control | 18 ++---
debian/scripts/koha-create | 2 +
etc/koha-httpd.conf | 6 +-
installer/data/mysql/atomicupdate/bug_18600.sql | 2 +
installer/data/mysql/atomicupdate/bug_18663.sql | 2 +
installer/data/mysql/kohastructure.sql | 30 ++++-----
installer/data/mysql/updatedatabase.pl | 19 ++++++
.../prog/en/includes/av-build-dropbox.inc | 22 +++---
.../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 +-
.../en/modules/cataloguing/value_builder/macles.tt | 3 +-
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/circ/pendingreserves.tt | 8 ++-
.../prog/en/modules/circ/waitingreserves.tt | 7 +-
.../prog/en/modules/members/memberentrygen.tt | 20 +++---
.../en/modules/serials/subscription-frequencies.tt | 2 +-
.../prog/en/modules/tools/csv-profiles.tt | 3 +-
koha-tmpl/intranet-tmpl/prog/js/members.js | 13 ++--
.../bootstrap/en/includes/av-build-dropbox.inc | 19 ++----
.../bootstrap/en/modules/opac-password-recovery.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 24 +++----
opac/opac-authorities-home.pl | 2 +-
t/db_dependent/Circulation.t | 13 ++--
t/db_dependent/ImportBatch.t | 29 ++++++--
t/db_dependent/Koha/Items.t | 10 ++-
t/db_dependent/Letters.t | 16 ++++-
t/db_dependent/Template/Plugin/AuthorisedValues.t | 71 ++++++++++++++++++++
tools/export.pl | 2 +-
tools/inventory.pl | 3 +
tools/marc_modification_templates.pl | 2 +-
xt/author/Text_CSV_Various.t | 43 ++++++++----
43 files changed, 382 insertions(+), 169 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_18600.sql
create mode 100644 installer/data/mysql/atomicupdate/bug_18663.sql
create mode 100644 t/db_dependent/Template/Plugin/AuthorisedValues.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list