Commit Graph

32344 Commits

Author SHA1 Message Date
Katrin Fischer cdf27235f4 Bug 21815: Rephrase HidePersonalPatronDetailOnCirculation
Makes it a little easier to translate, also fixes whitespace and capitalization.

Signed-off-by: Devinim <kohadevinim@devinim.com.tr>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 43d8946d59)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
2018-12-07 18:17:19 +00:00
Nick Clemens 1d797a8e5c Bug 20598: Update number of tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 119653a3a1)

Conflicts:
	t/db_dependent/Circulation.t
2018-12-04 19:00:35 +00:00
Marcel de Rooy 2c77175467 Bug 20598: (QA follow-up) Tiny fixes
[1] Correct POD for _FixOverduesOnReturn
Is called by AddReturn, AddRenewal and LostItem.
Also tested in Circulation.t btw

[2] $dbh is not used in _FixOverduesOnReturn
[3] Moving all parameters to the first line.
[4] Variable $uquery is not used too.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 867f88076e)
2018-12-04 18:51:54 +00:00
Kyle M Hall 25ea817edf Bug 20598: Unit test
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b9ed7699e3)
2018-12-04 18:50:46 +00:00
Kyle M Hall 180909e7a7 Bug 20598: Accruing fines not closed out by longoverdue.pl if WhenLostForgiveFine is not enabled
Test Plan:
1) Ensure WhenLostForgiveFine is disabled
2) Create an overdue with a fine
3) Mark it lost with longoverdue.pl
4) Note it is still marked as an accruing fine
5) Apply this patch
6) Repeat steps 1-3
7) Note it is no longer an accruing fine!

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Followed the test plan and it works.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 461a6f53b8)
2018-12-03 19:24:49 +00:00
Marcel de Rooy 2d1332938c Bug 18677: (QA follow-up) Trivial fixes to Chargelostitem.t
Kind of funny that we did not touch this test here. But it passed!
Trivial fixes:
[1] Typo precessfee
[2] Typo the linked
[3] Add rollback

Test plan:
Run t/db_dependent/Circulation/Chargelostitem.t

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit fab9936ddb)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
2018-12-03 19:05:57 +00:00
Jonathan Druart 8b02c6c3a1 Bug 18677: Remove new issue_id param from charlostitem
We have the itemnumber no need to pass the issue_id, we can retrieve it
from chargelostitem

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3475670881)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
2018-12-03 19:05:32 +00:00
Jonathan Druart 6adfbd33f1 Bug 18677: Make the tests pass
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cd250dae36)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
2018-12-03 19:04:44 +00:00
Kyle M Hall b876d09e35 Bug 18677: issue_id is not added to accountlines for lost item fees
Test Plan:
1) Apply this patch
2) prove t/db_dependent/Accounts.t

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Michal Denar <black23@gmail.com>

[EDIT:]
Patch should have increased the number of tests obviously.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cde7a8e72c)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
2018-12-03 19:03:54 +00:00
Katrin Fischer 0cc87bd3fb
Bug 21796: Don't unlock checkouts if restriction exists but fines are below limit
The checkout form will be removed if various conditions are
met: Restrictions, a fine above noissuescharge etc.

Bug 19933 changed the conditions, so a restriction will no longer
block checkouts, if the fines are below the set limit.

To test:

- Add a restriction
- Confirm the checkouts form is replaced by a message
- Add a fine below the noissuescharge limit
- Confirm that the form reappears
- Apply the patch
- Check that the checkout form is gone now
- Remove restriction - form should reappear
- Add to the fine, so it's above the limit
- Form should disappear

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 99013d6896)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-30 14:13:40 +00:00
Martin Renvoize bc614e6f1a
Update release notes for 18.05.06 release
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-26 12:14:29 +00:00
Martin Renvoize ef8b7013ee
Increment version for 18.05.06 release
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-26 12:09:46 +00:00
Martin Renvoize c48c4b8ad0
Translation updates RMaint followup for Koha 18.05.05
Fix a C string failure in pt-BR-MARC21

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-26 12:07:23 +00:00
Koha translators 7722123b57
Translation updates for Koha 18.05.06
(cherry picked from commit 702986783d44e06fc5b111c986f1d38b64bebcaf)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-26 11:53:41 +00:00
Nick Clemens c86ed52356
Bug 7143: Update about page for new dev Thatcher Leoonard
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 505e10585c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:11:38 +00:00
Tomas Cohen Arazi 45eb022786
Bug 21749: (QA follow-up) Add more tests for ImportFramework
This patch adds tests for:
- Output of ImportFramework on fields removal and error conditions (file
  not found)
