Commit Graph

4220 Commits

Author SHA1 Message Date
Lucas Gass ac5fbb0f51 Bug 24379: DBRev 20.05.02.001
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-24 21:55:44 +00:00
Nick Clemens 6d675b61ad Bug 24379: Make login_attempts not nullable
While the column defaults to 0 in Koha::Object->store we set to NULL if NULLABLE

When trying to reset a patrons password we check that the account is not administratively locked:
login_attempts != -1

This query does not return rows where login_attempts IS NULL. It will return accounts where login_attempts = 0

Let's default to 0 like we intend

To test:
1 - Create a new patron
2 - Note their login_attempts is NULL
    SELECT login_attempts FROM borrowers ORDER BY borrowernumber DESC LIMIT 1
3 - Enable  OpacResetPassword
4 - Attempt to reset password before logging in, you cannot
5 - Apply patch, updatedatabase, restart_all, update schema
6 - Create another patron
7 - Their login attempts should be 0
8 - Attempt to reset password, it works!

Bug 24379: Fix the test

First we create a patron using TestBuilder to get a hashref of valid
info. Then we delete it and create a new patron using Koha::Patron->new
Once stored, we should call discard_changes to make the calculated
values available in the currenct object.

Bug 24379: Don't drop default of 0 for login attempts

When moving the column we drop the default, this means that DBs upgraded form earlier versions
get the wrong values set

To test:
1 - Checkout 16.11.x
2 - Reset all
3 - Checkout master
4 - updatedatabase
5 - SHOW CREATE TABLE borrowers;
6 - Note the column login_attempts defaults to NULL
7 - Apply patch(es)
8 - Repeat
9 - Now it defaults ot 0 (and has NOT NULL if applied all)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 7bb31cffae)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-24 21:48:29 +00:00
Lucas Gass 7c89a88df4 Increment version for 20.05.02 release
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-22 20:59:18 +00:00
Lucas Gass 9baea3aceb Bug 25851: DBRev 20.05.01.003
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-17 19:52:49 +00:00
Jonathan Druart 266d7de35a Bug 25851: (bug 18928 follow-up) Remove holdallowed rule is value is an empty string
On the interface, if "Hold policy" is "Not set", the rule does not exist
in the table. We should reflect that during the update DB process.

Test plan:
1. Set "Hold policy" to "Not set"
2. Confirm that you can place holds
3. Confirm that the rule does not exist in the DB table
4. Set the value to an empty string (manually)
5. Confirm that you cannot longer place holds
6. Go to the circulation rules page and confirm that the value of "Hold
policy" is "Not set"
7. Execute the update DB entry
8. Confirm that you can place holds
9. Confirm that the rule does not exist in the DB table

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>
(cherry picked from commit c1e1c233ca)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-17 19:48:42 +00:00
Julian Maurice b8a1515ad3 Bug 21395: Make perlcritic happy
This patch adds a .perlcriticrc (copied from qa-test-tools) and fixes
almost all perlcrictic violations according to this .perlcriticrc
The remaining violations are silenced out by appending a '## no critic'
to the offending lines. They can still be seen by using the --force
option of perlcritic
This patch also modify t/00-testcritic.t to check all Perl files using
the new .perlcriticrc.
I'm not sure if this test script is still useful as it is now equivalent
to `perlcritic --quiet .` and it looks like it is much slower
(approximatively 5 times slower on my machine)

Test plan:
1. Run `perlcritic --quiet .` from the root directory. It should output
   nothing
2. Run `perlcritic --quiet --force .`. It should output 7 errors (6
   StringyEval, 1 BarewordFileHandles)
3. Run `TEST_QA=1 prove t/00-testcritic.t`
4. Read the patch. Check that all changes make sense and do not
   introduce undesired behaviour

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit b168f4a2e9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 16:44:43 +00:00
Julian Maurice a5e4c9b57e Bug 25858: Use bitwise OR for setting a bit in borrowers.flag
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Thanks-to: Didier Gautheron <didier.gautheron@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 6886cf93ec)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:53:48 +00:00
Nick Clemens f9efb8024b Bug 25858: (bug 25858 follow-up) Don't attempt to set flag if already set
Signed-off-by: Didier Gautheron <didier.gautheron@biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit e38634ceb8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:53:33 +00:00
Lucas Gass 34acff4fa0 Bug 25232: DBRev 20.05.01.002
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:44:14 +00:00
Kyle M Hall b326c76cab Bug 25232: Add ability to skip trapping items with a given notforloan value
This is a companion/alternative to bug 25184, in that it allows an
explicit workflow for placing returned books into temporary storage for
a few days for decontamination purposes.

The idea here is to create a specific notforloan value for "In
Decontamination" or something along along those lines. This notforloan
value would never be trappable. At the end of decon,
UpdateNotForLoanStatusOnCheckin  could be used to remove the
notforloan status and allow checkins to be trapped to fill holds.

