[koha-commits] main Koha release repository branch master updated. v18.11.00-142-g4e6d64c
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 9 02:28:46 CET 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, master has been updated
via 4e6d64c16361ec3c00813c291b56ecf5657eff1f (commit)
via 277bd25b45e925f0af13f274ceb52a1af4e739cd (commit)
via 1aa9625c5b983d5a7f10b7ed87db848b8c2a654c (commit)
via aa71519660a43cebc734763e4821818dfc636775 (commit)
via 28de85db4060604e7cca7dbb74e9da984e2e6451 (commit)
via 7185a96ca601905c291ea5b164332486bb4a14af (commit)
via 10f78fcb2efec81b3c2024c97dbb55b21a3c14a8 (commit)
via 38530140176ddcb2f9d2ded7dea5382f4816e12f (commit)
via 0693052bfcd0b4259eb620233550f81eab49eabd (commit)
via 0c43fa326afa23ef9c98ae2e7b464f6a0e55d880 (commit)
via 49c9e93292b2f694857edc66e913b9f65d081e8b (commit)
via 6d42f6e72c20bad116454b81ee512024179b7387 (commit)
via 551626ce1e82286414c4a77c83febdcfbc99741a (commit)
via 0d5058b7b29d90cc7c8e533ee56388fbb5a96d52 (commit)
via 613a0034e08af84af1e2198156bbfc6900ba6551 (commit)
via 2067b8e3f8cb363370897ff179bcdbf5c97cbbbb (commit)
via 8009a8f462b05c2885fa4126dcba2ef0185f54f2 (commit)
via 4ef8bfee3f5da810738607498068ea719d533378 (commit)
via 5c313bc554a857da29f124957d58459c0ed4c03b (commit)
via 17a8eb187959625ef67eea9999588fe502443691 (commit)
from 986a52d718d4219f32a79a045d5867a3d70092d5 (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 4e6d64c16361ec3c00813c291b56ecf5657eff1f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jan 4 03:08:14 2019 +0000
Bug 21753: DBRev 18.12.00.007
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 277bd25b45e925f0af13f274ceb52a1af4e739cd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Nov 29 12:49:50 2018 +0100
Bug 21753: (QA follow-up) Remove fourth %s in sprintf
Trivial.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1aa9625c5b983d5a7f10b7ed87db848b8c2a654c
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Nov 2 10:04:46 2018 +0000
Bug 21753: Update to remove the field from the database
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aa71519660a43cebc734763e4821818dfc636775
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Nov 2 09:42:53 2018 +0000
Bug 21753: Remove all reference of chargename from scripts
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 28de85db4060604e7cca7dbb74e9da984e2e6451
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Dec 10 12:02:41 2018 +0000
Bug 21980: Add new exceptions for Koha::Account
He add two new exceptions here; One to be thrown when negative 'amount'
is passed into verious account methods that always expect positive
decimals and another to be thrown when a bad 'type' is passed into an
account method.
Sponsored-by: PTFS Europe
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7185a96ca601905c291ea5b164332486bb4a14af
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 4 14:25:16 2018 +0000
Bug 21436: Update two-column templates with Bootstrap grid: Tools part 4
This patch modifies several tools 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:
- Tools -> Task scheduler
- Tools -> Staged MARC management -> View batch -> View diff of
imported record which duplicates a record in the catalog
- Tools -> Stage MARC for import
- Test each step
- Tools -> Upload local cover image
- Test each step
- Tools -> Upload any file
- Test each step
- Tools -> Log viewer
- Test from the tools menu and from both the bibliographic
patron details pages ("Modification log").
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: Nick Clemens <nick at bywatersolutions.com>
commit 10f78fcb2efec81b3c2024c97dbb55b21a3c14a8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jan 4 02:51:03 2019 +0000
Bug 21915: DBRev 18.12.00.006
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 38530140176ddcb2f9d2ded7dea5382f4816e12f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Nov 30 10:28:48 2018 -0300
Bug 21915: Add a cli script to reconcile balances
This patch adds a CLI script, reconcile_balances.pl that takes care
of calling the reconcile operation for all patrons that have outstanding
credits.
A weird situation has been spotted in the wild, in which a debit ends up
actually being a credit, because amount outstanding is tweaked in
dropbox-mode returns. Until we figure what to do about that (probably a
new account type, etc), we catch any exceptions and warn about the
situation.
To test:
- Have patrons with outstanding credits and debits
- Run the script:
$ kshell
k$ perl misc/cronjobs/reconcile_balances.pl --verbose
=> SUCCESS: Notice patrons got their balances reconciled, and useful
information is output.
- Add new outstanding credits and debits to patrons you con easily
identify
- Run:
k$ perl misc/cronjobs/reconcile_balances.pl
=> SUCCESS: Notice balances are reconciled, but no output
- Run:
k$ perl misc/cronjobs/reconcile_balances.pl --help
=> SUCCESS: Usage information is printed.
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0693052bfcd0b4259eb620233550f81eab49eabd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Nov 30 09:54:56 2018 -0300
Bug 21915: Call reconcile_balance on manual credit creation
This patch makes the manual credit creation step call
Koha::Account::reconcile_balance when the AccountAutoReconcile syspref
is set.
To test:
- Apply the patch
- Have some outstanding debits
- Create a manual credit
=> SUCCESS: Same behaviour as always
- Set AccountAutoReconcile
- Create a manual credit
=> SUCCESS: Reconcillation happened
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0c43fa326afa23ef9c98ae2e7b464f6a0e55d880
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Nov 30 09:45:19 2018 -0300
Bug 21915: Call reconcile_balance on manual invoice creation
This patch makes the manual invoice creation step call
Koha::Account::reconcile_balance when the AccountAutoReconcile syspref
is set.
To test:
- Apply the patch
- Have some outstanding credit
- Create a manual invoice
=> SUCCESS: Same behaviour as always
- Set AccountAutoReconcile
- Create a manual invoice
=> SUCCESS: Reconcillation happened
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 49c9e93292b2f694857edc66e913b9f65d081e8b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 16:46:36 2018 -0300
Bug 21915: Reconcile balance on _FixAccountForLostAndReturned call
This patch makes _FixAccountForLostAndReturned reconcile the patron's
account balance, when the AccountAutoReconcile syspref is set.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> SUCCESS: Tests pass, peace \o/
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6d42f6e72c20bad116454b81ee512024179b7387
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 14:55:53 2018 -0300
Bug 21915: Add AccountAutoReconcile syspref
This syspref will be used to call the reconcile_balance routing as
needed.
Sponsored-by: ByWater Solutions
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 551626ce1e82286414c4a77c83febdcfbc99741a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jan 7 07:38:29 2019 -0300
Bug 22071: (follow-up) Add POD for validate_query_parameters
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0d5058b7b29d90cc7c8e533ee56388fbb5a96d52
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jan 7 07:31:43 2019 -0300
Bug 22071: (follow-up) Simplify code
In order to add features to this method, the current code would force us
to do it for each authentication method.
There's duplicated code that could be simplified. This patch makes the
authentication code just set $user on each block (oauth and cookie
authentication) and moves the final permissions check to the end of the
authenticate_api_request method.
Overall, the behaviour remains unchanged.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/api/v1/auth_authenticate_api_request.t \
t/db_dependent/api/v1/oauth.t
=> SUCCESS: Tests pass! Nothing changed!
- Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 613a0034e08af84af1e2198156bbfc6900ba6551
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 4 12:46:37 2019 -0300
Bug 22071: Make authenticate_api_request stash koha.user in OAuth use case
This patch makes the OAuth code stash the requestion Koha::Patron.
To test:
- Apply the tests patch:
- Run:
$ kshell
k$ prove t/db_dependent/api/v1/auth_authenticate_api_request.t
=> FAIL: Tests fail :-(
- Apply this patch
- Run:
k$ prove t/db_dependent/api/v1/auth_authenticate_api_request.t
=> SUCCESS: Tests pass :-D
- Sign off =D
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2067b8e3f8cb363370897ff179bcdbf5c97cbbbb
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 4 12:37:27 2019 -0300
Bug 22071: Regression tests
The authenticate_api_request() behaviour needs more tests. This patch
adds tests for the stashed Koha::Patron object. It highlights the bug in
the OAuth authentication case.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/api/v1/auth_authenticate_api_request.t
=> FAIL: Tests fail in the OAuth case, pass in the cookie-based auth
case.
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8009a8f462b05c2885fa4126dcba2ef0185f54f2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 8 12:34:17 2018 -0300
Bug 21788: Make ProcessOfflinePayment pass the library_id parameter
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> FAIL: branchcode is not set
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4ef8bfee3f5da810738607498068ea719d533378
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 8 12:31:59 2018 -0300
Bug 21788: Unit tests
This patch refactors the tests related to ProcessOfflinePayment and adds
checks for setting branchcode on the account line.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> FAIL: branchcode is not set
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5c313bc554a857da29f124957d58459c0ed4c03b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 31 12:50:27 2018 +0000
Bug 22073: Add to diacritics mappings for Ž and ž
To test:
1 - Find or add a record by author Slavoj Žižek
2 - Search for 'Zizek'
3 - No results
4 - Apply patch
5 - Reindex
6 - Search again
7 - Success!
https://bugs.koha-community.org/show_bug.cgi?id=22073
Signed-off-by: Eric Phetteplace <ephetteplace at cca.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 17a8eb187959625ef67eea9999588fe502443691
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 19 16:00:52 2018 -0300
Bug 22020: (bug 21777 follow-up) Fix columns visibility for circulation.pl
The table is used by circulation.pl and moremember.pl
When it is modified we need to take care of the two view.
Test plan:
Use the columns settings to hide/show the "check in" and other columns
Confirm the this patch fixes the display for moremember.pl
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 18 ++-
C4/Overdues.pm | 31 +++--
Koha.pm | 2 +-
Koha/Exceptions/Account.pm | 24 +++-
Koha/REST/V1/Auth.pm | 110 ++++++++-------
Koha/Schema/Result/Issuingrule.pm | 12 +-
admin/columns_settings.yml | 5 +
etc/zebradb/etc/word-phrase-utf.chr | 2 +
installer/data/mysql/kohastructure.sql | 1 -
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 19 +++
.../en/modules/admin/preferences/circulation.pref | 8 ++
.../prog/en/modules/tools/scheduler.tt | 30 ++--
.../prog/en/modules/tools/showdiffmarc.tt | 17 ++-
.../prog/en/modules/tools/stage-marc-import.tt | 28 ++--
.../prog/en/modules/tools/upload-images.tt | 30 ++--
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 42 +++---
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 42 +++---
members/mancredit.pl | 4 +
members/maninvoice.pl | 5 +
misc/cronjobs/fines.pl | 8 +-
misc/cronjobs/reconcile_balances.pl | 122 ++++++++++++++++
misc/cronjobs/staticfines.pl | 5 +-
t/db_dependent/Circulation.t | 123 ++++++++++++++---
t/db_dependent/Circulation/GetHardDueDate.t | 9 +-
.../api/v1/auth_authenticate_api_request.t | 145 ++++++++++++++++++++
26 files changed, 626 insertions(+), 217 deletions(-)
create mode 100755 misc/cronjobs/reconcile_balances.pl
create mode 100755 t/db_dependent/api/v1/auth_authenticate_api_request.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list