- Different file format behaviour (csv, xml and ods are tested).

To test:
- Run
  $ kshell
 k$ prove t/db_dependent/ImportExportFramework.t
=> SUCCESS: All green :-D
- Sign off :-D

Note: the biblio_framework* files are based on the original one on the
patchset, and exported in 17.11 with different formats.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ecf68132b7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:10:58 +00:00
Jonathan Druart 64405cf906
Bug 21749: Fix import of CSV biblio framework
Bug 9701 added 2 new columns to the table marc_tag_structure which broke
the import of biblio frameworks if the CSV file was generated with a
previous version.

Test plan:
- Export a biblio framework from 17.11
- Import it into 18.05+

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

https://bugs.koha-community.org/show_bug.cgi?id=21740

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2d1b80d216)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:10:37 +00:00
Jonathan Druart 9e46509487
Bug 21749: Add tests for ImportFramework
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cbb90000fd)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:10:08 +00:00
Thatcher Leonard 121ba294c4
Bug 18584: Our legacy code contains trailing-spaces
This patch removes trailing spaces from acquisitions-search.inc

Mentored-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e3e2afd88d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:07:33 +00:00
Dimitris Antonakis 5c04130720
Bug 17597: Outdated translation credits
Updated translation credits for the Greek language.

Signed-off-by: Andreas Roussos <arouss1980@gmail.com>
Works as expected, hyperlink to openhub tested OK.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 446142cd2b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:04:24 +00:00
Jonathan Druart a9aec18538
Bug 21282: Sync ordered and spent values with acqui home
The order list for each fund calculates using the ecost tax excl., but
it should be tax incl.
At the moment this means that the sum on the start page table and the
order list don't match up.

Test plan:
- Create and receive orders
- Values on acqui home and ordered/spent should be the same

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9d595e36a7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 16:00:43 +00:00
Martin Renvoize 64a2cdcb83
Bug 21777: (RMaint follow-up) Fix colspan in the footer
This reverts commit 64c1c84fe6.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-23 15:44:57 +00:00
Martin Renvoize aafa08631a
Bug 21777: (RMaint follow-up) Fix for bad merge conflict
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 15:26:16 +00:00
Tomas Cohen Arazi 64c1c84fe6
Bug 21777: (QA follow-up) Fix colspan in the footer
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ea800323b7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:31:56 +00:00
Nick Clemens 538dbc73db
Bug 21777: Fix circulation table alignment
TO test:
1 - Check out an item to a patron
2 - Note the columns are misaligned
3 - Apply patch
4 - Updatedatabase
5 - Reload the patron
6 - Note the table is fixed

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8d4136c766)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:31:24 +00:00
Jonathan Druart d020334b6e
Bug 21777: Add a regression test
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4290426251)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:28:59 +00:00
Jonathan Druart 25fa542479
Bug 21787: Remove unecessary test from GetHardDueDate.t
See description on the bug report for more info.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fa7b2ad08b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:20:37 +00:00
Martin Renvoize f3c27b9979
Bug 21766: Correct filtering on AUDIO_ALERT_PATH js
I managed to introduce a bad filter whilst backporting bug 15734 to the
18.05.x series. This patch attempts to correct that.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:16:24 +00:00
Jonathan Druart f050c4e1f6
Bug 21775: Logout before trying to login
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7f78d4a148)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:13:12 +00:00
Jonathan Druart f18ef61fcb
Bug 21775: [18.05.x] Add selenium tests for audio alerts
To prevent future regressions

(alternative to a58549422d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 14:11:40 +00:00
Jonathan Druart 26b9c4abac
Bug 21015: Remove unecessary 'use Koha::Schema' statements in t/
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9fb827d59d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 13:32:31 +00:00
Joonas Kylmälä f130fd6ec9
Bug 21015: fix performance issue with C4::Members
loading Koha::Schema ("use Koha::Schema;") takes significantly time as
it loads almost a couple hundred classes. Koha::Database has done that
already once and we can use it to get the ResultSet "Borrower" as
well, so let's use that. This also make the code more unified because
Koha::Database is used throughout the code instead of Koha::Schema.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 83e0765f44)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 13:32:12 +00:00
Katrin Fischer 8a98462739
Bug 12258: (QA follow-up) Add some missing rrrrrrs
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