Test Plan:
1) Apply this patch
2) Restart all the things!
3) Give an item a negative notforloan value
4) Place a hold on the item
5) Check the item in
6) Note the item is trapped for hold
7) Set SkipHoldTrapOnNotForLoanValue to the same notforloan value
   you used in step 3
8) Check the item in again
9) Note Koha did not ask you to trap the item for hold!

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 465e5562fc)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:36:28 +00:00
Lucas Gass 6abb06a30b Bug 24986: DBRev 20.05.01.001
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:21:55 +00:00
Jonathan Druart c234daac2a Bug 24986: Modify some borrowers DB fields to (TINY|MEDIUM)TEXT
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 16a5197aa9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-07-13 15:16:55 +00:00
Jonathan Druart a534549529 Increment version for 20.05.01 release
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-06-23 16:31:32 +02:00
Tomas Cohen Arazi 59adc02b74 Bug 25707: (QA follow-up) Clearer message about what's going on
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit f32825ae26)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-06-16 22:06:49 +00:00
Kyle M Hall 9d34cfb775 Bug 25707: (bug 11529 follow-up) Do not update marc mappings, print old mappings to upgrade log
This patch removes the update of marc frameworks from the updatedatabase script and warns the
"MARC to Keyword" (fieldmappings ) to the upgrade log so they can be replaced manually

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit e239e13bc9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
2020-06-16 22:06:31 +00:00
Martin Renvoize 17cd698b46
Bug 24380: (RM follow-up) Fix update statement to prevent regression
The update statement did not respect the original value of
CalcalateFinesOnReturn and so would result in an unexpected functional
change during upgrades.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-22 14:49:06 +01:00
Martin Renvoize a2af51d688
Increment version for 20.05.00 alpha release
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-22 11:40:08 +01:00
Martin Renvoize 291d8a5ee3
Bug 13881: (RM follow-up) Fix terminology
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-19 08:19:49 +01:00
Martin Renvoize 94470aa7c3
Bug 13881: DBRev 19.12.00.091
Correction to preference terminology

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-19 08:18:23 +01:00
Martin Renvoize bc421faa0d
Bug 13881: DBRev 19.12.00.090
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-18 11:43:55 +01:00
Martin Renvoize 85243da0b4
Bug 13881: (RM follow-up) Make 'Desks' feature optional
This patch adds a new 'UseIssueDesks' preference which defaults to
"Don't use" to enabled/disable the 'Desks' functionality added with this
bug.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-18 11:41:28 +01:00
Martin Renvoize f96a105e87
Bug 24994: Correct DB Updates
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-15 10:05:35 +01:00
Martin Renvoize 7e720e7e82
Bug 23794: (RM follow-up) Remove warnings from updatedatabase
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-13 16:54:08 +01:00
Jonathan Druart 8b28590113
Bug 23794: (follow-up) Remove extra carriage return
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-13 16:04:47 +01:00
Martin Renvoize 4429b42036
Bug 25389: DBRev 19.12.00.089
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-13 10:36:25 +01:00
Martin Renvoize c5f34fe3ad
Bug 25389: Catch errant cases of LOST_RETURNED
For upgrades taking place after the fix for the update in bug 24592 was
pushed, we need to catch any last remaining error cases and correct
them.

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>
2020-05-13 10:36:20 +01:00
Martin Renvoize bd6ccad5d9
Bug 25389: Catch LOST_RETURNED in DB update 19.12.00.021
An errant update from bug 22563 could lead to cases of LOST_RETURNED as
aposed to LOST_RETURN as an account_credit_type. This patch adds code to
deal with those cases to the update for bug 24592

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>
2020-05-13 10:36:15 +01:00
Martin Renvoize 483e40d223
Bug 25389: Correct stray cases of LOST_RETURNED
The original DB update for bug 22563 incorrectly mapped CR to
LOST_RETURNED as aposed to LOST_RETURN.  This patch catches such cases
and updates them in the update for bug 23805

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>
2020-05-13 10:36:10 +01:00
Martin Renvoize ed564837a6
Bug 25389: Correct original DB update for bug 22563
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>
2020-05-13 10:36:02 +01:00
Martin Renvoize f248063ee5
Bug 25184: (RM follow-up) Make DB update idempotent
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:14:20 +01:00
Martin Renvoize 12dfbe7f03
Bug 24378: DBRev 19.12.00.088
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:12:13 +01:00
Jonathan Druart 3f9fc43a71
Bug 24378: (QA follow-up) fix minor issues
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:03:59 +01:00
Katrin Fischer cf0a6f4820
Bug 24378: (follow-up) Format due date as due date
Changes the due date formatting as was already done
for the new sample files on bug 23787.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:03:50 +01:00
Katrin Fischer d5fa69df93
Bug 24378: Database update to rewrite notice if left unchanged
The database update makes the same changes as done by
Andrew on the old database entry. We check for full sentences
left unchanged to minimize issues with changes made by the library.

