[koha-commits] main Koha release repository branch master updated. v19.11.00-598-g14fa7c112c
Git repo owner
gitmaster at git.koha-community.org
Tue Feb 4 11:34:26 CET 2020
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 14fa7c112c9bfd685de7f062c732f8069aebb0ff (commit)
via 845c1bae63d595506994dfe0f485d764d12bd48e (commit)
via 3e580599f0bc624ce5ed3531feb015144fac7fc2 (commit)
via dde8ea09fc187eed1dd23ed4b8bf922d3e8521b0 (commit)
via 58e3c8e815956a017325fac2f44fe2eac4b649ce (commit)
via 2e9fde1bcd34a23817890178bf31969633fa837a (commit)
via 86bc36508f9b4582259f965eff908264db3023ca (commit)
via 8fd9ff1730b321dc80ae92a127aced3187b2f43e (commit)
via d3d6df99b89b0e888d83391b3e687db59ddbb822 (commit)
via b0ccaaf8ef1f59b6c2f9634146bf7170aad39dc9 (commit)
via 0401d13d2c2ae8335a95ea3dade63fd719ce8b47 (commit)
via 61628c97c245e72c750b61d9df6fa9b9100f3093 (commit)
via 0d37a9366127644a06dd909dc91dfed046571937 (commit)
via 05cabe7b18a0aef9e7cfd7de432956bad758cae5 (commit)
via 1c187a1635f7f24f1f081e054698959edef75257 (commit)
via 533fd217dfa941795c146ca8127ab7a7cc2d226e (commit)
via 2879fb27f00d8a80e03d2b0c55f4a1fe24de9b0b (commit)
via 790ee09c576bc1ee5ca218d327220861620386c1 (commit)
via e316de81b6903155fbc5d3f7488f44900d2a78e0 (commit)
via 4072c2e3135f5f19722cbd0f6e4d6fb5a8373961 (commit)
via 47781d91df6434757a4b39adbd2181cc1b4b28fc (commit)
via 25848e5af3ecd77a1a16580aee671c5fb6da7fcb (commit)
via e4dfe623d9b4db17beeb4b14ca329e503c99b225 (commit)
via 4ec3fe042dd272a7ef251417f1d9a45bd1a9ead8 (commit)
via e19c25fbad538716cc8e24e03d0aa0d554826cf4 (commit)
via c7536a95692b014bda46409bffb0b20c091cfc6f (commit)
via e5daedc4c77b2016520713d52b087d66518c35c7 (commit)
via 72442dc8d29120d709710f6c6cba69cd48236766 (commit)
via da3f2eff5f7d8b4c725487a3e4d2d906be15d6ef (commit)
via 2894ac09c7bc93e61830815ee57ab2d7376b2e8e (commit)
via 51e000d6a4ce3ab0691b0e5e3d322d1555548cbe (commit)
via 7077bffdd9e8fd340189c9fcb0bae15a57318c95 (commit)
via 2c293afea084fca7a95497be0eb48d1c191d5b8d (commit)
via c004887e33f760bdb08f72e90aaf8fbe1d8a252a (commit)
via f7644cf30725c0a73d0d6f16f22f1aae2ad9cb85 (commit)
via a10c961c67961e2d85fcd56c27e8087255e5263c (commit)
via f4a9900e4f5a08e1665fdb3cebb7b3e6a592da2f (commit)
via 6804451334b32f1ed6797815e59f7f77f1714ee1 (commit)
via 1c43a26525730df93a2f0855147e123f5f4476bd (commit)
via 5712ec566f46b007d610c0d7cbdc40d43c444d24 (commit)
via 14c7a00d4ac56ba9c1a15275963048c2113b5a48 (commit)
via f541228579940272ad31974c9122a8bbd982c6d9 (commit)
via 18570614c404b662078a81cc0928e4807806bfc6 (commit)
via f2dfa17f0e7b3e6e1a035af18a16b0378a1b16f2 (commit)
via a957114bd13e3876af2f3f9b5f1ca85aca0d0dfd (commit)
via 40d8a72a9d80b1c536acdaf347155a07a2b6f299 (commit)
via 58fda20e8541c59d1886c6798063376b1c150c05 (commit)
from 65024825c5b1effbbc780a47b8e96f90c8d04250 (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 14fa7c112c9bfd685de7f062c732f8069aebb0ff
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Feb 4 10:08:50 2020 +0000
Bug 18936: DBRev 19.12.00.018
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 845c1bae63d595506994dfe0f485d764d12bd48e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 3 16:45:27 2020 +0100
Bug 18936: (QA follow-up) Fix failing test in api/v1/holds.t
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3e580599f0bc624ce5ed3531feb015144fac7fc2
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Mon Feb 3 15:25:09 2020 +0000
Bug 18936: (QA follow-up) Fix failing test
Using categorycode as a scope is not possible for any of these rules
so lets remove it.
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dde8ea09fc187eed1dd23ed4b8bf922d3e8521b0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 3 12:27:40 2020 +0100
Bug 18936: (QA follow-up) Remove 2 new occurrences of Koha::IssuingRules
Fix conflict with bug 13121
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 58e3c8e815956a017325fac2f44fe2eac4b649ce
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Mon Feb 3 10:20:17 2020 +0000
Bug 18936: (QA follow-up) Convert remaining tests to use Koha::CirculationRules
These two uses of Koha::IssuingRule were forgotten so this converts
them to use the new Koha::CirculationRules object.
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2e9fde1bcd34a23817890178bf31969633fa837a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 31 16:45:55 2020 +0100
Bug 18936: (follow-up) More fixes
Previous "More fixes" patch added a debugging statement, not needed.
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 86bc36508f9b4582259f965eff908264db3023ca
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Fri Jan 31 10:51:36 2020 +0000
Bug 18936: (QA follow-up) Add missing POD
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8fd9ff1730b321dc80ae92a127aced3187b2f43e
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Jan 29 14:06:00 2020 +0000
Bug 18936: (follow-up) Fix checkouts endpoint and its tests
- Fixes a bug caused by the refactoring in
Koha/REST/V1/Checkouts.pm (run the tests without this patch and you
will see the tests fails because 'rule_name' parameter was
forgotten).
- Changes the tests to use the new Koha::CirculationRule objects
instead of directly using issuingrules DB table
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d3d6df99b89b0e888d83391b3e687db59ddbb822
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Jan 29 11:09:17 2020 +0000
Bug 18936: (follow-up) Adjust circ rule related tests so that they pass
Bunch of tests broke after moving from issuingrules to
circulation_rules. This accomodates the tests for this refactoring and
DB change.
The itemtype did not exist in the DB. We create it at the beginning of
the tests. Ideally we would like to create it filling the form.
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b0ccaaf8ef1f59b6c2f9634146bf7170aad39dc9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 28 16:47:39 2020 +0100
Bug 18936: Fix IssuingRules/guess_article_requestable_itemtypes.t
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0401d13d2c2ae8335a95ea3dade63fd719ce8b47
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Tue Jan 28 15:05:15 2020 +0000
Bug 18936: (follow-up) Make possible to have unlimited value for holds_per_day
Without this it is not possible to make for a specific patron category
or itemtype a more specific unlimited holds_per_day rule if you have a
catch all rule (categorycode = *, itemtype = *) with limited
holds_per_day value.
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 61628c97c245e72c750b61d9df6fa9b9100f3093
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Tue Jan 28 13:46:55 2020 +0000
Bug 18936: (follow-up) Add cloning of circulation rules back to Koha
The "Clone these rules" feature in admin/smart-rules.pl was
dropped. This re-implements the cloning using Koha objects.
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0d37a9366127644a06dd909dc91dfed046571937
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 27 10:13:44 2020 +0100
Bug 18936: (QA follow-up) Fix inconsistencies in IssuingRules.t
* get_effective_rule should not pass rule_value
* indentation fix
* add comment to list the rules we have when the test _is_row_match
is executed
* compare ->rule_name and ->rule_value returns
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 05cabe7b18a0aef9e7cfd7de432956bad758cae5
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Fri Jan 24 16:13:09 2020 +0200
Bug 18936: (follow-up) Add missing import of Koha::CirculationRules
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1c187a1635f7f24f1f081e054698959edef75257
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Fri Jan 24 12:46:19 2020 +0200
Bug 18936: (follow-up) Fix typo in documentation
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 533fd217dfa941795c146ca8127ab7a7cc2d226e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 24 14:54:45 2020 +0100
Bug 18936: (follow-up) Add foreign key and scope enhancement to circ rules
The previous patch modifies:
- categorycode => undef,
- itemtype => undef,
- branchcode => $branch,
+ branchcode => undef,
But in that condition $branchcode is not '*' and so we should not set it
to undef
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2879fb27f00d8a80e03d2b0c55f4a1fe24de9b0b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 24 12:19:07 2020 +0100
Bug 18936: (follow-up) Fix the delete rule buttons
The itemtype and categorycode were always set to '*'
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 790ee09c576bc1ee5ca218d327220861620386c1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 23 16:16:12 2020 +0100
Bug 18936: Replace '*' with undef
No test was provided initially so considering out of the scope for this
one as well, but that's lacking terribly!
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e316de81b6903155fbc5d3f7488f44900d2a78e0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 23 16:01:13 2020 +0100
Bug 18936: Insert default rules during the onboarding tool
Those default values have been picked from bug 15522
(Koha::CirculationRules)
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4072c2e3135f5f19722cbd0f6e4d6fb5a8373961
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 23 14:45:36 2020 +0100
Bug 18936: (follow-up) Make sure we default to '*' if no rule exist
Making sure the code is doing what we expect.
Also this patch fix CirculationRules.t
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 47781d91df6434757a4b39adbd2181cc1b4b28fc
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Jan 22 19:03:03 2020 +0200
Bug 18936: (follow-up) Add missing circulation rule to fix tests
The tests passed before by a chance because the default kohadevbox
installation script added a issuing rule that had lengthunit =
days. If you use a Koha version before the commits introduced by Bug
18936 you can reproduce the Fees.t tests failing by deleting all the
issuing rules from database with
> delete issuingrules;
and then running
$ prove t/db_dependent/Koha/Charges/Fees.t
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 25848e5af3ecd77a1a16580aee671c5fb6da7fcb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 22 12:27:22 2020 +0100
Bug 18936: Fix some more tests
* CanItemBeReserved
Prior to "Bug 18936: Convert issuingrules fields to circulation_rules",
GetHoldRule returned holds_per_record even if no reservesallowed was
defined. This change restores this behavior.
FIXME Note: In GetHoldRule we return itemtype only if reservesallowed is set,
not sure it is correct.
* t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
When setting returnbranch, holdallowed and hold_fulfillment_policy, we
should not provide categorycode.
* t/db_dependent/Holds.t
Prefer to keep the existing rules instead of removing them. It got quite
hard to understand what was going on here because of the mixup with
the rule reservesallowed that was in issuingrules, and the other rules
we used for the tests. Also, categorycode should not be passed to set
those 3 rules (holdallowed, hold_fulfillment_policy and returnbranch)
* t/db_dependent/Circulation.t
Setting lengthunit to 'hours', no need to make sure the rule has been
correctly be saved
* t/db_dependent/Circulation/CalcDateDue.t
It uses hardcoded data that is not in the sample data (categorycode=C).
Let use K that exists and postpone a refactore of the whole script (to
make it create the data it needs).
* t/db_dependent/Circulation/ReturnClaims.t
* t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t
Simple replace Koha::IssuingRule with Koha::CirculationRules
* t/db_dependent/Koha/Charges/Fees.t
=> FIXME Still failing, stuck here, need help
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e4dfe623d9b4db17beeb4b14ca329e503c99b225
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Jan 22 10:58:37 2020 +0000
Bug 18936: (follow-up) Don't retrieve unused issuing rule
The chargename rule is not used anywhere in the code
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4ec3fe042dd272a7ef251417f1d9a45bd1a9ead8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 22 14:14:41 2020 +0100
Bug 18936: Fix warning about page about wrong lengthunit
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e19c25fbad538716cc8e24e03d0aa0d554826cf4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 26 12:00:52 2019 +0100
Bug 18936: fixes from comment #88
- holds per day are not transferred in database update (actually not
displayed)
- in note column, I can see link "view notes" even if there is no note
- No automatic renewal after (hard limit) does not respect dateformat
and is shown in iso format
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c7536a95692b014bda46409bffb0b20c091cfc6f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Aug 4 15:06:00 2019 -0500
Bug 18936: Fix Update DB entry
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e5daedc4c77b2016520713d52b087d66518c35c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Aug 4 14:31:04 2019 -0500
Bug 18936: Add missing filters
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 72442dc8d29120d709710f6c6cba69cd48236766
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Aug 4 14:09:21 2019 -0500
Bug 18936: More fixes
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit da3f2eff5f7d8b4c725487a3e4d2d906be15d6ef
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 6 14:45:03 2019 -0300
Bug 18936: Fix Circulation.t
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2894ac09c7bc93e61830815ee57ab2d7376b2e8e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 21 19:06:39 2019 -0300
Bug 18936: Replace an other insert into issuingrules
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 51e000d6a4ce3ab0691b0e5e3d322d1555548cbe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 21 17:50:29 2019 -0300
Bug 18936: new holds_per_day
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7077bffdd9e8fd340189c9fcb0bae15a57318c95
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 21 17:49:21 2019 -0300
Bug 18936: new suspension_chargeperiod
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2c293afea084fca7a95497be0eb48d1c191d5b8d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 21 17:46:37 2019 -0300
Bug 18936: chargename removed by bug 21753
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c004887e33f760bdb08f72e90aaf8fbe1d8a252a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 7 15:18:20 2018 -0300
Bug 18936: Fix several issues
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f7644cf30725c0a73d0d6f16f22f1aae2ad9cb85
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 6 16:54:39 2018 -0300
Bug 18936: Fix syntax issue
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a10c961c67961e2d85fcd56c27e8087255e5263c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 6 16:32:04 2018 -0300
Bug 18936: Remove last bit of Koha::IssuingRule
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f4a9900e4f5a08e1665fdb3cebb7b3e6a592da2f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 6 16:27:50 2018 -0300
Bug 18936: Move guess_article_requestable_itemtypes method
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6804451334b32f1ed6797815e59f7f77f1714ee1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 6 16:21:06 2018 -0300
Bug 18936: move get_opacitemholds_policy method
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1c43a26525730df93a2f0855147e123f5f4476bd
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Mon Feb 26 12:17:16 2018 -0700
Bug 18936: (follow-up) Fix tests, replace old get_onshelfholds_policy method
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5712ec566f46b007d610c0d7cbdc40d43c444d24
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Mon Jan 29 15:54:40 2018 -0700
Bug 18936: (follow-up) fix tests, null vs. empty behavior for limiting rules
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 14c7a00d4ac56ba9c1a15275963048c2113b5a48
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Mon Jan 29 13:44:43 2018 -0700
Bug 18936: (follow-up) Remove issuingrules from kohastructure.sql
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f541228579940272ad31974c9122a8bbd982c6d9
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Tue Oct 17 17:26:31 2017 -0600
Bug 18936: (follow-up) fix rental discount lookup
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 18570614c404b662078a81cc0928e4807806bfc6
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Fri Oct 6 13:20:01 2017 -0600
Bug 18936: (follow-up) Update REST definition for /.../kinds
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f2dfa17f0e7b3e6e1a035af18a16b0378a1b16f2
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Thu Sep 14 13:32:26 2017 -0600
Bug 18936: (follow-up) Add foreign key and scope enhancement to circ rules
This necessitates moving the circ rules from using '*' to using
undef/NULL.
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a957114bd13e3876af2f3f9b5f1ca85aca0d0dfd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 17 16:21:56 2017 -0300
Bug 18936: Fix api/v1/holds.t
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 40d8a72a9d80b1c536acdaf347155a07a2b6f299
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 17 16:04:51 2017 -0300
Bug 18936: (follow-up) Fix upgrade step
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 58fda20e8541c59d1886c6798063376b1c150c05
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jul 13 10:03:54 2017 -0400
Bug 18936: Convert issuingrules fields to circulation_rules
Signed-off-by: Minna Kivinen <minna.kivinen at hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 367 ++++++-----
C4/Overdues.pm | 34 +-
C4/Reserves.pm | 75 ++-
Koha.pm | 2 +-
Koha/Biblio.pm | 14 +-
Koha/Charges/Fees.pm | 12 +-
Koha/CirculationRule.pm | 15 +
Koha/CirculationRules.pm | 337 +++++++++-
Koha/IssuingRule.pm | 68 --
Koha/IssuingRules.pm | 202 ------
Koha/Item.pm | 15 +-
Koha/ItemType.pm | 4 +-
Koha/REST/V1/Checkouts.pm | 6 +-
.../V1/CirculationRules.pm} | 32 +-
Koha/Schema/Result/Issuingrule.pm | 327 ---------
about.pl | 7 +-
admin/clone-rules.pl | 51 +-
admin/smart-rules.pl | 287 ++++----
api/v1/swagger/definitions.json | 3 +
api/v1/swagger/definitions/circ-rule-kind.json | 15 +
api/v1/swagger/paths.json | 3 +
api/v1/swagger/paths/circulation-rules.json | 35 +
installer/data/mysql/kohastructure.sql | 44 --
installer/data/mysql/updatedatabase.pl | 49 ++
installer/onboarding.pl | 67 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +-
.../prog/en/modules/admin/smart-rules.tt | 334 +++++-----
opac/opac-ISBDdetail.pl | 4 +-
opac/opac-MARCdetail.pl | 4 +-
opac/opac-detail.pl | 4 +-
opac/opac-reserve.pl | 4 +-
opac/opac-search.pl | 3 +-
opac/opac-shelves.pl | 6 +-
opac/opac-tags.pl | 3 +-
reserve/request.pl | 4 +-
t/db_dependent/ArticleRequests.t | 53 +-
t/db_dependent/Circulation.t | 537 +++++++++++----
t/db_dependent/Circulation/Branch.t | 31 +-
t/db_dependent/Circulation/CalcDateDue.t | 48 +-
t/db_dependent/Circulation/CalcFine.t | 47 +-
t/db_dependent/Circulation/GetHardDueDate.t | 317 +++------
.../Circulation/IssuingRules/maxsuspensiondays.t | 55 +-
t/db_dependent/Circulation/ReturnClaims.t | 13 +-
t/db_dependent/Circulation/Returns.t | 27 +-
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 26 +-
t/db_dependent/Circulation/TooMany.t | 41 +-
t/db_dependent/Circulation/issue.t | 33 +-
t/db_dependent/DecreaseLoanHighHolds.t | 17 +-
t/db_dependent/Fines.t | 35 +-
t/db_dependent/Holds.t | 239 ++++---
.../Holds/DisallowHoldIfItemsAvailable.t | 37 +-
t/db_dependent/Holds/HoldFulfillmentPolicy.t | 3 -
t/db_dependent/Holds/HoldItemtypeLimit.t | 1 -
t/db_dependent/HoldsQueue.t | 9 -
t/db_dependent/ILSDI_Services.t | 51 +-
t/db_dependent/Koha/Biblio.t | 25 +-
t/db_dependent/Koha/Charges/Fees.t | 22 +-
t/db_dependent/Koha/CirculationRules.t | 16 +-
t/db_dependent/Koha/IssuingRules.t | 734 +++++++++++++++------
.../guess_article_requestable_itemtypes.t | 53 +-
t/db_dependent/Koha/Item.t | 18 +-
t/db_dependent/Koha/Libraries.t | 1 -
t/db_dependent/Koha/Objects.t | 9 +-
t/db_dependent/RefundLostItemFeeRule.t | 14 +
t/db_dependent/Reserves.t | 33 +-
t/db_dependent/Reserves/MultiplePerRecord.t | 119 ++--
t/db_dependent/SIP/Transaction.t | 50 +-
t/db_dependent/TestBuilder.t | 6 +-
t/db_dependent/api/v1/checkouts.t | 18 +-
t/db_dependent/api/v1/holds.t | 20 +-
t/db_dependent/selenium/administration_tasks.t | 2 +-
t/db_dependent/selenium/basic_workflow.t | 13 +-
72 files changed, 2876 insertions(+), 2340 deletions(-)
delete mode 100644 Koha/IssuingRule.pm
delete mode 100644 Koha/IssuingRules.pm
copy Koha/{Acquisition/BasketGroups.pm => REST/V1/CirculationRules.pm} (66%)
delete mode 100644 Koha/Schema/Result/Issuingrule.pm
create mode 100644 api/v1/swagger/definitions/circ-rule-kind.json
create mode 100644 api/v1/swagger/paths/circulation-rules.json
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list