[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.00-16-g235f6a8
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 10 11:18:17 CET 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, 18.11.x has been updated
via 235f6a83e2e6b8339070932dabcc81ecc9aefd41 (commit)
via 51a1a465c8b6264b7318ea90186ec29083c48d02 (commit)
via eba382d9c129cadc100a05c29daf14210426b392 (commit)
via 8ff04c0fbaba891f4193bbc9478aeb85f1fb5175 (commit)
via 15a7203d3dc5ad57b1ad7c120e7bee34de8e062f (commit)
via 032da8e72555c6e441d225de3be9c92b6a478de1 (commit)
via 09a8fa69ae85d32978c8555121104a73c3ddffde (commit)
via b6462c688ad5c47ce29d2de6f7494b03351c5e14 (commit)
via e58c3d8a8e0187f68559f985afd0960eeb2d8b43 (commit)
via 0321fd5776aec9493ef2a87e67e60bd1a4710ca5 (commit)
via 55e807c287f2da9f5c031847ccecc7a9554f60d7 (commit)
via cc0833fec6ac0e4f5008c855d8c0034c56870fa4 (commit)
via a616b9fc0266fdc9a5d299d5927f8b4a2236c559 (commit)
via e19ce91887485bfc7ab27a29ab71a41d5af5a040 (commit)
via edee529de8e0b57342fd7f824c205ec4c37e3b5b (commit)
via dc5677738794d0148dc979d584ea34f6cd49254d (commit)
from ec0c6ef4145ff438f1d1a6da6da7616011ae2840 (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 235f6a83e2e6b8339070932dabcc81ecc9aefd41
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Nov 27 20:28:29 2018 -0300
Bug 18805: Add ability to use up account credits
This patch introduces a new button in the 'Pay fines' tab on the
patron's account page. This button, labeled 'Normalize account' is only
displayed when outstanding credits are available, that could be used to
pay up existing debts.
When clicking the button, the Koha::Account::normalize_balance method
(bug 21896) is used for the purpose.
To test:
- Apply this patch (on top of 21896)
- On a patron's 'Fines' tab, create a 'manual invoice' (maybe more than
one)
- Go to the 'Pay fines' tab
=> SUCCESS: No 'Apply credits' button is displayed.
- On the 'create manual credit' tab, create a couple credits.
- Go to the 'Pay fines'
=> SUCCESS: 'Apply credits' button is displayed
- Click on 'Apply credits'
=> SUCCESS: Outstanding credits have been used to pay up debts.
- Play with different options (credit excedes debts and vice-versa, they
match, etc)
=> SUCCESS: They all work as expected
- Sign off :-D
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a3036b4760d80dd3d2188f5f95c6f4279ecef74b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 51a1a465c8b6264b7318ea90186ec29083c48d02
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 30 21:27:44 2018 +0000
Bug 21896: RM follow-up - fix tests
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b4580bff5ba7753f9db2513c3b87ecb9bba5258c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit eba382d9c129cadc100a05c29daf14210426b392
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Nov 29 13:49:27 2018 +0000
Bug 21896: (QA follow-up) Document and Test for FIFO behaviour
A short dicussion lead to the decision to make it explictly clear that
this method will implicitly apply credits against debits in a 'First In
First Out' manor, meaning oldest outstanding debits will be paid off
first.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 99535e0fda491d2e1d704dd80f6613c0a7b8d06b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8ff04c0fbaba891f4193bbc9478aeb85f1fb5175
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 10:55:51 2018 -0300
Bug 21896: (QA follow-up) Add tests for FIFO behaviour
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4302bdda5c1c348e63003589795af3d37249c167)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 15a7203d3dc5ad57b1ad7c120e7bee34de8e062f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Nov 28 10:24:36 2018 -0300
Bug 21896: (QA follow-up) normalize_balance -> reconcile_balance rename
This was requested on the QA review and I agree.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5fc2ccd7332ca53dfe07bd079cc446d1df923496)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 032da8e72555c6e441d225de3be9c92b6a478de1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Nov 27 19:34:29 2018 -0300
Bug 21896: Add Koha::Account::normalize_balance
This patch adds the normalize_balance() method to Koha::Account. Its
purpose is to apply outstanding credits (i.e. manual ones ore remaining
amounts like in the case of refunds) to outstanding debts.
To test:
- Apply this patchset
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1176947b42342ca725020455361fe092255e4d04)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 09a8fa69ae85d32978c8555121104a73c3ddffde
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Nov 27 17:06:20 2018 -0300
Bug 21896: Add unit tests for Koha::Account::normalize_balance
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 98bfe5d93cb6715b3095309082b241aaafe869da)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b6462c688ad5c47ce29d2de6f7494b03351c5e14
Author: Nazlı Çetin <nazli at devinim.com.tr>
Date: Thu Nov 29 14:50:29 2018 +0000
Bug 7143: Update about page for Nazlı
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 52b52ab896be2831309a6c3f3401a4118c7b0f33)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e58c3d8a8e0187f68559f985afd0960eeb2d8b43
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Nov 28 16:07:57 2018 +0100
Bug 7143: Update OpenHub link for Fridolin Somers in about page
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d0e72b437332b1ef0b3bcee98616ac8fef3f1e7a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0321fd5776aec9493ef2a87e67e60bd1a4710ca5
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Wed Oct 31 14:04:33 2018 +0200
Bug 21736: Allow translating the localization widget messages
The widget used to translate the item type names to other
languages has few javascript messages that cannot be translated.
Add the mechanism to enable their translation.
Test plan:
1) Install and update a language
2) Check the po-files, there's no msgid for
"A translation already exists for this language."
3) Apply the patch
4) Install and update a language
5) There should be a msgid for the one in 2, and
couple other messages from localization.tt
6) Translate those messages, update the translated templates
7) Go to Administration -> Item types -> Modify item type ->
Translate into other languages
Add a new translation, check that the message given by the widget
was in correct language.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5cacb502392aaebaef84339233227eb261d45277)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 55e807c287f2da9f5c031847ccecc7a9554f60d7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Nov 28 13:41:53 2018 -0500
Bug 21905: Plugin hook intranet_catalog_biblio_enhancements_toolbar_button incorrectly filtered
The new plugin hook intranet_catalog_biblio_enhancements_toolbar_button is rendered useless due to the outputted html being escaped using the html filter. It should be using the raw filter instead.
Test Plan:
1) Enable plugins
2) Download and install the latest version of the Kitchen Sink plugin
https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.21/koha-plugin-kitchen-sink-v2.1.21.kpz
3) Browse to catalogue/detail.pl for a record
4) Note you see the raw html of the plugin output in the toolbar
5) Apply this patch
6) Restart all the things
7) Reload the page
8) Note the html is now correctly rendered as a button
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ed22c5fc0f65cc3736a8dbabb159b6b4b9b2f7c4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cc0833fec6ac0e4f5008c855d8c0034c56870fa4
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Thu Nov 22 15:55:25 2018 +0200
Bug 21861: (follow-up) replace onchange() with jQuery equivalent
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f44a4f1d2a13735c52948df29e773728d04ab991)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a616b9fc0266fdc9a5d299d5927f8b4a2236c559
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Sat Nov 17 20:03:36 2018 +0200
Bug 21861: The MARC modification template actions editor does not always validate user input
The MARC modification template actions editor does not validate
user input when adding a conditional clause, making it possible
to save a modification action without filling in all necessary
fields.
This patch fixes that.
Test plan:
1) Create a MARC modification template and add a new action,
e.g. "Copy All field(s) 200$a to field 600$a".
Add a condition ("if" or "unless") but leave the relevant
field and subfield textboxes empty.
Add "matches" or "doesn't match" as a comparison operator.
Check the "RegEx" checkbox, leave the regex textbox empty.
2) Click on "Add action" and notice how it accepts your input.
Also notice the extra space in the Action column RegEx.
3) Edit your modification action and notice the missing "m/"
before the conditional RegEx.
4) Apply the patch and hit CTRL-F5 to reload the relevant JS.
5) Edit the modification action you added previously (or add
a new one). Try leaving the textboxes mentioned above empty
and then submit your changes. You should get pop-up windows
informing you about missing fields.
6) Now try typing a value in the conditional regex textbox and
Update your action. In the Action column, there should be
no spaces between the delimiters of the matching operator
and the value you just entered.
7) Edit your action: notice how the "m/" before the regular
expression and the "/" after it are now showing correctly.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3e1e1448e9132dce81571a4c3f31eb67816f14f9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e19ce91887485bfc7ab27a29ab71a41d5af5a040
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Wed Nov 28 11:18:09 2018 +0100
Bug 21897: Typo in postinst
Small typo (missing space)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f99b9b5b3d88d8ed2eed0f64da0f5ef2a1483f3e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit edee529de8e0b57342fd7f824c205ec4c37e3b5b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Nov 28 10:05:19 2018 +0100
Bug 21895: Fix path to POT file
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d8531b8fcbfc8fe09540ddb940149a7d7dbb4fb9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dc5677738794d0148dc979d584ea34f6cd49254d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Nov 28 00:51:45 2018 +0100
Bug 21895: Fix translation for package install
The string extraction process was not taking into account the fact that
standard/package install have a completely different directory structure
than the dev install
This patch tries to keep the exact same behaviour for dev installs,
while making it work for standard install by using opachtdocs,
intrahtdocs, opacdir and intranetdir from $KOHA_CONF
Test plan:
1. Follow test plan in
https://gitlab.com/koha-community/Koha/commit/d708255c7a4d981c7c7bdd0644a75202ec43b297
2. Do a standard install and repeat step 1 on this new install
3. If you know how to build the Debian package, build it, install it and
verify that koha-translate works as expected
4. prove t/LangInstaller.t
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bd81f0418c14af82cdd9f4858c32b18d76a90b49)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Account.pm | 29 ++++
Koha/Schema/Result/Accountline.pm | 2 -
debian/koha-common.postinst | 2 +-
docs/history.txt | 2 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 +-
.../prog/en/modules/admin/localization.tt | 16 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 10 ++
.../modules/tools/marc_modification_templates.tt | 8 +-
.../prog/js/marc_modification_templates.js | 21 +++
members/pay.pl | 21 ++-
misc/translator/LangInstaller.pm | 79 +++++++---
t/LangInstaller.t | 13 +-
t/db_dependent/Koha/Account.t | 161 +++++++++++++++++++-
14 files changed, 325 insertions(+), 49 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list