Test plan of first patch applies.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:03:42 +01:00
Andrew Fuerste-Henry eba7a32df5
Bug 24378: Change wording of auto_renewals notice in updatedatabase
On the template of AUTO-RENEWALS the wording is grammatically incorrect:

[% IF checkout.auto_renew_error == 'too_many' %]
You have reach the maximum of checkouts possible.

This should say
[% IF checkout.auto_renew_error == 'too_many' %]
You have reached the maximum of checkouts possible.

Test plan:
- Make sure you have the AUTO_RENEWALS notice with the problematic
  spelling
- install patch
- update database
- confirm changes to notice name and wording

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Kept Andrew's change on the original updatedatabase entry,
but removed the database update to be done a little differently
in a follow-up patch.

Amended test plan.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 11:03:23 +01:00
Katrin Fischer 0b75907757
Bug 23787: (follow-up) Format due date as due date
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 10:58:06 +01:00
Andrew Fuerste-Henry 851f433b77
Bug 23787: Add AUTO_RENEWALS to sample_notices
Removed "\" from "It\'s too late..." -- apparently that doesn't need to get escaped in YAML

To test:
- create a new English (en) install
- confirm presence of auto renewal notice

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 10:57:49 +01:00
Katrin Fischer 3aecd0afb0
Bug 23787: Add sample AUTO_RENEWALS notice to translatd installers
This adds the default auto renewal notice to the translated
installers. Translating will be handled by maintainers of the
installers, but this way we don't end up with installations
having a different set of notices than others.

To test:
- Verify the sample_notices.sql files load correctly
or
- Run the web installer for each of those languages and
  verify sample_notices loads correctly.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-12 10:57:34 +01:00
Martin Renvoize 575878f0fb
Bug 25184: (RM follow-up) Syntax error correction
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-11 11:10:41 +01:00
Bernardo Gonzalez Kriegel 040abebb7d
Bug 25410: Sync liblibrarian and libopac descriptions
During translations some subfields show different
descriptions for intranet/opac

Just a little string change

To test:
1) Check if changes make sense and
there are no errors
2) Check if a clean install loads default marc21
frameworks without problem.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-11 09:54:59 +01:00
Martin Renvoize f806adf0ea
Bug 25184: DBRev 19.12.00.087
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-11 08:57:47 +01:00
Kyle M Hall 82e866fcb5
Bug 25184: Add syspref
It's entirely possible that some libraries are relying on the current
before for part of their workflow. Do to this possibility, it seems like
a good idea to control this behavior via a system preference.

Test Plan:
1) Apply this patch set
2) Run updatedatabase.pl
3) Set TrapHoldsOnOrder to "don't trap"
4) Set an item's notforloan value to -1
5) Place a hold on that item
6) Check in the item
7) Note the item is not trapped for hold
9) Set TrapHoldsOnOrder to "trap"
10) Check in the item
11) Koha should now ask if you'd like to trap the item for the hold!

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-11 08:55:13 +01:00
Martin Renvoize cdf786b0aa
Bug 24163: DBRev 19.12.00.086
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:14:49 +01:00
Jonathan Druart 2042cb6531
Bug 24163: Add the new CSV profile to other installer files
export_format is not populated for other languages apparently...

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:08:41 +01:00
Jonathan Druart 6a5cdfa37f
Bug 24163: (QA follow-up) Fix wordings
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:08:37 +01:00
Jonathan Druart af4d8a5751
Bug 24163: Add the csv into the DB - as an example
Sponsored-by: Institute of Technology Tralee
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Angela O'Connor Desmond <angela.oconnordesmond@staff.ittralee.ie>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:08:31 +01:00
Katrin Fischer 031e53958a
Bug 22335: Fix comment on suggestions.STATUS in kohastructure.sql
The description on STATUS was incomplete, missing 2 status and
the SUGGEST_STATUS category.

To test:
- Later this will show up in schema.koha-community.org, but
  for now it can only be verified reading the patch.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:02:46 +01:00
Bernardo Gonzalez Kriegel 0a8775cfab
Bug 7947: (follow-up) fix 490 subfield visibility (IT)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:02:11 +01:00
Bernardo Gonzalez Kriegel 2cbe7bc17a
Bug 7947: (follow-up) fix 490 subfield visibility (DE)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:02:06 +01:00
Bernardo Gonzalez Kriegel 09ccb2e968
Bug 7947: (follow-up) fix 490 subfield visibility (EN)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-05-05 11:02:01 +01:00