https://bugs.koha-community.org/show_bug.cgi?id=21158

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a83bc8ca4c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 13:15:17 +00:00
Caroline Cyr La Rose 66fd3f7da6
Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required
This patch adds references to cronjobs in the description of some system preferences.

The following system preference description were modified:
- StaticHoldsQueueWeight
- ExpireReservesMaxPickUpDelay
- AutoResumeSuspendedHolds
- finesMode
- DefaultLongOverdueLostValue
- DefaultLongOverdueChargeValue
- PatronSelfRegistrationExpireTemporaryAccountsDelay
- PatronSelfRegistrationVerifyByEmail
- EnhancedMessagingPreferences
- NewItemsDefaultLocation
- InProcessingToShelvingCart
- ReturnToShelvingCart
- ReturnToShelvingCart
- AuthorityMergeLimit
- OpacBrowser
- OpacCloud
- UsageStats
- PurgeSuggestionsOlderThan
- MembershipExpiryDaysNotice

To test, check the above mentioned system preferences to make sure the sentence is there and it is correct.

Followed test plan and patch is as described
Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

https://bugs.koha-community.org/show_bug.cgi?id=12258

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 380f1dcbf8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 13:12:12 +00:00
Josef Moravec 7aa789cced
Bug 21719: Fix typos
This patch was generated using codespell

Test plan:
Read through changes and confirm they make sense

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

https://bugs.koha-community.org/show_bug.cgi?id=21706

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 543630b3c4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:59:57 +00:00
David Cook 8a166e2e29
Bug 21666: Replace unsupported use attribute with more widely supported attribute
search.js uses the 1=1004
author personal attribute which isn't supported by libraries like
Seattle Public Library.

This patch aligns search.js
with C4/Breeding.pm which uses the more widely supported 1=1003
author attribute.

To test:
1. Set up Seattle Public Library as a Z39.50 target
2. Try to search author using the Advanced Editor advanced search
3. Observe failure
4. Apply the patch
5. Try to search again
6. Observe successful retrieval of records

Signed-off-by: Cori Lynn Arnold <carnold@dgiinc.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a08e72c5e7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:54:09 +00:00
Martin Renvoize 805ffe0e63
Bug 21619: Expand tax abreviations in acquisitions form hints
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit dec84e0820)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:48:35 +00:00
Martin Renvoize 775897f020
Bug 21387: Receive items from - form should include tax hints
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 702ca8e9a3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:42:58 +00:00
Marcel de Rooy 28d1eda94a
Bug 21771: (follow-up) Revert the shift statement
Obviously you should never shift an items from an array if you need that
item later on :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with entering userid as well as entering email..

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1885e6a214)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:37:51 +00:00
Tomas Cohen Arazi fc04b4b1bc
Bug 21740: Show @ when editing fixed-length fields on bibliographic frameworks
This is a consistency issue: we store '@' as the subfield for
fixed-lenght fields, yet on editing '_' is displayed (on the form and
the tab). This was probably done to avoid URI encoding problems in the
past.

This patch restores the '@' everywhere.

To test:
- Open the MARC structure for any bibliographic MARC framework
- Choose Actions > Subfields on any fixed-length field
=> ERROR: Notice the tab has an underscore (_) and the subfield code is '_' as well.
- Cancel
=> SUCCESS: '@' is displayed on the list
- Apply this patch
- Restart all the things:
  $ restart_all
- Choose Actions > Subfields on any fixed-length field
=> SUCCESS: '@' is displayed in the tab title, and on the 'Subfield
code' form field.
- Save some changes
=> SUCCESS: Things work correctly.
- Sign off :-D

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

