[koha-commits] main Koha release repository branch master updated. v20.05.00-669-g97eef397a4
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 18 18:13:34 CEST 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 97eef397a439fa416773a67d0ed767859adb01fc (commit)
via 7941d8d3c00086c7990cdfa4c72791ee96addfae (commit)
via d3501a0920c644d03e910e86f639009c9a2c7bcb (commit)
via c528f235bc01fd45363cf7ce05e4a47df4768026 (commit)
via c6d633f0d42ae0361f64a3c0a169371dd17f4cab (commit)
via 883e86a571e4b3f957c463350584932c5cb0b906 (commit)
via cb8400d9fe5f1246076fec3b527b73647baa8421 (commit)
via 38619de9db76ee9b6c9b888129a52d7416406a4c (commit)
via 5a474e50e00be3cf0a20832fb294fdaa4e23f00f (commit)
via b1235746d9e0c3ebebbc51441b73224d11598982 (commit)
via b036710feaedfd96810fdb19dfee13217bfa6b58 (commit)
via 484061a44e068a5a130941ac28d8a187cb238ad3 (commit)
via 0d19d9fa44dfddcaef06ea6e59feab5ed8dbb01e (commit)
via 168c8f2e31733f78e62e9b9401e95b2419f60921 (commit)
via 14d3a7dfe3744680f1efe387fc88bb3e79609b4c (commit)
via 274075a63f438110b0dcbb8f5a0b6f0fae53eb3f (commit)
via 66e70c9201162f1188f3289ddfa53d195e58f672 (commit)
via f661ecd50f4346bd55200bf71ddc1ded8c395768 (commit)
via bf2ec138ff788206be0e27d0882aaa3bb7da6cb8 (commit)
via cbc3a37f8ed5e80560f6f93b258335e70a20fbf7 (commit)
via ded8b7f63f260e1725a27430291f242fdad02400 (commit)
via 7c0cf2c73edb504f20931a3012a40aaf06c5d1e1 (commit)
via cad0cbee6d2fb71e85f0622798b9db43ce18b497 (commit)
via 0c67613f7b7b844d32a037cc90986aed3ccfc6ab (commit)
via 89721cb42b3928c745677c70fd9061273d1848dd (commit)
via 1c5c55c0e66c0aec416a5e0c957343eeb0ea0aa8 (commit)
via 95551b569fa0f00095ffae69ac4b3f832f7554ee (commit)
via 393ecb4a9cc4c906b4bfcecf6357874e300fa3bd (commit)
via 4fadb7ac1931b48a4be8160409d35ca97ab6b322 (commit)
via 467e491a25652bf8ee85651ab91e3780c66e3aa1 (commit)
via 9371685b973a287b7642fb907721f4964d92e65a (commit)
via 2de2b1330f540ef9482c1ed547b111757f0a551a (commit)
via c7174b204a324ee2431012e7f9a3cc09738d57de (commit)
via 41205adf34a4cde773fb399728ca74d9dada0e81 (commit)
via ff5f7c787482fff5611b3fdeaed89598dfa29d64 (commit)
via af8aa1ad7eb4857a86d395b3833b8040630306b6 (commit)
via 8344ee7b4ced266ac7bd48254f4695175fd8f19b (commit)
via 807147fb7b20c837f9afc3e2d6ba589d86d86cbe (commit)
via c933e25b6f226eb2536761f04b5fc6608c7f80c4 (commit)
via d3cf6f7f29fbb8d2798bd8089d98691855b8231d (commit)
via 4d0e22f97aa0c9d6313b35780a2a6ca50d03222c (commit)
via f3c66c6d945a5f67bc42a1fbad01d47d28f1f23e (commit)
via 3b1640e0ef16c694f8ac58d17ee736f8fe87ed6a (commit)
via eeb7ac6fc0d14c9e731b7759c78f37cadcfa575f (commit)
via 43dc505a52a2679e40a22ff610c91552cd8f2fd1 (commit)
via 2f3a886f7b23f37f04a687cb0c1755c3195c2ce6 (commit)
via fc22fb308bdbfc6d1bda3448e966542f2828ad76 (commit)
via 7a53c5f04cf2bb03734c82e9f964f108f9198d28 (commit)
via 9509e834de14b3fd88296143032100f2b1c907fe (commit)
via a7e3c12e6175e19299e7bdbe60d1bc7d41d45ce8 (commit)
via d8f3e0ec0dbaf73075299a88a254334cfaf1d29e (commit)
via 47671123206a475f86de9316d8b256e14aa54bc1 (commit)
via 5bca73080f89bb2f4ca83ce6ceb9fa8e3c4a7d92 (commit)
from 6d7ff0d5040ca9759fee0609a6b7108773b81357 (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 97eef397a439fa416773a67d0ed767859adb01fc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 17:43:29 2020 +0200
Bug 25906: Compiled CSS (late)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7941d8d3c00086c7990cdfa4c72791ee96addfae
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date: Tue Jul 7 16:01:58 2020 -0400
Bug 25945: Description of AuthoritySeparator is misleading
This patch changes the description of the AuthoritySeparator system preference
To test:
1. Apply patch
2. Go to Administration > Global system preferences > Cataloging and locate the
AuthoritySeparator preference
3. Read the description and make sure it makes sense and that there are no typos
or grammatical errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3501a0920c644d03e910e86f639009c9a2c7bcb
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 29 13:49:03 2020 +0000
Bug 26086: Add 'cron' to log viewer interface options
Signed-off-by: Rebecca Coert <rcoert at arlingtonva.us>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Bug 26086: (follow-up) Be consistent with space in cron job
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c528f235bc01fd45363cf7ce05e4a47df4768026
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 15:40:44 2020 +0000
Bug 6725: DBRev 20.06.00.025
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c6d633f0d42ae0361f64a3c0a169371dd17f4cab
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Aug 15 02:48:20 2020 +0000
Bug 6725: (QA follow-up) Slightly rephrase PatronDuplicateMatchingAddFields
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 883e86a571e4b3f957c463350584932c5cb0b906
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 5 12:20:08 2020 +0200
Bug 6725: Make patron duplicate matching flexible
This patch adds a new system preference PatronDuplicateMatchingAddFields
to list the patron's attributes to use for deduplication.
The default value is surname, firstname and dateofbirth to keep existing
behaviour.
Test plan:
0. Apply the patch and execute the update DB entry
1. Create a new patron with surname, firstname
2. Create another patron with the same surname, firstname values
=> Confirm you get the duplicate warning
3. Modify the syspref to edit the list of attributes used to dedup
4. Repeat 1 and 2 with different values and confirm that you get the
behaviours you expect
Note: This is only impacting the add patron form from the UI, not the
import patrons tool.
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cb8400d9fe5f1246076fec3b527b73647baa8421
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 16:55:56 2020 +0200
Bug 16748: Add the ability to define due date in batch checkout
This patch allows the librarian to pick the due date when batch checkout
Test plan:
Batch checkout using a hard due date
=> Notice that the due date is taken into account
Batch checkout the same barcodes with a different due date, to trigger the confirmation step
=> Notice that the due date is taken into account for the renewals
Signed-off-by: Henry Bolshaw <bolshawh at parliament.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 38619de9db76ee9b6c9b888129a52d7416406a4c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 26 13:20:53 2018 +0200
Bug 20469: Add item status to staff article request form
The template checks if an item is checked out, on hold (waiting or
transit), not for loan. (Note: This can be extended in the future
in a general include as we have at opac side.)
Test plan:
[1] Place an article request on an item on loan. Verify status on form.
[2] Place an article request on a waiting item. Check status again.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
[EDIT] Simplified on 2020-07-27
Removed Koha::Item->is_waiting_or_transit.
Use Koha::Item->itemtype to check notforloan on itemtype level.
Adjusted commit message accordingly.
Additional test:
[3] Place an article request on a not for loan item. Check status.
NOTE: Not for loan is informational too. It does not say that this item
is not available for an article request. Depends on local situation.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5a474e50e00be3cf0a20832fb294fdaa4e23f00f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 27 13:34:21 2020 +0000
Bug 20469: Remove effective parameter
Test plan:
Run test Koha/Item.t again
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b1235746d9e0c3ebebbc51441b73224d11598982
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 27 12:31:14 2020 +0000
Bug 20469: Add Koha::Item->itemtype
Also needed to add a missing rollback to preceding subtest.
Test plan:
Run t/db_dependent/Koha/Item.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b036710feaedfd96810fdb19dfee13217bfa6b58
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jul 10 17:39:53 2020 +0100
Bug 22393: (QA follow-up) Typos and Filters
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 484061a44e068a5a130941ac28d8a187cb238ad3
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Apr 21 15:54:45 2020 +0100
Bug 22393: (follow-up) Corrections for QA feedback
We correct the behviour of 'amount' being passed back to the template
and add a work around for the existance of deleted_items alongside a FK
to items in the accountlines table.
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0d19d9fa44dfddcaef06ea6e59feab5ed8dbb01e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Feb 10 14:55:13 2020 +0000
Bug 22393: Remove last remaining use of C4::Accounts::manualinvoice
This patch re-arranges the manualinvoice controller script to clarify
code flow, replaces the last call to C4::Accounts::manualinvoice with a
call to Koha::Accounts->add_debit wrapped in a try catch block and also
adds a check on passed barcodes when the invoice type is 'LOST' so it
can link the subsequently created accountline to the item and issue.
Test plan
1/ Add a manual invoice (without entering a barcode)
2/ Add a manual invoice with a valid barcode (Not a LOST type)
3/ Add a manual invoice with a valid, but old, barcode (Not a LOST type)
4/ Add a manual invoice with an invalid barcode, note that an error is
displayed
5/ Add a manual invoice with type 'LOST' and a valid barcode for a
checkout your user has had checked out
6/ Add a manual invoice with type 'LOST' and a valid barcode, but not
one that will match a checkout for your user. Note an error is displayed
7/ When errors are displayed, note the form contains data from the
previous submission so you can just correct the error rather than
re-enter all data.
8/ Signoff
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 168c8f2e31733f78e62e9b9401e95b2419f60921
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 17 16:57:54 2020 +0000
Bug 24884: Remove 'New list' button in 'Public lists' tab if OpacAllowPublicListCreation is disabled
This patch adds a check on the OpacAllowPublicListCreation system
preference to the OPAC lists template so that if public list creation is
disabled the "New list" button doesn't appear under the "Public lists"
tab.
To test, apply the patch and confirm that the virtualshelves preference
is enabled.
- With the OpacAllowPublicListCreation system preference enabled, go to
the OPAC and view the lists page.
- If you are logged in you should see a "New list" link under both the
"Your lists" tab and the "Public lists" tab.
- If you are not logged in you should see "Log in to create a new
list" on both pages.
- View the page with OpacAllowPublicListCreation disabled.
- If you are logged in you should see a "New list" link under only the
"Your lists" tab.
- If you are not logged in you should see the "Log in" link only under
the "Your lists" tab.
Works perfectly!
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 14d3a7dfe3744680f1efe387fc88bb3e79609b4c
Author: Lari Taskula <lari.taskula at hypernova.fi>
Date: Sat Apr 11 19:48:48 2020 +0000
Bug 25114: Remove duplicated logic from GetLoanLength()
Remove duplicated logic for searching circulation rules.
This can be replaced with get_effective_rules().
To test:
1. prove t/db_dependent/Circulation/GetHardDueDate.t
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 274075a63f438110b0dcbb8f5a0b6f0fae53eb3f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Aug 15 18:53:25 2020 +0000
Bug 25364: Undo change to 'None specified'
As this has been a little controversial, this patch undoes
the change to "None specified / Prefer not to say" to be
"None specified" again as before this patch set.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 66e70c9201162f1188f3289ddfa53d195e58f672
Author: David Roberts <david at koha-ptfs.co.uk>
Date: Mon May 4 02:29:14 2020 +0000
Bug 25364: Add "Other" to the gender options in a patron record
This patch adds "Other" as an option, and also changes the wording of
"None specified" slightly.
To test:
1) Apply the patch
2) Check that there is an "Other" radio button in the patron record, and
that the wording of "None specified" has changed to "None specified /
Prefer not to say".
3) Check that you can save changes to the gender of this patron record,
both on create and modify.
4) Check that these changes also work in the Opac Self-Registration
functionality.
Correct typos in previous commit
Signed-off-by: Devinim <kohadevinim at devinim.com.tr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f661ecd50f4346bd55200bf71ddc1ded8c395768
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 26 20:12:58 2020 +0000
Bug 25654: Make the contact and non-patron guarantor sections separate on patron entry form
This patch reverses what I think was an unintended change made by Bug
14570 in which the non-patron guarantor fields are shown for all patron
types (not just child patrons) and grouped with the patron contact fields.
This patch creates a new "Non-patron guarantor" fieldset to show along
with "Patron guarantor" when adding or editing child patrons.
To test, apply the patch check that the BorrowerUnwantedField system
preference does not contain contactname, contactfirstname,
or relationship.
- Open an adult patron for editing. You should see no guarantor-related
fields.
- Open a child patron for editing. There should be two guarantor
sections: "Patron guarantor" and "Non-patron guarantor."
- Test that adding patron guarantors and non-patron guarantors works
correctly.
- Add "contactname|contactfirstname|relationship" to the
BorrowerUnwantedField system preference.
- Reload the child patron entry form. The non-patron guarantor
section should now be hidden.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bf2ec138ff788206be0e27d0882aaa3bb7da6cb8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 27 14:39:22 2020 +0000
Bug 25694: Add ability to delete a Marc Modification Template when viewing
This patch adds a "delete template" button to the MARC modification
templates "Edit actions" view.
To test, apply the patch and go to Tools -> MARC modification templates.
- On the main MARC modification templates page the toolbar should have
only one button: "New template."
- Click the "Edit actions" button for an existing template.
- On the "Actions for..." view there should be three buttons, "New
template," "New action," and "Delete template."
- Test that the "Delete template" button works correctly.
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cbc3a37f8ed5e80560f6f93b258335e70a20fbf7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 23 11:52:20 2020 +0000
Bug 25832: Add DataTables to MARC subfield structure admin page for authorities
This patch adds DataTables sorting and filtering to the table of
subfields shown on the Authority MARC subfield structure administration
page.
To test, apply the patch and go to Administration -> Authority types.
- From the 'Actions' menu, select 'MARC structure.'
- From the 'Actions' menu, select the 'Subfields' link for a tag
with multiple subfields.
- On the page showing all the subfields for the tag, confirm that
the table is sorted by default by subfield and that sorting works
correctly.
- Confirm that the search form at the top of the table works.
Signed-off-by: Katrin <katrin.fischer at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ded8b7f63f260e1725a27430291f242fdad02400
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 13:50:32 2020 +0000
Bug 25867: DBRev 20.06.00.024
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7c0cf2c73edb504f20931a3012a40aaf06c5d1e1
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 14 13:17:01 2020 +0000
Bug 25867: Database update for changing existing frameworks
This updates the descriptions for 952$a und $b in all existing
frameworks, if the English description hasn't been changed since
installing Koha.
To test:
- Look at your item edit form or on the MARC tab
for the descriptions shown for $a and $b for any framework
- Note the descriptons say '... location'
- Change one or more using the frameworks.
- Run the database update
- Verify only the unchanged ones have been updated
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cad0cbee6d2fb71e85f0622798b9db43ce18b497
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jul 18 01:43:02 2020 +0000
Bug 25867: Label "Current location" as "Current library" and "Permanent location" as "Home library"
There is some confusion between the different locations and
libraries appearing in the GUI.
holdingbranch is sometimes labeled as current location
homebranch is sometimes labeled as permanent location
The patch fixes these occurences in various files:
- Item search form, results and export options
- MARC frameworks for en, fr-Fr, nb-NO, and pl-PL
- Holds awaiting pickup report
- Item display on order receive screen (create items on receive)
- OPAC system preference: OPACResultsLibrary
- Staff and OPAC detail pages
- Lost items report
- Rotating collections
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0c67613f7b7b844d32a037cc90986aed3ccfc6ab
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Jul 25 15:10:24 2020 +0000
Bug 26065: Move translatable strings out of marc_modification_templates.tt and into marc_modification_templates.js
This patch removes the <script> block in the MARC modification
templates template in which strings are defined for translation
purposes.
Strings are now in place in the JavaScript file and wrapped in the new
__() function.
To test, apply the patch and clear your browser cache if necessary.
- Perform some actions which will trigger translated strings, for
example:
- Create a new template
- Add an action to the template and then delete it.
- The confirmation should appear correctly
- Add an action. Select "Copy" as the operation and click "Add action"
without filling in any fields.
- You should see a message, "Both subfield values should be filled
or empty"
TESTING TRANSLATABILITY
- Update a translation, e.g. fr-FR:
> cd misc/translator
> perl translate update fr-FR
- Open the corresponding .po file for JavaScript strings, e.g.
misc/translator/po/fr-FR-messages-js.po
- Locate strings pulled from
koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js for
translation, e.g.:
msgid "Both subfield values should be filled or empty."
msgstr ""
- Edit the "msgstr" string however you want (it's just for testing).
- Install the updated translation:
> perl translate install fr-FR
- Switch to your newly translated language in the staff client and
repeat the test plan above. The translated string should appear.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 89721cb42b3928c745677c70fd9061273d1848dd
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Aug 14 01:49:40 2020 +0000
Bug 25778: Fix var scope in koha-plack for PERL5LIB and KOHA_HOME
Currently, if a koha-plack is given multiple instances, it will create
duplicate $KOHA_HOME/installer and $KOHA_HOME/installer/lib entries
in PERL5LIB as these changes are done at the global rather than local level.
This issue can only be seen in non-dev Koha, since dev Koha installs
rewrite PERL5LIB.
This patch localizes PERL5LIB to each instance.
To test dev installs:
0. cp debian/scripts/koha-plack /usr/sbin/koha-plack
1. koha-plack --restart kohadev
2. Note that nothing breaks
To test non-dev installs:
0. Don't replace /usr/sbin/koha-plack yet
1. Create multiple non-dev installs with plack enabled and running
2. Set up one of these non-dev installs so you can use the web
UI (that is beyong the scope of this test plan)
3. koha-plack --restart test1 test2 test3
4. For test3, go to /cgi-bin/koha/about.pl
5. Note that there are duplicate /usr/share/koha/installer
and /usr/share/koha/lib/installer entries in PERL5LIB
6. cp debian/scripts/koha-plack /usr/sbin/koha-plack
7. koha-plack --restart test1 test2 test3
8. For test3, go to /cgi-bin/koha/about.pl
9. Note that there are no duplicates entries in PERL5LIB
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1c5c55c0e66c0aec416a5e0c957343eeb0ea0aa8
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Aug 12 16:07:05 2020 +0100
Bug 26194: (follow-up) Default to current branch
When adding a new register, it would be helpful to default to the
current logged in branch.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 95551b569fa0f00095ffae69ac4b3f832f7554ee
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 11 19:33:41 2020 +0000
Bug 26194: Add link to cash register management from message about missing registers
In places where the interface warns the user about missing cash
registers we should provide users with permission a direct link to the
cash register management page.
To test, apply the patch and enable the UseCashRegisters and
EnablePointOfSale preferences.
If necessary, go to Administration -> Cash registers and remove any cash
registers for your library.
- Log in to the staff interface as a user with "manage_cash_registers"
permission.
- Locate a patron who has outstanding fines.
- Under Accounting -> Make a payment, click the "Pay" button next to a
fine.
- The page should show the message about missing cash registers with a
button which take you directly to the "Add new cash register" form.
- Perform the same check by selecting the checkbox next to a fine and
clicking the "Pay amount" button and the "Pay selected" button.
- Test the message shown at:
- Tools -> Cashup registers.
- Point of sale -> Register details
- Point of sale -> Library details
- Perform the same tests when logged in as a user without permission to
manage cash registers. The messages shown in the previous steps
should omit the button linking to cash register management.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 393ecb4a9cc4c906b4bfcecf6357874e300fa3bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 5 16:35:37 2020 +0000
Bug 26149: Remove jquery.checkboxes plugin from problem reports page
This patch removes the inclusion of the jquery.checkboxes plugin from
the problem reports template in the staff interface.
To test, apply the patch and make sure the OPACReportProblem system
preference is enabled.
- Submit a few OPAC problem reports if necessary
- Go to Tools -> OPAC problem reports
- Test that the "Select all" and "Clear all" controls at the top of the
table work correctly.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4fadb7ac1931b48a4be8160409d35ca97ab6b322
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 6 11:42:33 2020 +0000
Bug 26159: Remove the use of jquery.checkboxes plugin from batch record delete page
This patch removes the use of the jquery.checkboxes plugin from the
batch delete records page.
To test, apply the patch and go to Tools -> Batch record deletion.
- Submit a batch of biblionumbers which includes one or more
checked-out items, one or more on-hold items, and one or more records
with no items.
- On the confirmation page, test the selection links at the top of the
results table. Each one should work correctly.
- Submit a batch of authority record ids which includes some records
which are in use and some which aren't.
- On the confirmation page, test the selection links at the top of the
results table. Each one should work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 467e491a25652bf8ee85651ab91e3780c66e3aa1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 13 12:34:19 2020 +0000
Bug 26201: Remove the use of jquery.checkboxes plugin from batch extend due dates page
This patch removes the use of the jquery.checkboxes plugin from the
batch extend due dates page.
Unrelated change: Removed 'enctype="multipart/form-data"' from the form
because there is no file upload.
To test, apply the patch and go to Tools -> Batch extend due dates.
- Submit the form with parameters which will return a set of multiple
checkouts.
- On the results page, test the "Select all" and "Clear all" links to
confirm that they work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9371685b973a287b7642fb907721f4964d92e65a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 13 13:19:19 2020 +0000
Bug 26202: Remove the use of jquery.checkboxes plugin from batch record modification page
This patch removes the use of the jquery.checkboxes plugin from the
batch record modification page.
To test, apply the patch and go to Tools -> Batch record modification
- Submit a batch of biblionumbers for modification.
- On the results page, test the "Select all" and "Clear all" links to
confirm that they work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2de2b1330f540ef9482c1ed547b111757f0a551a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 13 13:54:54 2020 +0000
Bug 26204: Remove the use of jquery.checkboxes plugin from staff interface lists
This patch removes the use of the jquery.checkboxes plugin from the
staff interface lists page.
To test, apply the patch, go to Lists, and view the contents of a
list with multiple titles on it.
Check that the "Select all" and "Clear all" links work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c7174b204a324ee2431012e7f9a3cc09738d57de
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 13:39:17 2020 +0000
Bug 26212: Remove the use of jquery.checkboxes plugin from pending offline circulations
This patch removes the use of the jquery.checkboxes plugin from the
pending offline circulations page, replacing it with in-page JS.
Unrelated: The JS-based creation of the "select all" and "clear all"
controls has been replaced with HTML links. Labels are added to the
results table to make checkbox selection easier.
To test, apply the patch and go to Circulation.
- Upload an offline circulation file (.koc) with multiple transactions.
If you don't want to generate this file using the desktop application
or Firefox add-on you can create a text file like this (tab
separated):
Version=1.0 Generator=koct-firefox GeneratorVersion=0.1
2020-08-14 13:24:21 issue 0109132 33000000093476
- Go to Pending offline circulation actions. You should see the list of
transactions you uploaded.
- Test that the "Check all" and "Uncheck all" controls work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 41205adf34a4cde773fb399728ca74d9dada0e81
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 14:47:40 2020 +0000
Bug 26214: Remove the use of jquery.checkboxes plugin on late orders page
This patch replaces the use of the jquery.checkboxes plugin on late
orders page in acquisitions.
Unrelated changes: The "Check all" and "Uncheck all" links are moved out
of the table header so that it matches similar interfaces. Sorting is
now disabled on the checkboxes column and the table is sorted by default
on the "Order line" column.
To test, apply the patch and go to Acquisitions -> Late orders.
- On the initial view, there should be no "Check all" or "Uncheck all"
links.
- Select a vendor in the left-hand sidebar form.
- When the filtered table is redisplayed the "Check all" and "Uncheck
all" links should now be visible.
- Test that the links work correctly.
- Confirm that the checkboxes column cannot be sorted and that the
table is sorted by default by order line number.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff5f7c787482fff5611b3fdeaed89598dfa29d64
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 15:18:37 2020 +0000
Bug 26215: Remove the use of jquery.checkboxes plugin from Z39.50 search pages
This patch removes the use of the jquery.checkboxes plugin from three
Z39.50 search templates: Acquisitions, Authorities, and Cataloging.
To test, apply the patch and test the controls for selecting and
deselecting Z39.50 search targets on the following pages:
- In Acquisitions: Locate a vendor and add to basket -> From an
external source.
- In Authorities: Click "New authority" -> "New from Z39.50/SRU."
- In Cataloging: Click "New from Z39.50/SRU."
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit af8aa1ad7eb4857a86d395b3833b8040630306b6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 17:28:22 2020 +0000
Bug 26216: Remove the use of jquery.checkboxes plugin from catalog search results
This patch removes the use of jquery.checkboxes plugin from the
staff interface catalog search results page.
To test, apply the patch and perform a catalog search in the staff
interface which will return results.
On the search results page test the "Select all" and "Clear all" links
at the top of the results. They should work correctly.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8344ee7b4ced266ac7bd48254f4695175fd8f19b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 14:18:00 2020 +0000
Bug 26213: Remove the use of jquery.checkboxes plugin when adding orders from MARC file
This patch removes the use of the jquery.checkboxes plugin from the page
for adding orders to a basket from a staged MARC file.
This patch fixes an unreported bug wherein the "select all" and "clear
all" controls affected not only MARC record checkboxes but also the
"show inactive funds" checkboxes.
To test, apply the patch and go to Acquisitions.
- Go to Vendor -> Add to basket -> From a staged file.
- Select a staged file with multiple records.
- Test the "Select all" and "Clear all" links at the top of the "Select
to import" tab. They should work correctly to select and deselect
checkboxes corresponding to staged MARC records.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 807147fb7b20c837f9afc3e2d6ba589d86d86cbe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 6 11:28:53 2020 +0200
Bug 23632: Remove C4::Logs::GetLogs
Koha::ActionLogs->search must be used instead.
There is no call to this subroutine in our code, it should be removed.
Test plan:
Make sure the 3 test files still return green and that there is no more
occurrences of GetLogs in the codebase.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c933e25b6f226eb2536761f04b5fc6608c7f80c4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 14 12:57:25 2020 +0000
Bug 23695: (follow-up) Add exceptions for missing branch parameters
JD: amended patch
Remove QA issues:
FAIL t/db_dependent/Circulation.t
FAIL valid
"my" variable $doreturn masks earlier declaration in same scope
"my" variable $messages masks earlier declaration in same scope
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3cf6f7f29fbb8d2798bd8089d98691855b8231d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Aug 13 14:40:52 2020 +0100
Bug 23695: (QA follow-up) Fix Copy/Paste
The value remained as 'tobranchcd' and needed to be updated to
'frombranchcd' to allow reservered transfers to be correctly set.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4d0e22f97aa0c9d6313b35780a2a6ca50d03222c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 23 12:46:26 2020 +0000
Bug 23695: (follow-up) Adjust for addition of transfer trigger
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f3c66c6d945a5f67bc42a1fbad01d47d28f1f23e
Author: Nick <nick at bywatersolutions.com>
Date: Mon Sep 30 10:37:03 2019 +0000
Bug 23695: Alter transferbook to take a hash of params and specify from_branch
To test:
1 - Go to Circulation->Transfer
2 - Find an item from your branch and create a transfer to branch B
3 - Note you can specify the origin and default is 'Item's holding library'
4 - Confirm the item is marked as held at your current branch and is being transferred to B
5 - Find an item from a third branch, branch C
6 - Transfer that item to branch B from branch D
7 - Confirm the item is held at branch D and is being transferred to B
8 - prove -v t/db_dependent/Circulation.t
9 - prove -v t/db_dependent/Koha/Items.t
10 - prove -v t/db_dependent/RotatingCollections.t
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3b1640e0ef16c694f8ac58d17ee736f8fe87ed6a
Author: Nick <nick at bywatersolutions.com>
Date: Mon Sep 30 10:37:03 2019 +0000
Bug 23695: Set holding branch to transferring branch when manually initiating a transfer
To test:
1 - Go to Circulation->Transfer
2 - Note your signed in branch
3 - Find an item from your branch and create a transfer to branch B
4 - Confirm the item is marked as held at your current branch and is being transferred to B
5 - Find an item from a third branch, branch C
6 - Transfer that item to brnach B
7 - Confirm the item is held at your current branch and is being transferred to B
8 - prove -v t/db_dependent/Circulation.t
9 - prove -v t/db_dependent/Koha/Items.t
10 - prove -v t/db_dependent/RotatingCollections.t
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eeb7ac6fc0d14c9e731b7759c78f37cadcfa575f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 16 15:44:40 2020 +0200
Bug 25751: Add ORDERED in dropdown list of suggestion's statuses
The status "ORDERED" is missing from the pull down list of
status values when editing a suggestion, so the first
option is selected "No status".
This leads to data loss when editing a suggestion in the
status "ORDERED". Worse: the status can't be reset to
"ORDERED" and so no AVAILABLE notice can be sent to the patron.
Test plan:
- Create a suggestion, accept it, create a new order from this suggestion.
- Verify status is "ORDERED"
- Edit the suggestion
=> Without this patch the dropdown list does not have
"Ordered", and if you save you lost the status
=> With this patch applied the dropdown list has "Ordered"
preselected. You can save and preserve the status.
Signed-off-by: Holly Cooper <hc at interleaf.ie>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 43dc505a52a2679e40a22ff610c91552cd8f2fd1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 13 12:56:33 2020 +0000
Bug 25872: Fix scoping of $limits
The code in build_query_compat contained a 'my' in the assigning of limits for the search in a conditional
This meant the limits were being set correctly during the conditional, but we blanked when passed to the rest
of the code. The effect was that the searches worked, however, the template params to repeat the search were
incomplete.
Removing the my ensures the same limits are applied during search and on re-sorting
To test:
1 - Enable Elasticsearch
2 - On OPAC perform advanced search, selecting only an itype, ccode, or LOC limit
3 - Attempt to sort results
4 - You are returned to Advanced search
5 - Apply patch
6 - Repeat
7 - It sorts!
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2f3a886f7b23f37f04a687cb0c1755c3195c2ce6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 13 12:55:21 2020 +0000
Bug 25872: Unit tests
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fc22fb308bdbfc6d1bda3448e966542f2828ad76
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 3 13:09:54 2020 +0200
Bug 26119: Enable patron's attribute edition when PatronSelfRegistrationVerifyByEmail
There is no good reason remove the ability to edit patron's attributes
if PatronSelfRegistrationVerifyByEmail is set.
We cannot have them in the self-registration form (because we don't
store patron's attributes during self-ref), but we can have them when
a patron show/edit their information.
Test plan:
0. Enable PatronSelfRegistrationVerifyByEmail and create patron's
attributes that can be edited at the OPAC
1. Create a new patron using the self-reg feature
=> You don't have the ability to fill in the patron's attribute
2. Edit your personal details (OPAC)
=> Without this patch you still don't see the patron's attribute that
can be edited at the OPAC
=> With this patch applied you can!
3. Notice the wording change on the "Modify patron attribute type" form
and confirm it makes sense
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7a53c5f04cf2bb03734c82e9f964f108f9198d28
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 3 15:07:24 2020 +0200
Bug 26127: local_referer should not compare with OPACBaseURL case insensitive
In our test data we have OPACBaseURL that is filled with http://kohadev.myDNSname.org:8080,
but the CGI referer in local_referer is lowercase
We should compare it without case sensitivity
Test plan:
- Use koha-testing-docker
- Notice the value of OPACBaseURL
=> http://kohadev.myDNSname.org:8080
- Use the "reports a problem" feature at the OPAC
- Notice that the "Problem found on page" is correctly filled with the
referer
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9509e834de14b3fd88296143032100f2b1c907fe
Author: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Date: Thu Aug 13 13:13:55 2020 +0000
Bug 26182: Clarify wording on CanMarkHoldsToPullAsLost and UpdateItemWhenLostFromHoldList
To test:
- apply patch, restart
- search sysprefs for CanMarkHoldsToPullAsLost
- confirm both sysprefs come up in search and syspref descriptions refer to each other
Signed-off-by: Holly Cooper <holly.teresa.cooper at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a7e3c12e6175e19299e7bdbe60d1bc7d41d45ce8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 17 12:12:55 2020 -0300
Bug 26228: Update gulpfile to work with Node.js v12
This patch makes the gulpfile work with gulp v4 on Node v12. To test it,
make sure your dev env has Node.js v12.
It also replaces the use of 'gulp-util' (deprecated) by 'minimist' as
recommended on their site.
On both KTD and KohaDevBox edit your sources.list so the node line
points to 'node_12.x' instead of 'node_8.x'.
Once that's done:
1. On your clone run:
$ yarn install
$ npm install -E
2. Build the CSS:
$ yarn build
$ yarn build --view opac
=> SUCCESS: Things build correctly
3. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d8f3e0ec0dbaf73075299a88a254334cfaf1d29e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 14 11:30:12 2020 +0000
Bug 26078: (follow-up) Use a boolean rather than changing returnbranch
Bug 26078: (follow-up) used validTransfer instead of checking WrongTransfer message
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 47671123206a475f86de9316d8b256e14aa54bc1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 30 16:59:14 2020 +0000
Bug 26078: Prevent generating a new transfer from return policy when resolving a transfer
To test:
- Have 2+ branches
- Set your default return policy to Item returns to issuing library
- Find an item with holding branch of Branch A
- Set your library to Branch B
- Check item in
- Koha generates a transfer to Branch A. In doing so, it sets the item holding branch to Branch B
- Set your library to Branch A
- Check item in
- Koha generate a transfer to Branch B. In doing so, it sets the item holding branch to Branch A
- Set you library to Branch A
- Check the item in
. . . Repeat indefinitely.
Apply patch
Repeat
No more loop
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5bca73080f89bb2f4ca83ce6ceb9fa8e3c4a7d92
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 30 14:16:09 2020 +0200
Bug 26090: Fix "item types" report
This report was broken with SQL strict mode, but also without.
DBD::mysql::st execute failed: 'koha_kohadev.itemtypes.itemtype' isn't
in GROUP BY [for Statement "
and, if no library was selected:
DBD::mysql::st execute failed: Unknown column 'biblioitems.itemtype' in
'field list' [for Statement "
This patch does the minimum to make it usable, but it would need more
love.
Test plan:
To test you will need to try the 4 combinaisons:
item-level_itypes = item or biblio
With or without a library selected in the dropdown list
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 107 +-
C4/Log.pm | 77 +-
C4/RotatingCollections.pm | 8 +-
Koha.pm | 2 +-
Koha/Item.pm | 14 +
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +-
Koha/Util/Navigation.pm | 2 +-
circ/branchtransfers.pl | 11 +-
debian/scripts/koha-plack | 90 +-
gulpfile.js | 62 +-
.../marc21/mandatory/marc21_framework_DEFAULT.yml | 8 +-
.../Obligatoire/marc21_framework_DEFAULT.sql | 4 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 32 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 32 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 30 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 26 +
.../includes/csv_headers/catalogue/itemsearch.tt | 2 +-
.../prog/en/includes/waiting_holds.inc | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 1 -
.../prog/en/modules/acqui/lateorders.tt | 23 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../prog/en/modules/acqui/z3950_search.tt | 1 -
.../en/modules/admin/auth_subfields_structure.tt | 31 +-
.../prog/en/modules/admin/cash_registers.tt | 8 +-
.../prog/en/modules/admin/patron-attr-types.tt | 2 +-
.../en/modules/admin/preferences/cataloguing.pref | 4 +-
.../en/modules/admin/preferences/circulation.pref | 4 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/admin/preferences/patrons.pref | 6 +
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/catalogue/itemsearch.tt | 4 +-
.../prog/en/modules/catalogue/moredetail.tt | 2 +-
.../prog/en/modules/catalogue/results.tt | 1 -
.../en/modules/cataloguing/z3950_auth_search.tt | 1 -
.../prog/en/modules/cataloguing/z3950_search.tt | 1 -
.../prog/en/modules/circ/article-requests.tt | 11 +
.../prog/en/modules/circ/branchtransfers.tt | 11 +
.../en/modules/circ/circulation_batch_checkouts.tt | 24 +-
.../prog/en/modules/members/maninvoice.tt | 54 +-
.../prog/en/modules/members/memberentrygen.tt | 139 +--
.../prog/en/modules/members/moremember-brief.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 21 +-
.../prog/en/modules/offline_circ/list.tt | 30 +-
.../prog/en/modules/plugins/plugins-home.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 14 +-
.../intranet-tmpl/prog/en/modules/pos/register.tt | 14 +-
.../intranet-tmpl/prog/en/modules/pos/registers.tt | 15 +-
.../prog/en/modules/reports/itemslost.tt | 2 +-
.../rotating_collections/rotatingCollections.tt | 2 +-
.../prog/en/modules/suggestion/suggestion.tt | 18 +
.../prog/en/modules/tools/batch_delete_records.tt | 67 +-
.../en/modules/tools/batch_extend_due_dates.tt | 21 +-
.../en/modules/tools/batch_record_modification.tt | 16 +-
.../modules/tools/marc_modification_templates.tt | 19 +-
.../prog/en/modules/tools/problem-reports.tt | 1 -
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +-
.../prog/en/modules/virtualshelves/shelves.tt | 17 +-
koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js | 14 +-
.../prog/js/marc_modification_templates.js | 39 +-
koha-tmpl/intranet-tmpl/prog/js/pages/results.js | 10 +-
koha-tmpl/intranet-tmpl/prog/js/z3950_search.js | 12 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 16 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +
members/maninvoice.pl | 189 ++--
members/memberentry.pl | 9 +-
package.json | 4 +-
reports/itemtypes.plugin | 72 +-
t/Koha/Util/Navigation.t | 6 +-
t/db_dependent/Circulation.t | 47 +-
t/db_dependent/Circulation/Branch.t | 8 +-
t/db_dependent/Circulation/transferbook.t | 84 +-
t/db_dependent/Illrequest/Logger.t | 19 -
t/db_dependent/Koha/Item.t | 19 +-
t/db_dependent/Koha/Items.t | 6 +-
t/db_dependent/Koha/Patron/Messages.t | 4 +-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 8 +-
t/db_dependent/Log.t | 134 +--
yarn.lock | 1028 +++++++++++++++-----
84 files changed, 1803 insertions(+), 1051 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list