[koha-commits] main Koha release repository branch master updated. v17.05.00-706-ge09d233
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 29 22:20:54 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via e09d233eee78f1ee401505f15dd62af99103744c (commit)
via 08b6f7799b2ad06ff4f9ef88e236f5c928c387b5 (commit)
via 7367274c6230b947b85abf9d4f0463d3c0724171 (commit)
via 52c677166d5b35dac0e216e24dc0912e56a7fbd4 (commit)
via 6d52d57fac6094a245a10d4736c4451702cc4c3b (commit)
via 17764fbe90c93daeb619742312920a50f5402e1e (commit)
via 269c21d984ef451dadcad2e803035cc1cd052825 (commit)
via b6f8cf43698979914704dd08c45f11e6b8e406ee (commit)
via 995fb8c14f4d78122566588d095ece549c45ffa1 (commit)
via 5144cee9a9be49dd901dd5afefc6414ce76f6edc (commit)
via 6d818e13887be22a39d35e849dca86b30b06a61e (commit)
via 21ee44ff1278ca66a94a9701195da3f6ed7932fe (commit)
via 5705c13d3805ca8da2a142780d51f364a0d7a4ec (commit)
via 56a0aabc58a3475912894523cc92757153b967bd (commit)
via 2f5a319b0a9f93dde7600decae5df989b842ca58 (commit)
via 1e2e1247c9bcd15514dc395be891a9a3607e5ea5 (commit)
via 1c328f339455fa41a68c0d96015b37b5cb3b86c6 (commit)
via e65ee89aae7802a31e47b5343c77f8a8a62d3a38 (commit)
via 0aec9e11d5fa355738cb3475ad72c4aad8efeafa (commit)
via bb61d5bc384102fe1dc8db4e69bfdb797337b968 (commit)
via 2b343df13e6d154296cf968cb709aa910c58f336 (commit)
via caef98c7f64e02bba996c4da4f862bb55a86171a (commit)
via 90c5391b349a339b3f1fea1ebfeb044cfa76c8a6 (commit)
via 776692f31167f32c1621168249a9ebfea2accc96 (commit)
from 89528af3b089b2d17e3e7b212ea5608478f0ca84 (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 e09d233eee78f1ee401505f15dd62af99103744c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 17:08:28 2017 -0300
Bug 18120: Tidy up
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 08b6f7799b2ad06ff4f9ef88e236f5c928c387b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 22 15:37:41 2017 -0300
Bug 18120: (QA followup) Add POD to controler class
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7367274c6230b947b85abf9d4f0463d3c0724171
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Aug 24 14:36:07 2017 -0300
Bug 18120: (QA followup) 'vendors_manage' permission fits better than full acq
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 52c677166d5b35dac0e216e24dc0912e56a7fbd4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Aug 15 23:58:19 2017 +0200
Bug 18120: Update field descriptions
Trying to clarify some of the descriptions.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6d52d57fac6094a245a10d4736c4451702cc4c3b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Feb 28 09:00:07 2017 -0300
Bug 18120: Add '/acquisitions/vendors' endpoint
This patch introduces an /acquisitions/vendors endpoint.
To test:
- Apply the patch
- Run:
$ sudo koha-shell kohadev
k$ prove t/db_dependent/api/v1/acquisitions_vendors.t
=> SUCCESS: Tests pass
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Matthias Meusburger <matthias.meusburger at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 17764fbe90c93daeb619742312920a50f5402e1e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Mar 6 16:40:11 2017 -0300
Bug 18120: /acquisitions/vendors unit tests
This patch introduces unit tests that need to be passed by an
/acquisitions/vendors/ REST endpoint.
To test:
- Apply the patch
- Run:
$ sudo koha-shell kohadev
k$ prove t/db_dependent/api/v1/acquisitions_vendors.t
=> FAIL: The endpoint is not present, should fail.
Sponsored-by: ByWater Solutions
Signed-off-by: Matthias Meusburger <matthias.meusburger at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 269c21d984ef451dadcad2e803035cc1cd052825
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:28:13 2017 -0300
Bug 19392: Clean-up behind auth_values_input_www.t
The two categories created by this test script are not removed
Test plan:
without this patch, the two authorised value categories 学協会μμ and
tòmas are not removed when the script finishes.
Now it does!
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b6f8cf43698979914704dd08c45f11e6b8e406ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:16:56 2017 -0300
Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 995fb8c14f4d78122566588d095ece549c45ffa1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:49:06 2017 -0300
Bug 13912: DBRev 17.05.00.010
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5144cee9a9be49dd901dd5afefc6414ce76f6edc
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 20 10:52:16 2017 -0300
Bug 13912: (QA followup) Make it explicit that syspref applies to MARC21
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6d818e13887be22a39d35e849dca86b30b06a61e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Sep 7 16:18:00 2017 -0300
Bug 13912: (QA followup) Update database
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 21ee44ff1278ca66a94a9701195da3f6ed7932fe
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Mar 26 09:10:13 2015 +0100
Bug 13912: Fix LOC link
Signed-off-by: m23 <black23 at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5705c13d3805ca8da2a142780d51f364a0d7a4ec
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Mar 26 08:46:45 2015 +0100
Bug 13912: Add DefaultCountryField008 syspref
This syspref is going to be used for populating field 008, range 15-17
with a desired default. It is currently hardcoded to 'xxu'. If not set,
it will still fallback to 'xxu'.
Signed-off-by: m23 <black23 at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 56a0aabc58a3475912894523cc92757153b967bd
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 29 15:52:50 2017 +0200
Bug 18422: (QA follow-up) Check if select2 is available before using it
cataloging.js might not always be loaded with select2.js, so we should
check its availability to prevent JS errors
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2f5a319b0a9f93dde7600decae5df989b842ca58
Author: Oleg Vasylenko <synapse.ova at gmail.com>
Date: Wed Apr 12 10:45:48 2017 +0300
Bug 18422 - Add Select2 to authority editor
Overview:
Repeat tag fails if authority field has select subfield (for example, UNIMARC 700$8, 800$a)
This patch adds Select2 to authority editor
Steps to Reproduce:
In authority editor repeat field that has select subfield
Actual Results:
Field does not repeat (copy is not created).
Console shows a js TypeError in cataloging.js: «$(...).select2 is not a function»
Expected Results:
Field will repeat (copy is created)
Additional Information:
Error happens in version 16.11+ after adding Select2 js functions. The easiest way to fix is to add Select2 to authority editor
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1e2e1247c9bcd15514dc395be891a9a3607e5ea5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Sep 13 12:06:50 2017 +0000
Bug 19307: Mock the AllowFineOverride preference to ensure expected result
To test:
1 - Set 'AllowFineOverride' to allow
2 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
3 - 1 test fails
4 - Apply patch
5 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
6 - All tests pass
7 - Set 'AllowFineOverride' to 'Don't allow'
8 - Tests should still pass
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1c328f339455fa41a68c0d96015b37b5cb3b86c6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:47:04 2017 -0300
Bug 19344: DBRev 17.05.00.009
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e65ee89aae7802a31e47b5343c77f8a8a62d3a38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 19 13:32:31 2017 -0300
Bug 19344: Reorder lang and login_attempts in the [deleted]borrowers tables
Due to a bad rebase, the borrowers and deletedborrowers table structure
may different from a new install and upgraded install
For new installs, the order was: lang, login_attempts
For upgraded installs, it was lang, last_seen, login_attempts
After this patch, the order must be:
- last_seen
- lang
- login_attempts
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0aec9e11d5fa355738cb3475ad72c4aad8efeafa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 14 10:57:40 2017 -0300
Bug 19317: (bug 18966 follow-up) Remove leftover
Nothing important here, but this line should have been removed by bug
18966:
2177 # Update the fines
2178 $dbh->do(q|UPDATE accountlines SET issue_id = ? WHERE
issue_id = ?|, undef, $old_checkout->issue_id, $issue->issue_id);
The issue_id is now the same when moved from issues to old_issues. We do
not need to update the accountlines table.
No test plan here, you need to understand previous changes to validate
this patch.
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bb61d5bc384102fe1dc8db4e69bfdb797337b968
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 8 12:47:03 2017 -0300
Bug 19276: (bug 17829 follow-up) Fix Statistic patrons behaviour
Bug 17829 must have been handle this specific case: GetMember set
category_type, but now $borrower is a Koha::Patron unblessed and does
not contain the category_type.
The fix is to call ->category->category_type on the Koha::Patron object
to be able to know if they are a statistic patrons.
Test plan:
Run the tests
Tests pass, as does QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2b343df13e6d154296cf968cb709aa910c58f336
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 29 11:29:24 2017 -0300
Bug 18999: (QA followup) ModReceiveOrder expects a hashref
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit caef98c7f64e02bba996c4da4f862bb55a86171a
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Jul 22 19:19:44 2017 +0000
Bug 18999: Modified SQL query in GetBudgetSpent() in C4/Budgets.pm
Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl
Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice
Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)
2. Create a basket and click 'Add to basket'
3. Add 2 items with the vendor price of 10
4. Click 'Receive shipment' and write in the shipment cost of 6
5. Click 'Finish receiving' and go back to Acquisitions
6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00
7. On the acquisition page also notice that the ordered column value is 26.00
8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table
9. Apply patch
10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values
11. Also notice the spent value in the fund page table is 6.00
12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm and check they make sense
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 90c5391b349a339b3f1fea1ebfeb044cfa76c8a6
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Sep 16 07:52:25 2017 +0000
Bug 18999: (QA followup) Minor fixes for tests
Removed unneccessary declaration of $budget and changed
Koha::Acquisition::Order->new->insert into
Koha::Acquisition::Order->new->store as requested in tester feedback
Test plan:
1. Go into your koha-shell
2. set the PERL5LIB variable
3. Run t/db_dependent/Budgets.t
All tests should pass
Sponsored-by: Catalyst IT
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 776692f31167f32c1621168249a9ebfea2accc96
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Fri Aug 18 15:16:55 2017 +0000
Bug 18999: Add regression tests
Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t
Test plan:
1. Go into your koha-shell
2. set the PERL5LIB variable
3. Run t/db_dependent/Budgets.t
All tests should pass
Sponsored-by: Catalyst IT
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 12 +-
C4/Circulation.pm | 8 +-
Koha.pm | 2 +-
Koha/REST/V1/Acquisitions/Vendors.pm | 234 +++++++++++
Koha/Schema/Result/Aqbookseller.pm | 7 +
api/v1/swagger/definitions.json | 6 +
api/v1/swagger/definitions/vendor.json | 149 +++++++
api/v1/swagger/parameters.json | 3 +
api/v1/swagger/parameters/vendor.json | 9 +
api/v1/swagger/paths.json | 6 +
.../{cities.json => acquisitions_vendors.json} | 148 ++++---
api/v1/swagger/x-primitives.json | 5 +
cataloguing/value_builder/marc21_field_008.pl | 8 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 25 ++
.../prog/en/modules/admin/authorised_values.tt | 4 +-
.../en/modules/admin/preferences/cataloguing.pref | 4 +
.../prog/en/modules/authorities/authorities.tt | 8 +
koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 16 +-
t/db_dependent/Budgets.t | 83 +++-
t/db_dependent/Circulation.t | 44 +++
.../Circulation/NoIssuesChargeGuarantees.t | 1 +
t/db_dependent/api/v1/acquisitions_vendors.t | 412 ++++++++++++++++++++
t/db_dependent/www/auth_values_input_www.t | 31 +-
24 files changed, 1128 insertions(+), 98 deletions(-)
create mode 100644 Koha/REST/V1/Acquisitions/Vendors.pm
create mode 100644 api/v1/swagger/definitions/vendor.json
create mode 100644 api/v1/swagger/parameters/vendor.json
copy api/v1/swagger/paths/{cities.json => acquisitions_vendors.json} (57%)
create mode 100644 t/db_dependent/api/v1/acquisitions_vendors.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list