Signed-off-by: Devinim <kohadevinim@devinim.com.tr>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e520d69910)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:21:51 +00:00
Andrew Isherwood 6b4410d967
Bug 20968: (follow-up) Replace tabs with spaces
Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9783773ada)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:12:05 +00:00
Kyle M Hall 2a899edbcc
Bug 20968: Rename method get_intranet_catalog_toolbar_button to intranet_catalog_biblio_enhancements_toolbar_button
Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e87fa069dc)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:11:46 +00:00
Kyle M Hall db0c642d9b
Bug 20968: Add unit tests
Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 60ca17c616)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:11:24 +00:00
Andrew Isherwood cd3af66cd4
Bug 20968: (follow-up) Respond to feedback
This patch:

- Removes the unecessary testing for
intranet_catalog_biblio_enhancements method in detail.pl
- Renames get_toolbar_button to get_intranet_catalog_toolbar_button

Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7910a530b8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:11:05 +00:00
Andrew Isherwood 2c7724f3bf
Bug 20968: Add hooks into cat-toolbar.inc to display buttons
This commit adds hooks into cat-toolbar.inc to allow the display of
arbitrary buttons as supplied by plugins within the
intranet_catalog_biblio_enhancements class that provide the method
get_toolbar_button

To test:

1) Download the plugin from
https://github.com/PTFS-Europe/cla-permissions-check-plugin
2) Follow the installation instructions from:
https://github.com/PTFS-Europe/cla-permissions-check-plugin
3) TEST: Observe that the "CLA Check Permissions" button takes the user
to the Check Permissions page and a modal displays containing the
results of the query
4) Remove the API key from the plugin "Configuration" page
5) TEST: Ensure that the "CLA Check Permissions" button takes the user
to the Check Permissions page and message displays informing the user
that "Did not receive required request parameters"

https://bugs.koha-community.org/show_bug.cgi?id=20968

Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 741f17e916)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:10:44 +00:00
Nick Clemens c3243e912f
Bug 21640: Enable output to STDOUT for Itiva outbound script
To test:
 1 - Enable the TalkingTechItivaPhoneNotification
 2 - Copy 'HOLD' notice 'email' transport to the phone section
 3 - Enable EnhancedMessagingPreferences
 4 - Find a patron and enable 'phone' for the 'Hold filled' notice
    Note: You might not be able to do this straightaway, bug 21639
    If the phone box has a '-' and not a checkbox:
    sudo koha-mysql kohadev
    INSERT INTO message_transports (message_attribute_id,message_transport_type,is_digest,letter_module,letter_code) VALUES (4,'phone',0,'reserves','HOLD');
 5 - Place a hold for the patron
 6 - Check it in and confirm the hold to set it waiting
 7 - sudo koha-shell kohadev
 8 - perl misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl --type=RESERVE -w 0 -v
 9 - Note the Output says it will be on STDOUT, but nothing is output
10 - Apply patch
11 - repeat
12 - Hold info is output to command line

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 12ed04eabb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:09:08 +00:00
Jonathan Druart 241032230d
Bug 21606: [sql_modes] Fix matching rules insert
Fix:
Incorrect integer value: '' for column 'offset'
Incorrect integer value: '' for column 'score'

Test plan:
Add/edit matching rules

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 32c4dbfd68)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-16 12:07:34 +00:00
Jonathan Druart be3fec7132
Bug 21604: Fix add/edit fund/budget
[Strict SQL modes context]

For insert aqbudgetperiods:
Incorrect integer value: '' for column 'budget_period_id'

For insert/update aqbudgets
Incorrect integer value: '' for column 'budget_owner_id'
Incorrect decimal value: '' for column 'budget_encumb'

Test plan:
Add/edit budgets and funds

A good example of why we should use Koha::Object for all our objects

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7085772e8d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-09 16:36:44 +00:00
Marcel de Rooy e1783e2c4a
Bug 21604: Add two trivial test cases
Adding an id in AddBudgetPeriod and an empty string in AddBudget for
budget_encumb.

Test plan:
Run Budgets.t with/without this patch in strict sql mode.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 433fc3f120)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-09 16:36:27 +00:00
Magnus Enger da971a81da
Bug 21585: Ignore missing firstname in ILL requests table
To test:
- Make sure you have a patron with just a surname and no firstname
- Create an ILL request so that the name of this patron shows up in
  the Patron column of the ILL requests table
- Before the patch, the name will display as "null Surname"
- Apply the patch
- Reload the ILL requests page
- The name should now display as just "Surname"
- Sign ye merrily off

Signed-off-by: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5ea877f6cb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2018-11-09 16:34:08 +00:00