[koha-commits] main Koha release repository branch master updated. v17.05.00-807-g1dba61e
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 11 18:57:31 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 1dba61e93307e5772faaa60b5141788d0f1763bb (commit)
via ce0c12e7762df5bf6330c3236b2ec7ac2ad48e3c (commit)
via da6824d6e24393caa891908cf9ce487dbd6fbc1e (commit)
via 3a8d910b4ef1436f5b1bd73db348940967723d0d (commit)
via 34032504e60a1a9e93157256e775521db69b7e92 (commit)
via 04aea91de0f2fe1103e4021f880d135da1fd11a9 (commit)
via aceb98983267f6ef0ac735ec334ffd6674275936 (commit)
via 87ccf546b2073e9b65a824a9c508d3cdc270c366 (commit)
via 7041f4798ddb7be51ee08822c8a45fb6e9a08644 (commit)
via f18af55a39e132c57e25774b94acec8cbc0f280e (commit)
via 520afc589076b15dd796aacaee0c6699730bfc11 (commit)
via 5f511378c7d07fec934123cd5438a7538c7a53da (commit)
via bb57b47e0cd363701b09a7685cf361aeecc33cc5 (commit)
via 7135a4cbd3f5c0338292acac5cc3a4f1b034d379 (commit)
via b29493265b3ae9f660eee2d4b911da036d100b0d (commit)
via 4869f1b6ec88eaea1fed5af2a9c697a58559cc63 (commit)
via 7b9140e8eff89fdad149023aa292f62462e07fae (commit)
via f279be86040da34cbc6a3936d4b483a2e70a4377 (commit)
via 0c32d41107bd514a6c28a4014a0900216450b79e (commit)
via 4e872cec54d4f648335cf7e2566d2e38d9f71a3a (commit)
via 95acb17c58e7c8adb6fd154fe099568e27c7f18f (commit)
via 3d1794123e902132671fbc5f9278c05bf5c4eb15 (commit)
via 36c3d454262d814c2174483bec2a6a181c3fd3b0 (commit)
via 7211fd22bad5b3a3939cca6fe766ee65a7c62b13 (commit)
via 75994dc94a2f5d1a500a7789ed113575c49f8b51 (commit)
via 8c83fa0bc67690f388f5e968095b6d55ef18a70f (commit)
from c88716730118c83c482be5fe7095a504c3e45b28 (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 1dba61e93307e5772faaa60b5141788d0f1763bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 11 13:10:32 2017 -0300
Bug 15685: DBRev 17.06.00.014
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ce0c12e7762df5bf6330c3236b2ec7ac2ad48e3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 10 18:15:01 2017 -0300
Bug 15685: Send the basket to _cancel_items_receipt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit da6824d6e24393caa891908cf9ce487dbd6fbc1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 10 18:06:55 2017 -0300
Bug 15685: Avoid "Use of uninitialized value" warning in logs
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3a8d910b4ef1436f5b1bd73db348940967723d0d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 10 17:32:49 2017 -0300
Bug 15685: DBIC Schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 34032504e60a1a9e93157256e775521db69b7e92
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 10 17:01:25 2017 -0300
Bug 15685: Fix DB columns order
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 04aea91de0f2fe1103e4021f880d135da1fd11a9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 10 12:11:14 2017 +0000
Bug 15685: (QA follow-up) Address QA issues
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit aceb98983267f6ef0ac735ec334ffd6674275936
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 5 12:17:33 2017 -0300
Bug 15685: Add tests for Koha::Acquisition::Order->basket
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 87ccf546b2073e9b65a824a9c508d3cdc270c366
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 5 11:38:52 2017 -0300
Bug 15685: POD
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7041f4798ddb7be51ee08822c8a45fb6e9a08644
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 5 11:12:57 2017 -0300
Bug 15685: (QA follow-up) Tidy tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f18af55a39e132c57e25774b94acec8cbc0f280e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 5 11:12:35 2017 -0300
Bug 15685: (follow-up) K:A:O->find and ->fetch are no longer used
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 520afc589076b15dd796aacaee0c6699730bfc11
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 11 11:59:21 2017 +0000
Bug 15685: (QA follow-up) Fix typo
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5f511378c7d07fec934123cd5438a7538c7a53da
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 7 14:54:11 2017 +0000
Bug 15685: (QA follow-up) Improve Update DB entry + Add tests
DB revision fixes
Unit tests
Edit: fixed the update step description (tcohen)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bb57b47e0cd363701b09a7685cf361aeecc33cc5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Nov 10 14:07:18 2016 +0000
Bug 15685: (QA follow-up) Fix qa script errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7135a4cbd3f5c0338292acac5cc3a4f1b034d379
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Nov 10 14:01:37 2016 +0000
Bug 15685: Implement needed changes in Koha::Edifact::Order
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b29493265b3ae9f660eee2d4b911da036d100b0d
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date: Thu Jan 28 15:01:24 2016 -0700
Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket
This adds a new basket attribute (create_items) that can optionally be
set to override AcqCreateItem.
The following have been modified to reflect this (with the value of
create_items that causes them to behave differently in parentheses):
* Cancelling receipt of an order (receiving)
* Creating an order by hand or from MARC (ordering)
* Receiving an order (receiving)
* Showing orders with uncertain price (ordering)
* Showing orders (receiving)
* Showing acquisition details in the OPAC (ordering)
Test plan:
1) Create baskets with "Create items when:" set to ordering,
receiving, cataloging and unset.
2) Test each of the above for each of these baskets, verifying that
the basket-specific attribute overrides AcqCreateItem if set and
falls back to the syspref otherwise.
NOTE: A check of AcqCreateItem in opac-detail.tt was removed because it
was redundant; the code path in question cannot be triggered unless
create_items/AcqCreateItems is set to the correct value anyway.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Barbara Fondren <bfondren at roundrocktexas.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4869f1b6ec88eaea1fed5af2a9c697a58559cc63
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Oct 11 10:16:36 2017 +0000
Bug 18399: (follow-up) Escape reason input
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7b9140e8eff89fdad149023aa292f62462e07fae
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Oct 4 15:04:15 2017 +0000
Bug 18399: Add reasons in edit suggestion page
Test plan:
- Fill the authorised values's category 'SUGGEST' with reason
- Edit a pending suggestion. Set the status to rejected
and select a reason
- Check the reason has been saved (i.e in the suggestions
table of rejected tab)
- Check in the corresponding message_queue that the reason
is here
- Re-edit the same suggestion
- Check that the correct reason is selected by defaut
- Edit an other pending suggetion. Set the status to rejected,
select other reason and fill the input text
- Re-edit the previews suggestion and make sure the input
"other" is displayed by default with the correct value
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f279be86040da34cbc6a3936d4b483a2e70a4377
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 10 09:49:46 2017 -0300
Bug 19085: Remove empty files patron_attributes.* in installer
These files has been added and emptied in the same patch set (bug 5670).
It does not make sense to keep them.
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>
commit 0c32d41107bd514a6c28a4014a0900216450b79e
Author: Your Full Name <your_email>
Date: Thu Oct 5 05:54:55 2017 +0000
Bug 19414: Move the location of the 'Import this batch into the catalog' button
Moves the location of the button in question to be below the framework selector
Test plan:
1. Go to Tools -> Stage MARC records for import
2. Upload a .mrc file and stage it for import
3. Click Manage staged records
4. Note that the import button appears above the framework selector
5. Apply patch
6. Refresh the window
7. Notice that the button has now moved to below the framework selector
Sponsored-By: CALYX information essentials
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4e872cec54d4f648335cf7e2566d2e38d9f71a3a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 11 12:56:24 2017 -0300
Bug 16401: DBRev 17.06.00.013
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 95acb17c58e7c8adb6fd154fe099568e27c7f18f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 11 12:50:26 2017 -0300
Bug 16401: Add a warning if letter.content matches staffClientBaseURL
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3d1794123e902132671fbc5f9278c05bf5c4eb15
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Sep 20 23:28:49 2017 +0200
Bug 16401: (follow-up) Avoid changing empty staffClientBaseURL preference
Adds a condition to check that the staffClientBaseUrl is not empty
before updating it with 'http://'.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 36c3d454262d814c2174483bec2a6a181c3fd3b0
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Aug 15 17:23:00 2017 +0200
Bug 16401: System preference staffClientBaseURL hardcoded to 'http://'
Test plan:
1) Insert some value to staffBaseURL preference, without starting http://
2) Apply the patch
3) Update database
4) Go to system preferences adminsitration, find the staffBaseURL
preference, the inserted value should be prepended with 'http://' and
the comment should be "This should be a complete URL, starting with
http:// or https://. Do not include a trailing slash in the URL. (This
must be filled in correctly for CAS, svc, and load_testing to work.)"
5) prove t/db_dependent/Auth_with_cas.t
6) prove t/db_dependent/selenium/basic_workflow.t
7) prove t/db_dependent/check_sysprefs.t
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7211fd22bad5b3a3939cca6fe766ee65a7c62b13
Author: Marc Véron <veron at veron.ch>
Date: Sun Sep 17 11:53:34 2017 +0200
Bug 19328: Internal server error because of missing currency
This patch fixes internal server errors because of missing active currency
in files aqbudgetperiods.pl, aqbudgets.pl and aqplan.pl.
To reproduce:
- Make sure that no active currency is defined. You can undefine the active
currency in Administration->Currencies and exchange rates
- Try to go to Administration->Budgets and Admistration->Funds
Result: Internal server error
To test:
- Apply patch
- Restart plack
- Try to reproduce issue, it should no longer occur. There should be a
yellow message box "No active currency is defined"
- From Administration-> Budgets administration try to edit a fund and go to
"Planning". Verify that the message box appears here as well.
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 75994dc94a2f5d1a500a7789ed113575c49f8b51
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 27 11:55:45 2017 -0300
Bug 18709: Make koha-foreach use koha-shell internally
This patch simplifies the koha-foreach script, making it use koha-shell
to gain instance privileges and have all environment variables set.
To test:
- Apply the patch
- Have one or more instances created (kohadev already exists in kohadevbox, add
another onewith $ sudo koha-create --create-db test)
- Run:
$ sudo kohaclone/debian/scripts/koha-foreach echo "This is instance __instancename__"
=> SUCCESS: The script runs gracefuly, and outputs something like:
This is instance kohadev
This is instance test
Note: this means the command was executed for each instance and the current behaviour
of replacing the placeholder __instancename__ for the actual instance name still
works as expected.
- You can try the different filter switches, but the logic has not been touched. only the
command call.
- Sign off :-D
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8c83fa0bc67690f388f5e968095b6d55ef18a70f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 27 13:07:59 2017 -0300
Bug 19259: Enforce type of the delay value when editing overdue rules - template side only
Overdue rules do not save when a delay that is not an integer > 0,
without any warnings.
This patch forces the user to select a number > 0.
Test plan:
Without this patch applied, enter non-integer value or negative or 0
=> The rule will not be inserted without any warnings.
With this patch applied you will get an message from the browser and the
form will not save
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 30 ++++----
Koha.pm | 2 +-
Koha/Acquisition/Basket.pm | 17 ++++-
Koha/Acquisition/Baskets.pm | 6 +-
Koha/Acquisition/Order.pm | 19 ++++-
Koha/EDI.pm | 4 +-
Koha/Edifact/Order.pm | 24 +++++-
Koha/Schema/Result/Aqbasket.pm | 16 +++-
acqui/addorder.pl | 9 +--
acqui/addorderiso2709.pl | 8 +-
acqui/basketheader.pl | 2 +
acqui/finishreceive.pl | 7 +-
acqui/neworderempty.pl | 5 +-
acqui/orderreceive.pl | 4 +-
acqui/parcel.pl | 2 +
acqui/uncertainprice.pl | 3 +
admin/aqbudgetperiods.pl | 8 +-
admin/aqbudgets.pl | 8 +-
admin/aqplan.pl | 8 +-
circ/reserveratios.pl | 15 +++-
debian/scripts/koha-foreach | 18 ++---
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 28 +++++++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 ++-
.../prog/en/modules/acqui/basketheader.tt | 16 ++++
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +-
.../prog/en/modules/acqui/uncertainprice.tt | 2 +-
.../en/modules/admin/preferences/acquisitions.pref | 1 +
.../en/modules/admin/preferences/staff_client.pref | 4 +-
.../prog/en/modules/suggestion/suggestion.tt | 41 ++++++++++
.../prog/en/modules/tools/manage-marc-import.tt | 4 +-
.../prog/en/modules/tools/overduerules.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +-
opac/opac-detail.pl | 8 +-
suggestion/suggestion.pl | 17 ++++-
svc/import_bib | 2 +-
t/db_dependent/Acquisition/CancelReceipt.t | 2 +-
t/db_dependent/Auth_with_cas.t | 2 +-
t/db_dependent/Koha/Acquisition/Basket.t | 80 ++++++++++++++++++++
t/db_dependent/Koha/Acquisition/Order.t | 57 ++++++++++++++
t/db_dependent/selenium/basic_workflow.t | 6 +-
42 files changed, 416 insertions(+), 91 deletions(-)
delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.sql
delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.txt
create mode 100644 t/db_dependent/Koha/Acquisition/Basket.t
create mode 100644 t/db_dependent/Koha/Acquisition/Order.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list