From gitmaster at git.koha-community.org Fri Mar 1 13:00:41 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Mar 2019 12:00:41 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-90-gb19b36f Message-ID: 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, 18.11.x has been updated via b19b36fb6260932dff3961ec9ed1202188d367de (commit) via 00fff866dd25c89f740b46e6366868027fe7512a (commit) via 7609009a7319ad6e631bac6fd39a8a5397566782 (commit) via eeeae403a1cf3ef0860abec23cd05ac8577e996d (commit) via 2daeeafc23b0872b4640ef48d7b84558129c130b (commit) via 1ca64ce757ca92071d1c0c6c4c9fc306e8808972 (commit) via f9892cd621e9c1c17dac41771b607119bee05840 (commit) via c20af7c877b8a13f51cb94aec97dee55fc15db56 (commit) via 6e091d5d236226346b2d354dd43c38121352ed7b (commit) via fe9a4b624fe2cc1cd6e351b027ef3c9187bf18b4 (commit) via 0e174855a0a11f3b530163b4559624d883f60a4d (commit) via ba368d929f9d739d4f7e4e3c3e9710fd08e000d9 (commit) via 8b570caf8aba4b883a5631caca652191df3aed9e (commit) from 37374dc82b25b90d843a77634bbbc0d0ea6aef6d (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 b19b36fb6260932dff3961ec9ed1202188d367de Author: Kyle M Hall Date: Tue Jan 8 13:10:53 2019 -0500 Bug 22084: Plugin upgrade method and database plugin version storage will never be triggered for existing installs If an existing plugin begins using the upgrade() method, it will never actually get triggered because the installation has already occurred and no database plugin version was stored at the time. Without that database version, the upgrade method will never be triggered. In addition, if the plugin has no upgrade method, the installed version is never updated in the database! Lastly, when an upgrade succeeds it prints a warning that the upgrade failed. Test Plan: 1) Install an older version of the Kitchen sink plugin: * https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.0/koha-plugin-kitchen-sink-v2.1.0.kpz 2) Delete the "__INSTALLED_VERSION__" key, and the "last_upgraded" key from plugin_data for this plugin, to simulate having installed from an earlier version of Koha 3) Upgrade to the latest version of the Kitchen sink plugin: * https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.22/koha-plugin-kitchen-sink-v2.1.22.kpz 4) Note "__INSTALLED_VERSION__" still doesn't exist for the plugin, in the plugin_data table 5) Apply this patch 6) Restart all the things 7) Browse to the Kitchen sink configuration page, this should trigger the upgrade method 8) Note the "__INSTALLED_VERSION__" and "last_upgraded" keys exist in plugin_data for the Kitchen Sink plugin Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 8c2e03020dc02519dec70b9697794a3624c73937) Signed-off-by: Martin Renvoize commit 00fff866dd25c89f740b46e6366868027fe7512a Author: Tomas Cohen Arazi Date: Wed Jan 9 07:33:15 2019 -0300 Bug 22084: Regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 57f4c01b9a09d1c2e0fc8a3449ba86574775b840) Signed-off-by: Martin Renvoize commit 7609009a7319ad6e631bac6fd39a8a5397566782 Author: Tomas Cohen Arazi Date: Mon Feb 11 16:05:23 2019 -0300 Bug 21765: Make AutoUnsuspendReserves call Koha::Hold->resume This patch makes the mentioned method use the biult-in method for resuming a suspended hold, instead of manually setting the specific attributes using the accessors. The side effect for this is that HoldsLog is now honoured. This patchset also refactors the tests a bit so they rely on the exposed methods and thus don't rely on specific implementation details (like suspended hold means a date in suspended_until plus suspended=1). To test: - Apply the regression tests patch - Run: $ kshell k$ prove t/db_dependent/Reserves/AutoUnsuspendReserves.t => FAIL: It fails loudly because things are done manually - Apply this patch - Run: k$ prove t/db_dependent/Reserves/AutoUnsuspendReserves.t => SUCCESS: Tests pass! Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 7c3a5c78c1aacbdb0ad7eb758cb9880ecefcce3a) Signed-off-by: Martin Renvoize commit eeeae403a1cf3ef0860abec23cd05ac8577e996d Author: Tomas Cohen Arazi Date: Mon Feb 11 16:04:59 2019 -0300 Bug 21765: Regression tests Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit d441ce5cdadba7a87570162b9f54600c82f150e2) Signed-off-by: Martin Renvoize commit 2daeeafc23b0872b4640ef48d7b84558129c130b Author: Tomas Cohen Arazi Date: Fri Feb 22 11:31:52 2019 -0300 Bug 22397: Wrong message in koha-sip --start This patch makes koha-sip --start calls mention 'SIP server' instead of the wrong 'Zebra daemon'. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit e47fa012f6e1ecf94712e0cb759625f136703c03) Signed-off-by: Martin Renvoize commit 1ca64ce757ca92071d1c0c6c4c9fc306e8808972 Author: Nick Clemens Date: Wed Feb 20 20:00:01 2019 +0000 Bug 22378: Fix audio alerts on SCO Note: The SCO only supports sounds with a full URL, not KOha built in sounds To test: 1 - Enable audio alerts 2 - Enable SCO 3 - Note JS error on loading the alerts 4 - Apply patch 5 - No more error 6 - Test with bug 18251 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fb4707b97cec006e0e6f5c4b4dd430146e97f16a) Signed-off-by: Martin Renvoize commit f9892cd621e9c1c17dac41771b607119bee05840 Author: Josef Moravec Date: Mon Feb 25 18:21:26 2019 +0000 Bug 22411: Date and time in log viewer should respect Test plan: Go to log viewer and show some log -- without patch the date ant time in first column is formatted as yyyy-mm-dd hh:mm -- with patch the date is formatted according to your dateformat system preference Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit dd8749661ce7e48e86fc4eeba3c7c42e0321184e) Signed-off-by: Martin Renvoize commit c20af7c877b8a13f51cb94aec97dee55fc15db56 Author: Fridolin Somers Date: Thu Feb 21 17:21:58 2019 +0100 Bug 15149: Serial test prediction pattern does not consider end date To reproduce: 1) add a serial. 2) set first issue = today 3) set frequency = 1/month 4) dont set subscription length 5) set subscription start date = today 6) set subscription start date = today + 1 year 7) set numbering pattern = Number 8) test prediction pattern. => Without patch : you will get a list of 1000 issues, going well beyond subscripton end date. => With patch : shows only the issues within the date range. Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: zhihui Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e3212c8a969ff17783e50d564aaa412bd01a99b1) Signed-off-by: Martin Renvoize commit 6e091d5d236226346b2d354dd43c38121352ed7b Author: Jonathan Druart Date: Fri Feb 22 11:06:46 2019 -0300 Bug 18957: Record the time part of the last renewed date issues.lastreneweddate is a datetime and we could record the time part of the date. Test plan: Renew an issue note that the time part of the last renewed date is set correctly Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 4585228ea9b5cc407dcec8e4bae499d59007ea96) Signed-off-by: Martin Renvoize commit fe9a4b624fe2cc1cd6e351b027ef3c9187bf18b4 Author: Jonathan Druart Date: Fri Feb 22 11:01:38 2019 -0300 Bug 18957: Add tests Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 54fd0718da1bd27531c7f3ac4ea16d04fb15e634) Signed-off-by: Martin Renvoize commit 0e174855a0a11f3b530163b4559624d883f60a4d Author: Josef Moravec Date: Mon Feb 25 09:18:50 2019 +0000 Bug 14850: (QA follow-up) Remove debugging code Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e99a6de09335fdbe227292835b5231b13d9c1f18) Signed-off-by: Martin Renvoize commit ba368d929f9d739d4f7e4e3c3e9710fd08e000d9 Author: Kyle M Hall Date: Fri Feb 22 07:12:10 2019 -0500 Bug 14850: Funds from inactive budgets appear in 'Funds' dropdown on acqui/invoice.pl Test Plan: 1) Create some inactive and active budgets 2) View an invoice in acquisitions 4) Note the shipping fund dropdown behaves like acqui/parcels.pl Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 831531d3bbd0e440693595d0b4fadc704b020d68) Signed-off-by: Martin Renvoize commit 8b570caf8aba4b883a5631caca652191df3aed9e Author: Tomas Cohen Arazi Date: Fri Feb 22 12:00:35 2019 -0300 Bug 22396: Make koha-sip set KOHA_HOME and KOHA_CONF correctly This patch corrects a typo, and exports KOHA_CONF as other scripts do. To test: - Apply this patch - Run: $ # in kohadevbox $ perl misc4dev/cp_debian_files.pl - Try the new script $ sudo koha-sip --start kohadev => SUCCESS: tail -f /var/log/koha/kohadev/sip* doesn't show fatal errors anymore - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 7128db531c18d3c75a4bad3424bd77732c0d4687) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- C4/Reserves.pm | 2 +- Koha/Plugins/Base.pm | 7 +- acqui/invoice.pl | 66 ++++++---- debian/scripts/koha-sip | 7 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 46 +++++-- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 +- serials/showpredictionpattern.pl | 2 +- t/db_dependent/Circulation.t | 6 +- t/db_dependent/Plugins.t | 27 +++- t/db_dependent/Reserves/AutoUnsuspendReserves.t | 135 +++++++++++++++++--- 12 files changed, 235 insertions(+), 71 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 4 16:39:51 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Mar 2019 15:39:51 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.16-1-gca0aa48 Message-ID: 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, 17.11.x has been updated via ca0aa482df9915d5c7f4ec49880f1b76ddbc58ba (commit) from b561c2dbd3321374b5f26a66ef90ecb47e5371f9 (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 ca0aa482df9915d5c7f4ec49880f1b76ddbc58ba Author: Fridolin Somers Date: Tue Feb 26 07:42:56 2019 +0100 Bug 21587: [17.11.x] correct rebase Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/addorder.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 4 20:05:33 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Mar 2019 19:05:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-617-g62b4fbb Message-ID: 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 62b4fbb9dd6b440630251fd6686bf7af83b6d5e2 (commit) via d6d91ac32fdd6c8f3e5fad19a29a943044ec0214 (commit) via ec4ea59ec55de1816b47ab13f33597e4eb9c7664 (commit) via dd98584c8572b85afbd68ff98423605df9b18822 (commit) via ff20d029e397acbac2ddaf9d11e6a0a7dc184ce2 (commit) via a17c2d9c9fb08ce362b07c3ea1420ae30f0527e8 (commit) via 7df5b35a36e859f745f42b5c857cd965c83b55f3 (commit) via eeda2afd3a710cbf4115b96f1386294df7693252 (commit) via ef2a03a09249ee53ff2c431085673aca3f7c9863 (commit) via c2061adc8be1a6843c0e082c18629f4a6b8fac78 (commit) via 6d53910f0ca05ae41b0d10ce6f3eb274efd3aca4 (commit) via 2331b8a295ce3db011b88bf3d42eacd42c9df4ee (commit) via 9f8187257a45b502a2b53ec1768177e7883dda35 (commit) from f355788b340b19912891fd41c3168bac9c951aff (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 62b4fbb9dd6b440630251fd6686bf7af83b6d5e2 Author: Hayley Mapley Date: Sun Mar 3 22:26:54 2019 +0000 Bug 18584: remove trailing space from C4/XSLT.pm Test plan: 1) Open C4/XSLT.pm and confirm that the trailing space at line 313 is gone. 2) Sign off. Signed-off-by: Hayley Mapley Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit d6d91ac32fdd6c8f3e5fad19a29a943044ec0214 Author: Josef Moravec Date: Mon Feb 25 08:46:11 2019 +0000 Bug 22404: Fix parameter "for" of labels in subscription add form Attribute "for" of tag labelshould contain input id, not name. Test plan: 1) Go to serials -> add subscription second step 2) Click on labels of these three fields: - First issue publication date - Subscription start date - Subscription end date --> without patch, nothing happen --> with path, the datepicker is shown Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ec4ea59ec55de1816b47ab13f33597e4eb9c7664 Author: Nick Clemens Date: Mon Mar 4 18:37:43 2019 +0000 Bug 22228: Update test for updated mappings Signed-off-by: Nick Clemens commit dd98584c8572b85afbd68ff98423605df9b18822 Author: Ere Maijala Date: Thu Jan 31 13:43:00 2019 +0200 Bug 22228: Escape lone colons and make sure term is balanced Escapes unquoted colons that have whitespace on either side. Removed unbalanced quotes. Test plan: 1. Make sure the test case described in the bug works 2. Make sure tests pass: prove t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t Signed-off-by: Bj?rn Nyl?n Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit ff20d029e397acbac2ddaf9d11e6a0a7dc184ce2 Author: Nick Clemens Date: Mon Mar 4 13:30:55 2019 -0500 Bug 19575: DBRev 18.12.00.018 Signed-off-by: Nick Clemens commit a17c2d9c9fb08ce362b07c3ea1420ae30f0527e8 Author: David Gustafsson Date: Mon Feb 18 14:56:17 2019 +0100 Bug 19575: Don't lower case fields in db and use update script instead of raw SQL Signed-off-by: Nick Clemens commit 7df5b35a36e859f745f42b5c857cd965c83b55f3 Author: Nick Clemens Date: Fri Feb 15 14:49:33 2019 +0000 Bug 19575: (RM follow-up) Fix mapping typo Found with QA tools, simple fix Signed-off-by: Nick Clemens commit eeda2afd3a710cbf4115b96f1386294df7693252 Author: David Gustafsson Date: Thu Feb 14 16:52:04 2019 +0100 Bug 19575: Keep authority-number as alias and fix query Keep authority-number as alias and change field name from alias to real field in hard coded Elasticsearch query Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ef2a03a09249ee53ff2c431085673aca3f7c9863 Author: Nick Clemens Date: Thu Feb 14 12:44:13 2019 +0000 Bug 19575: Fix an search field Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit c2061adc8be1a6843c0e082c18629f4a6b8fac78 Author: root Date: Tue Feb 12 21:52:39 2019 +0000 Bug 19575: Rebase and fix tests This patch lower cases the sort by fields to normalize checking them and adjusts some existing tests to meet the new expectations. The regex for splitting terms has been moved into a subroutine so that adjustment was made Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 6d53910f0ca05ae41b0d10ce6f3eb274efd3aca4 Author: David Gustafsson Date: Fri Nov 3 13:21:22 2017 +0100 Bug 19575: Use canonical field names and resolve aliased fields Adjust elastic search mappings to more closely match Zebra equivalents resolving serveral issues with coded Zebra searches in templates and sorting of search results in UI. Also make field names in search strings case insensitive to accept case variations in template links and user input. Sponsored-by: Gothenburg University Library Signed-off-by: Nick Clemens Signed-off-by: Ere Maijala Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 2331b8a295ce3db011b88bf3d42eacd42c9df4ee Author: Jonathan Druart Date: Thu Feb 21 15:28:10 2019 -0300 Bug 22360: (bug 21205 follow-up) Restore OPACAcquisitionDetails behavior Caused by commit 7d10549ae8632e6640d3a99014268a2a1e46b3c4 Bug 21205: Replace C4::Items::GetOrderFromItemnumber calls At this point $order is a Koha::Acquisition::Order object, not a hashref anymore. Test plan: Create an order, receive items Enable OPACAcquisitionDetails At the detail page of the bibliographic record you should see "X items are on order." at the bottom of the items list Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 9f8187257a45b502a2b53ec1768177e7883dda35 Author: Aleisha Amohia Date: Tue Feb 19 21:00:31 2019 +0000 Bug 22370: Prevent OPAC users from seeing staff news from URL To test: 1) Have some OPAC and staff only news items 2) On the OPAC view a single news item 3) Change the ID in the URL to the ID of a staff news item 4) Notice you can view the news item without any problems 5) Apply the patch and refresh the page 6) An error should show that the news item doesn't exist 7) Confirm you can still view OPAC news items individually Sponsored-by: Catalyst IT Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 +- Koha.pm | 2 +- Koha/SearchEngine/Elasticsearch.pm | 4 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 178 +- Koha/SearchEngine/Elasticsearch/Search.pm | 14 +- admin/searchengine/elasticsearch/mappings.yaml | 2223 ++++++++++++++------ installer/data/mysql/updatedatabase.pl | 33 + .../prog/en/modules/serials/subscription-add.tt | 6 +- opac/opac-detail.pl | 2 +- opac/opac-main.pl | 2 +- t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 41 +- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 24 +- 12 files changed, 1857 insertions(+), 674 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 4 20:40:41 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Mar 2019 19:40:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-624-gf40a758 Message-ID: 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 f40a75876ec681b7a102ba190e63ecda3e2bc43e (commit) via b104046d89ee6457946b998d9221b1d3771b5d5c (commit) via a639299c9834ad80d763143910dd460193820acb (commit) via 6ca8b1eed25022fdaeb5a913196ebb502856bdc7 (commit) via e7dbe4124272bfcaa212f71f4da07541f01ec0d8 (commit) via 55d18aeca6e8bff1a1484fafe261dc4d2c5f21c8 (commit) via 1fa46154d19cfb294bb36c3ca05b98bbe62f14d7 (commit) from 62b4fbb9dd6b440630251fd6686bf7af83b6d5e2 (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 f40a75876ec681b7a102ba190e63ecda3e2bc43e Author: Martin Renvoize Date: Fri Nov 30 13:30:24 2018 +0000 Bug 21720: Update Tests AddIssuing charge is always called in void context, but the tests checked that the return value was a Koha::Account::Offset and we now return a Koha::Account::Line. This patch changes the test to accept a Koha::Account::Line as returned, adds a test to ensure a Koha::Account::Offset is also created and corrects the logic that tests that only one accountline is added. Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit b104046d89ee6457946b998d9221b1d3771b5d5c Author: Martin Renvoize Date: Thu Nov 1 12:42:31 2018 +0000 Bug 21720: Use Koha::Account->add_debit in AddIssuingCharge Known Side Effect: Prior to this patch issuing charges were not recorded in the FinesLog. After this patch, if the FinesLog is enabled then the 'action' will be recorded as `create_rent`. Sponsored-by: PTFS Europe Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit a639299c9834ad80d763143910dd460193820acb Author: Nick Clemens Date: Mon Mar 4 19:10:56 2019 +0000 Bug 21728: DBRev 18.12.00.019 Signed-off-by: Nick Clemens commit 6ca8b1eed25022fdaeb5a913196ebb502856bdc7 Author: Martin Renvoize Date: Fri Nov 30 19:45:19 2018 +0000 Bug 21728: Add 'Reserve Fee' to the account_offset_types Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit e7dbe4124272bfcaa212f71f4da07541f01ec0d8 Author: Martin Renvoize Date: Thu Nov 1 11:08:51 2018 +0000 Bug 21728: Use Koha::Account->add_debit in ChargeReserveFee Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 55d18aeca6e8bff1a1484fafe261dc4d2c5f21c8 Author: Martin Renvoize Date: Thu Nov 1 12:26:35 2018 +0000 Bug 21722: Use Koha::Account->add_debit in chargelostitem This patch updates C4::Accounts::chargelostitem to use the newly available add_debit method from Koha::Account. Known Side Effects: If the FinesLog is enabled then the 'action' recorded will change from the generic `create_fee` (for both the lost charge and any associated processing charge) to the more descriptive terms `create_processing` and `create_lost_item`. Sponsored-by: PTFS Europe Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 1fa46154d19cfb294bb36c3ca05b98bbe62f14d7 Author: Martin Renvoize Date: Thu Dec 13 19:23:07 2018 +0000 Bug 21722: Tidy up tests and increase coverage This patch moves the chargelostitem 'branchcode' test to within the 'chargelostitem' subtest block in t/db_dependent/Accounts.t. It also adds tests for additional accountline fields that should be getting set by this method and adds tests for ProcessingFeeNote before removing t/db_dependent/Circulation/Chargelostitem.t which covered this previously. Sponsored-by: PTFS Europe Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 99 ++------ C4/Circulation.pm | 39 +--- C4/Reserves.pm | 26 +-- Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 11 + t/db_dependent/Accounts.t | 325 ++++++++++++++++----------- t/db_dependent/Circulation/Chargelostitem.t | 85 ------- t/db_dependent/Circulation/issue.t | 14 +- 8 files changed, 255 insertions(+), 346 deletions(-) delete mode 100644 t/db_dependent/Circulation/Chargelostitem.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 4 21:45:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Mar 2019 20:45:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-625-g1e4f442 Message-ID: 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 1e4f442442844cfaf17f5b06f122f6259d5fee92 (commit) from f40a75876ec681b7a102ba190e63ecda3e2bc43e (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 1e4f442442844cfaf17f5b06f122f6259d5fee92 Author: Nick Clemens Date: Mon Mar 4 20:26:04 2019 +0000 Bug 21728: (RM follow-up) Add 'Reserve Fee' for new installs Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/account_offset_types.sql | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 4 23:57:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Mar 2019 22:57:42 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-1-g0dd262a Message-ID: 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, 18.05.x has been updated via 0dd262a02eb162da2636c420c7d988adaa1640d8 (commit) from 1fc4721ec2a90246f2bdd019ae9573a145009546 (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 0dd262a02eb162da2636c420c7d988adaa1640d8 Author: Nick Clemens Date: Thu Jan 3 20:52:15 2019 +0000 Bug 22067: Return if no patron passed to can_see_patron_infos To test: 1 - Find an adult patron 2 - Add a child to their account 3 - Delete the parent from the db 4 - Attempt to edit the child record 5 - Apply patch 6 - Repeat 7 - Note you can edit the child account 8 - Note guarantor id is not a link Signed-off-by: Maryse Simard Signed-off-by: Marcel de Rooy No blocker for me, but we are a bit hiding that guarantorid probably should be a foreign key cleared to NULL at deletion time. Signed-off-by: Nick Clemens (cherry picked from commit 5324268e099ead7a6864d16bae0f051444a1d34e) Signed-off-by: Martin Renvoize (cherry picked from commit e7201d27af1ca0c83ba66b69b4836c21b4905dda) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Patron.pm | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 15:54:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 14:54:11 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-92-g9597e09 Message-ID: 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, 18.11.x has been updated via 9597e099b15a740427677f6a44c7ee5c595949f6 (commit) via 6db93721147e61971ad681876687f6b7ffb16c99 (commit) from b19b36fb6260932dff3961ec9ed1202188d367de (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 9597e099b15a740427677f6a44c7ee5c595949f6 Author: Martin Renvoize Date: Tue Mar 5 14:36:46 2019 +0000 Bug 22300: Compiled CSS Signed-off-by: Martin Renvoize commit 6db93721147e61971ad681876687f6b7ffb16c99 Author: Owen Leonard Date: Mon Feb 11 15:09:36 2019 +0000 Bug 22300: Staff search results: Opt groups in 'sort' pull down are not well formatted This patch adds some CSS to style the staff client search results sort menu headings. Formerly these were tags with a default browser style. To test, apply the patch and regenerate the staff client CSS. - Perform a catalog search in the staff client. - On the search results page, test the "Sort" menu. Confirm that the menu headers more clearly indicate the sections. - Test the "Add to list" button menu too, where the same style will be in use. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0375414c04e97ce21270c114311a3d96403f8da5) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 8 ++++++++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 16:14:21 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 15:14:21 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-100-gced78bb Message-ID: 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, 18.11.x has been updated via ced78bb7c635d1e5eb44eb4e78e1b6f99e53d9a0 (commit) via 66cd31a309636d14e910a5dc259e94cab14ea025 (commit) via 1feeedaf1a0800e029232fccc524db7058df6df8 (commit) via e522e32ea3bd826d068197428b8314811a967511 (commit) via dc219b6c10c777670ff70c7826fb832336e29247 (commit) via ce578a9aca25d2e57c0f419f2abd0a3297faebdf (commit) via 68b129e0c4fc52e953a10ad7f769a79f3498b769 (commit) via db36421446fcdb40ac6aeeca3a7b7cb4a6711bda (commit) from 9597e099b15a740427677f6a44c7ee5c595949f6 (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 ced78bb7c635d1e5eb44eb4e78e1b6f99e53d9a0 Author: Nick Clemens Date: Mon Mar 4 13:30:55 2019 -0500 Bug 19575: DBRev 18.11.03.002 Signed-off-by: Nick Clemens (cherry picked from commit ff20d029e397acbac2ddaf9d11e6a0a7dc184ce2) Signed-off-by: Martin Renvoize commit 66cd31a309636d14e910a5dc259e94cab14ea025 Author: David Gustafsson Date: Mon Feb 18 14:56:17 2019 +0100 Bug 19575: Don't lower case fields in db and use update script instead of raw SQL Signed-off-by: Nick Clemens (cherry picked from commit a17c2d9c9fb08ce362b07c3ea1420ae30f0527e8) Signed-off-by: Martin Renvoize commit 1feeedaf1a0800e029232fccc524db7058df6df8 Author: Nick Clemens Date: Fri Feb 15 14:49:33 2019 +0000 Bug 19575: (RM follow-up) Fix mapping typo Found with QA tools, simple fix Signed-off-by: Nick Clemens (cherry picked from commit 7df5b35a36e859f745f42b5c857cd965c83b55f3) Signed-off-by: Martin Renvoize commit e522e32ea3bd826d068197428b8314811a967511 Author: David Gustafsson Date: Thu Feb 14 16:52:04 2019 +0100 Bug 19575: Keep authority-number as alias and fix query Keep authority-number as alias and change field name from alias to real field in hard coded Elasticsearch query Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit eeda2afd3a710cbf4115b96f1386294df7693252) Signed-off-by: Martin Renvoize commit dc219b6c10c777670ff70c7826fb832336e29247 Author: Nick Clemens Date: Thu Feb 14 12:44:13 2019 +0000 Bug 19575: Fix an search field Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ef2a03a09249ee53ff2c431085673aca3f7c9863) Signed-off-by: Martin Renvoize commit ce578a9aca25d2e57c0f419f2abd0a3297faebdf Author: root Date: Tue Feb 12 21:52:39 2019 +0000 Bug 19575: Rebase and fix tests This patch lower cases the sort by fields to normalize checking them and adjusts some existing tests to meet the new expectations. The regex for splitting terms has been moved into a subroutine so that adjustment was made Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit c2061adc8be1a6843c0e082c18629f4a6b8fac78) Signed-off-by: Martin Renvoize commit 68b129e0c4fc52e953a10ad7f769a79f3498b769 Author: David Gustafsson Date: Fri Nov 3 13:21:22 2017 +0100 Bug 19575: Use canonical field names and resolve aliased fields Adjust elastic search mappings to more closely match Zebra equivalents resolving serveral issues with coded Zebra searches in templates and sorting of search results in UI. Also make field names in search strings case insensitive to accept case variations in template links and user input. Sponsored-by: Gothenburg University Library Signed-off-by: Nick Clemens Signed-off-by: Ere Maijala Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 6d53910f0ca05ae41b0d10ce6f3eb274efd3aca4) Signed-off-by: Martin Renvoize commit db36421446fcdb40ac6aeeca3a7b7cb4a6711bda Author: Jonathan Druart Date: Thu Feb 21 15:28:10 2019 -0300 Bug 22360: (bug 21205 follow-up) Restore OPACAcquisitionDetails behavior Caused by commit 7d10549ae8632e6640d3a99014268a2a1e46b3c4 Bug 21205: Replace C4::Items::GetOrderFromItemnumber calls At this point $order is a Koha::Acquisition::Order object, not a hashref anymore. Test plan: Create an order, receive items Enable OPACAcquisitionDetails At the detail page of the bibliographic record you should see "X items are on order." at the bottom of the items list Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 2331b8a295ce3db011b88bf3d42eacd42c9df4ee) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/SearchEngine/Elasticsearch.pm | 4 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 163 +- Koha/SearchEngine/Elasticsearch/Search.pm | 14 +- admin/searchengine/elasticsearch/mappings.yaml | 2223 ++++++++++++++------ installer/data/mysql/updatedatabase.pl | 34 + opac/opac-detail.pl | 2 +- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 24 +- 8 files changed, 1799 insertions(+), 667 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 16:36:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 15:36:30 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-104-g85a30f6 Message-ID: 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, 18.11.x has been updated via 85a30f6d9f3170f3652c0c8d4c4d68edb9491bda (commit) via 3641741fa6455e10823090a1e6ca3484c20e1bd1 (commit) via 3e10bb2d722fcfa64f23f7b1acc94548967fdf2b (commit) via 33489f2df1ef027e7c77d4bdbe0446d8bf69401c (commit) from ced78bb7c635d1e5eb44eb4e78e1b6f99e53d9a0 (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 85a30f6d9f3170f3652c0c8d4c4d68edb9491bda Author: Hayley Mapley Date: Sun Mar 3 22:26:54 2019 +0000 Bug 18584: remove trailing space from C4/XSLT.pm Test plan: 1) Open C4/XSLT.pm and confirm that the trailing space at line 313 is gone. 2) Sign off. Signed-off-by: Hayley Mapley Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 62b4fbb9dd6b440630251fd6686bf7af83b6d5e2) Signed-off-by: Martin Renvoize commit 3641741fa6455e10823090a1e6ca3484c20e1bd1 Author: Josef Moravec Date: Mon Feb 25 08:46:11 2019 +0000 Bug 22404: Fix parameter "for" of labels in subscription add form Attribute "for" of tag labelshould contain input id, not name. Test plan: 1) Go to serials -> add subscription second step 2) Click on labels of these three fields: - First issue publication date - Subscription start date - Subscription end date --> without patch, nothing happen --> with path, the datepicker is shown Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit d6d91ac32fdd6c8f3e5fad19a29a943044ec0214) Signed-off-by: Martin Renvoize commit 3e10bb2d722fcfa64f23f7b1acc94548967fdf2b Author: Nick Clemens Date: Mon Mar 4 18:37:43 2019 +0000 Bug 22228: Update test for updated mappings Signed-off-by: Nick Clemens (cherry picked from commit ec4ea59ec55de1816b47ab13f33597e4eb9c7664) Signed-off-by: Martin Renvoize commit 33489f2df1ef027e7c77d4bdbe0446d8bf69401c Author: Ere Maijala Date: Thu Jan 31 13:43:00 2019 +0200 Bug 22228: Escape lone colons and make sure term is balanced Escapes unquoted colons that have whitespace on either side. Removed unbalanced quotes. Test plan: 1. Make sure the test case described in the bug works 2. Make sure tests pass: prove t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t Signed-off-by: Bj?rn Nyl?n Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit dd98584c8572b85afbd68ff98423605df9b18822) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 15 +++++++ .../prog/en/modules/serials/subscription-add.tt | 6 +-- t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 41 +++++++++++++++++++- 4 files changed, 58 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 16:45:04 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 15:45:04 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-2-g2e8092c Message-ID: 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, 18.05.x has been updated via 2e8092c678a608fa045aa9a9dce78c64bc8bc4be (commit) from 0dd262a02eb162da2636c420c7d988adaa1640d8 (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 2e8092c678a608fa045aa9a9dce78c64bc8bc4be Author: Magnus Enger Date: Mon Feb 11 11:07:21 2019 +0100 Bug 12488: Make bulkmarcimport.pl -d use DELETE instead of TRUNCATE On MySQL >= 5.5 bulkmarcimport.pl with the -d (delete) switch gives an error like "Cannot truncate a table referenced in a foreign key constraint". This patch proposes to replace the offending TRUNCATE with DELETE. Auto incerement counters are reset to 1 to preserve the functionality from TRUNCATE. To test: - Make sure you havae a test database with some records and items - Run bulkmarcimport.pl with the -d switch - Observe the error described above - Apply this patch - Run bulkmarcimport.pl with the -d switch again - Observe the lack of an error - Verify that the newly imported records and items have biblionumber and itemnumbers starting with 1 Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit b7b4694666657f57aaf61d091ed34c9f754a11e3) Signed-off-by: Martin Renvoize (cherry picked from commit 1e65ab6f7fe986979efedea4577f29b8c1e3723e) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: misc/migration_tools/bulkmarcimport.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 17:16:39 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 16:16:39 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-4-ga62ab43 Message-ID: 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, 18.05.x has been updated via a62ab435628eaa00a656e09e90411f883f437545 (commit) via 3e3339475747ea8e61f475904bb4a99674b1f0e5 (commit) from 2e8092c678a608fa045aa9a9dce78c64bc8bc4be (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 a62ab435628eaa00a656e09e90411f883f437545 Author: Katrin Fischer Date: Fri Jan 4 11:42:08 2019 +0000 Bug 10676: Add unit tests - GetItemsInfo To test: prove t/db_dependent/Items.t Signed-off-by: Pierre-Marc Thibault Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 4e139a237b874df5fcd2169abba75eb3745239f5) Signed-off-by: Martin Renvoize (cherry picked from commit 97f41c827fe57b92319871c23e8291bad3f2dd3a) Signed-off-by: Lucas Gass commit 3e3339475747ea8e61f475904bb4a99674b1f0e5 Author: Katrin Fischer Date: Fri Jan 4 10:11:03 2019 +0000 Bug 10676: Fix behaviour of OpacHiddenItems for items.restricted The numerical restricted value was overwritten in GetItemsInfo with the description. So OpacHiddenItems would only work for restricted using the description, not the numerical value of the authorised value like for other similar status fields. This changes GetItemsInfo to use a separate variable for the description, as it's already done for notforloan and changes the template files where the variable is used accordingly. To test - Before applying patch - Configure OpacHiddenItems with: restricted: [1] - Find a record with more than one item and mark one of the items as "Restricted Access" (assume standard sample data - check authorised value if status doesn't exist) - Verify the item is still shown in OPAC. - Apply patch - Verify that the item is now hidden - Verify that the status still displays nicely in the staff detail page - Delete OpacHiddenItems - Verify that the status is showing nicely in the OPAC detail page Signed-off-by: Pierre-Marc Thibault Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 39d2885d1330afe825e1881f5fc8033d459f6006) Signed-off-by: Martin Renvoize (cherry picked from commit ceb74447df18d1fc8dc05b6142a10085d3a67420) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 4 ++-- .../prog/en/modules/catalogue/detail.tt | 2 +- .../bootstrap/en/includes/item-status.inc | 10 +++++----- t/db_dependent/Items.t | 21 +++++++++++++++++++- 4 files changed, 28 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 5 22:30:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 21:30:20 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-5-gb973f5b Message-ID: 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, 18.05.x has been updated via b973f5b96195d2fbadeafeef27438de85a3f3126 (commit) from a62ab435628eaa00a656e09e90411f883f437545 (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 b973f5b96195d2fbadeafeef27438de85a3f3126 Author: Katrin Fischer Date: Wed Feb 6 11:43:52 2019 +0000 Bug 18393: Acquisition statistics - Fix wrong template variable name for collection filter The template variable was wrong, so the filter never submitted the collection code for the query. Before: After: To test: - Go to Reports > Statistics wizards > Acquisitions - Pick a row and column - Compare results with and without collection filter - Verify the table is always the same - Apply patch - Repeat comparison, verify the filter works now https://bugs.koha-community.org/show_bug.cgi?id=18393 Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit f2746dd8fb1c4557ae56db4769a07fe663576ddc) Signed-off-by: Martin Renvoize (cherry picked from commit 9523546f2df4128ecaa48d86cb7d03cabdc477ac) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:02:59 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:02:59 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-6-g013b589 Message-ID: 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, 18.05.x has been updated via 013b589f23e34bdb08dd162ab1ed0f0477c66994 (commit) from b973f5b96195d2fbadeafeef27438de85a3f3126 (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 013b589f23e34bdb08dd162ab1ed0f0477c66994 Author: Katrin Fischer Date: Mon Feb 4 06:30:51 2019 +0000 Bug 8387: Hide headings in tools when user has no permissions for any listed below The headings for each column on the tools page will show, even if the user has no permission for any tool below it. This patch tries to correct this. To test: - Try various combinations of tool permissions - On the tools module start page and for the tools sidebar visible on the left on a tool's page: - Make sure headings don't show when you have no permissions for any of the tools listed below - Make sure headings show correctly if you have one or many of the tools permissions needed Signed-off-by: Owen Leonard The qa tool gives some warnings but I think they can be considered false positives. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 1fe43199b642fa575fd93131e1390c55d4631e52) Signed-off-by: Martin Renvoize (cherry picked from commit dc2bca10630211abe4118917a4c7d185a9b6b2cf) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/tools-menu.inc | 18 +++++++- .../prog/en/modules/tools/tools-home.tt | 48 +++++++++++++------- 2 files changed, 49 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:05:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:05:22 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-7-g6dd6bb1 Message-ID: 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, 18.05.x has been updated via 6dd6bb1e4556c0812852d02ca03944e5120c2438 (commit) from 013b589f23e34bdb08dd162ab1ed0f0477c66994 (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 6dd6bb1e4556c0812852d02ca03944e5120c2438 Author: Katrin Fischer Date: Sun Feb 10 01:48:46 2019 +0100 Bug 20174: Remove xml_sax.pl target from Makefile.pl There appears to be no xml_sax.pl in Koha, so the reference should be removed. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit daf47da8cd9c94829ff49ec2041d39b1510ae6da) Signed-off-by: Martin Renvoize (cherry picked from commit c6f2d8b7b168bc81e51211476f0374729611f9dc) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Makefile.PL | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:08:07 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:08:07 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-8-g1806ecf Message-ID: 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, 18.05.x has been updated via 1806ecf9e665cf8e9d4b7ed0d2cb5803f77863f3 (commit) from 6dd6bb1e4556c0812852d02ca03944e5120c2438 (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 1806ecf9e665cf8e9d4b7ed0d2cb5803f77863f3 Author: Katrin Fischer Date: Sun Feb 10 01:36:20 2019 +0100 Bug 20544: Wrong comment database documentation on itemnotes Fixes the comments in kohastructure.sql to state the right MARC21 fields for itemnotes (public and internal). To test: - Create a new Koha database and make sure it still installs - Read the patch and check comments are correct Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 60347dcc0724ad354cfabb89ca024dfa269e62e5) Signed-off-by: Martin Renvoize (cherry picked from commit 87ee1cac40f061f5f365fda54c3f0bb76071cd65) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/kohastructure.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:10:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:10:22 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-9-gec7cf77 Message-ID: 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, 18.05.x has been updated via ec7cf7760f2c92afcc23d39fbd280331ee9f4160 (commit) from 1806ecf9e665cf8e9d4b7ed0d2cb5803f77863f3 (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 ec7cf7760f2c92afcc23d39fbd280331ee9f4160 Author: Katrin Fischer Date: Tue Feb 5 22:10:01 2019 +0000 Bug 21710: Fix typo in atributes in installer Adds the missing t to some atributes in the web installer files. To test: Easiest to verify by looking at the patches, changes appear in comments and the text shown by the nb-NO and English web installer. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit a5ceb74102ef664dfa5cde20b049c924b1600c0b) Signed-off-by: Martin Renvoize (cherry picked from commit 409dde014048794ce23a63cae13e01d7251bac1a) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/en/optional/patron_atributes.txt | 2 +- installer/data/mysql/nb-NO/2-Valgfritt/patron_attributes.txt | 2 +- installer/data/mysql/uk-UA/optional/patron_atributes.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:15:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:15:20 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-10-ga07329c Message-ID: 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, 18.05.x has been updated via a07329c9dabacd962ed1c6059969d51b001146ab (commit) from ec7cf7760f2c92afcc23d39fbd280331ee9f4160 (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 a07329c9dabacd962ed1c6059969d51b001146ab Author: Katrin Fischer Date: Tue Feb 5 21:29:13 2019 +0000 Bug 22171: Fix shipping cost display on invoice When not 0 the shipping cost on the invoice would display with a lot of numbers after the comma. This fixed it to display with only 2. To test: - Make sure you have an invoice with shipping cost set (example: 5.00) - Open the invoice for editing (invoice.pl) - Verify the shipping cost displays with too many decimals (5.000000) - Apply patch - Verify now the shipping cost displays correctly (5.00) Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ae85590a323c468e1ffbe566fe1f916a2901b56b) Signed-off-by: Martin Renvoize (cherry picked from commit 343fc9267819a271fc6532fcb63ca8d6120599f1) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 00:28:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Mar 2019 23:28:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-12-g95a1b83 Message-ID: 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, 18.05.x has been updated via 95a1b8361c091e4fda01207806ce95bfbe5d4d11 (commit) via 49f2699d34b70eba1fe466812e2cc9e64f0d104f (commit) from a07329c9dabacd962ed1c6059969d51b001146ab (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 95a1b8361c091e4fda01207806ce95bfbe5d4d11 Author: Jonathan Druart Date: Sun Feb 17 10:54:24 2019 -0300 Bug 21904: Add missing PROCESS stt Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fcc17549bee1d1f9d85815a5bab24ba4ffaac7b3) Signed-off-by: Martin Renvoize (cherry picked from commit 220d6e95956b9efb9daee135fb2a66d273032785) Signed-off-by: Lucas Gass commit 49f2699d34b70eba1fe466812e2cc9e64f0d104f Author: Jonathan Druart Date: Thu Dec 6 13:58:44 2018 -0300 Bug 21904: Hide libraries outside of the group in the header Fix typo To test: 1 - Create a library group with two libraries 2 - Enable hiding patron info for that group 3 - Find or create a patron at one of those libraries without view_borrower_infos_from_any_libraries permission (but with staff side permission) 4 - Sign in as that staff person 5 - Click 'Patrons' 6 - Click the [+] to expand search options 7 - Set the 'Library' dropdown to a library outside of the group 8 - Search Signed-off-by: Nazl? ?etin Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit b225ffc559d22e7a373b92bf25a3a4162dc21be2) Signed-off-by: Martin Renvoize (cherry picked from commit 57bfc4a8ea96ceb2da5ce6e51aa32a689a686555) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 13:43:41 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 12:43:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-639-gc53f907 Message-ID: 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 c53f907235116b17d9c31d644c8d576e915992c6 (commit) via 60c51b9bb07de4dea16b0a883ad1881829fe69ed (commit) via 1fd998f413c320257341f8ff86279cc3ed2c0a24 (commit) via cf207a07a1104b752b16b89bd6dac50331fb2bc2 (commit) via 13faff1250ed3ede712c405821f3ad9187e892b6 (commit) via 05a2c58f790cc2de03ff2a9f52700f55982d36b4 (commit) via fbfcc5437ecbbb3e2bd2d65c6a8c55df3917b7ee (commit) via fc92437665a337c3d731ed04ad617d6597718afa (commit) via 566bb2976671dc56c67508c62bfe30f4b25a7656 (commit) via 2d3aaff84e0d467c0cc44ae9f99c88879b8bcc0d (commit) via 6845cd6a67fcc57c22aa695970236e3caab336fd (commit) via d1303ca834dd0b08fc1d44476cfbbb8b729b6165 (commit) via f9d90a26444b2c4b5c8dbeaaa237b9fcf3ae1234 (commit) via 26a779eded6fe24abe0be904da64e0186c3d91ec (commit) from 1e4f442442844cfaf17f5b06f122f6259d5fee92 (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 c53f907235116b17d9c31d644c8d576e915992c6 Author: Nick Clemens Date: Tue Mar 5 20:59:07 2019 +0000 Bug 18925: DBRev 18.12.00.020 Signed-off-by: Nick Clemens commit 60c51b9bb07de4dea16b0a883ad1881829fe69ed Author: Nick Clemens Date: Tue Mar 5 20:53:04 2019 +0000 Bug 18925: (RM follow-up) Remove issuingrules columns for new installs Signed-off-by: Nick Clemens commit 1fd998f413c320257341f8ff86279cc3ed2c0a24 Author: Josef Moravec Date: Tue Mar 5 14:08:34 2019 +0000 Bug 18925: (QA follow-up) Fix Circulation.t Test plan: t/db_dependent/Circulation.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit cf207a07a1104b752b16b89bd6dac50331fb2bc2 Author: Jonathan Druart Date: Sat Mar 2 14:14:11 2019 -0300 Bug 18925: Fix 'Default checkout, hold policy by patron category' block We want ->Search to return undef if the rule does not exist. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 13faff1250ed3ede712c405821f3ad9187e892b6 Author: Jonathan Druart Date: Sat Mar 2 13:45:14 2019 -0300 Bug 18925: Move existing rules Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 05a2c58f790cc2de03ff2a9f52700f55982d36b4 Author: Tomas Cohen Arazi Date: Sat Mar 2 11:03:01 2019 -0300 Bug 18925: (QA follow-up) Fix basic_workflow.t Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fbfcc5437ecbbb3e2bd2d65c6a8c55df3917b7ee Author: Tomas Cohen Arazi Date: Sat Mar 2 10:20:23 2019 -0300 Bug 18925: (QA follow-up) Fix indentation characters in smart-rules.tt Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fc92437665a337c3d731ed04ad617d6597718afa Author: Tomas Cohen Arazi Date: Sat Mar 2 10:14:48 2019 -0300 Bug 18925: (QA follow-up) Make DB update idempotent Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 566bb2976671dc56c67508c62bfe30f4b25a7656 Author: Jonathan Druart Date: Thu Feb 21 17:04:38 2019 -0300 Bug 18925: Update new occurrences Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 2d3aaff84e0d467c0cc44ae9f99c88879b8bcc0d Author: Jonathan Druart Date: Thu Feb 21 17:04:36 2019 -0300 Bug 18925: Fix null/empty behavior, again Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 6845cd6a67fcc57c22aa695970236e3caab336fd Author: Jonathan Druart Date: Sat Sep 15 13:19:04 2018 -0700 Bug 18925: Replace logic in GetBranchBorrowerCircRule with get_effective_rule Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d1303ca834dd0b08fc1d44476cfbbb8b729b6165 Author: Jesse Weaver Date: Mon Jan 29 15:30:29 2018 -0700 Bug 18925: (follow-up) Fix null/empty behavior Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit f9d90a26444b2c4b5c8dbeaaa237b9fcf3ae1234 Author: Jesse Weaver Date: Sat Sep 16 17:23:01 2017 -0600 Bug 18925: (follow-up) Change name of rule to fix ambiguity There was previously an ambiguity between the branch/category/itemtype specific max{,onsite}issueqty and the total-per-patron max{,onsite}issueqty. The latter has been renamed to patron_max{,onsite}issueqty. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 26a779eded6fe24abe0be904da64e0186c3d91ec Author: Kyle M Hall Date: Mon Jul 10 11:00:44 2017 -0400 Bug 18925: Move maxissueqty and maxonsiteissueqty to circulation_rules This patch set moves maxissueqty and maxonsiteissueqty to the circulation_rules table. Test Plan: 1) Apply this patch 2) Run updatedatabase 3) prove t/db_dependent/Circulation.t 4) prove t/db_dependent/Circulation/Branch.t 5) prove t/db_dependent/Circulation/GetHardDueDate.t 6) prove t/db_dependent/Circulation/Returns.t 7) prove t/db_dependent/Circulation/SwitchOnSiteCheckouts.t 8) prove t/db_dependent/Circulation/TooMany.t 9) prove t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t 10) prove t/db_dependent/Reserves.t 11) Note no changes in circulation behavior related to check out limis both on and off site Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 122 ++++----- Koha.pm | 2 +- Koha/CirculationRules.pm | 12 +- Koha/Schema/Result/Branch.pm | 19 +- Koha/Schema/Result/Category.pm | 34 +-- Koha/Schema/Result/DefaultBranchCircRule.pm | 18 +- Koha/Schema/Result/DefaultCircRule.pm | 18 +- Koha/Schema/Result/Issuingrule.pm | 18 +- Koha/Template/Plugin/CirculationRules.pm | 20 ++ admin/smart-rules.pl | 273 +++++++------------- installer/data/mysql/kohastructure.sql | 37 --- installer/data/mysql/updatedatabase.pl | 88 +++++++ .../prog/en/modules/admin/smart-rules.tt | 91 ++++--- t/db_dependent/Circulation.t | 40 +-- t/db_dependent/Circulation/Branch.t | 80 +++--- t/db_dependent/Circulation/GetHardDueDate.t | 20 +- t/db_dependent/Circulation/Returns.t | 1 - t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 38 ++- t/db_dependent/Circulation/TooMany.t | 126 ++++----- .../Holds/DisallowHoldIfItemsAvailable.t | 4 +- t/db_dependent/Reserves.t | 14 +- t/db_dependent/selenium/basic_workflow.t | 15 +- 22 files changed, 531 insertions(+), 559 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 14:52:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 13:52:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-640-g32fc535 Message-ID: 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 32fc535b8a71483b401b964b273cb280758ea8f4 (commit) from c53f907235116b17d9c31d644c8d576e915992c6 (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 32fc535b8a71483b401b964b273cb280758ea8f4 Author: Tomas Cohen Arazi Date: Wed Mar 6 10:09:05 2019 -0300 Bug 18925: (QA follow-up) Remove weird 'Null' values for integer column Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/GetHardDueDate.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 18:04:56 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 17:04:56 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-13-gbde8372 Message-ID: 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, 18.05.x has been updated via bde83720d4f1995bf5047f9429545a56bda3eddc (commit) from 95a1b8361c091e4fda01207806ce95bfbe5d4d11 (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 bde83720d4f1995bf5047f9429545a56bda3eddc Author: Fridolin Somers Date: Wed Feb 13 13:25:20 2019 +0100 Bug 22323: cronjob runreport.pl CSV add encoding Cronjob runreport.pl runs SQL reports and can export as CSV. This export needs to be UTF-8 encoded. This pathes replaces use of Text::CSV_XS by Text::CSV::Encoded like in other places like tools/viewlog.pl. It adds a decode of headers bcause they will be encoded lika other lines. Test plan: 1) Create a new item with itemnotes 'accentu?' 2) Create a SQL report with : SELECT barcode,itemnotes AS it? FROM items WHERE itemnotes LIKE 'accent?' 3) Run this report 4) You see well encoded header and content 5) Run from command line (replace X by report number) : misc/cronjobs/runreport.pl X --format=csv --csv-header --store-results 6) You well encoded header and content 7) Go to saved reports table 8) Look at saved results of report 9) You well encoded header and content Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 83fe95d0c5d404a2ffc6ed35e822ff0f5ee8b6e6) Signed-off-by: Martin Renvoize (cherry picked from commit 0ad76960cd24b3f12eb5c0e7058f02cd13ba1ac0) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/runreport.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 18:27:27 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 17:27:27 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-14-g3182d26 Message-ID: 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, 18.05.x has been updated via 3182d2693d2a3e561183bab203036e37a4abb66c (commit) from bde83720d4f1995bf5047f9429545a56bda3eddc (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 3182d2693d2a3e561183bab203036e37a4abb66c Author: Owen Leonard Date: Thu Jan 17 16:39:52 2019 +0000 Bug 22156: Subscription result list sorts on "checkbox" by default This patch adds default sorting by title to the subscription search results list. Previously no default sort was defined, so it defaulted to sorting by the first column in the table. To test, apply the patch and go to Serials. - Perform a search of subscriptions which will return multiple results. - Confirm that the table of open subscriptions is sorted by default by title ascending. - Confirm the same for the table of closed subscriptions. Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 8a2d5fab95ae2db5adf8cca16524b7a231680dd3) Signed-off-by: Martin Renvoize (cherry picked from commit dc865158780c28fb22c5a8c03d3105529403a150) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 18:42:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 17:42:17 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-15-g3bc2c31 Message-ID: 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, 18.05.x has been updated via 3bc2c31c8e530ff7e611a93f7f5ffeaad66ea9f0 (commit) from 3182d2693d2a3e561183bab203036e37a4abb66c (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 3bc2c31c8e530ff7e611a93f7f5ffeaad66ea9f0 Author: Owen Leonard Date: Thu Jan 24 16:13:47 2019 +0000 Bug 21845: Sort of issues in OPAC subscription table This patch adds a default sort option to the table of subscriptions on the OPAC detail page. This sorting option matches the sort of data passed from GetLatestSerials. To test, apply the patch and locate a subscription in the OPAC which has multiple issues. They should be sorted by default on publication date. Signed-off-by: mikael Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit fd9ff6a4f012399fc8408aa25ab1185d8308ea45) Signed-off-by: Martin Renvoize (cherry picked from commit c765f0c2df8b1f02ce937e776b357f5fb35dadc9) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 19:19:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 18:19:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-16-gea6239a Message-ID: 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, 18.05.x has been updated via ea6239a434ccbd4f9573df4c71c03ce323aa4a8e (commit) from 3bc2c31c8e530ff7e611a93f7f5ffeaad66ea9f0 (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 ea6239a434ccbd4f9573df4c71c03ce323aa4a8e Author: Katrin Fischer Date: Thu Dec 6 15:17:37 2018 +0100 Bug 21966: Fix descriptions of acquisition permissions to be more clear (again) This was already done and pushed on bug 3849, but some of it got undone accidentally by a later patch. To test: - Check the acquisition permissions - The *budget* permissions should clearly describe their use for 'funds'. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 940c5c0add3065d35f776a3a19ba87d936e84a0f) Signed-off-by: Martin Renvoize (cherry picked from commit bda0f717cda8d57373b1619c17234ea9230dd416) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 20:15:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 19:15:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-642-gfcd6bdc Message-ID: 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 fcd6bdc5b8ed5cd48b19d03a86e2ab9aaa0b0626 (commit) via c57967681f3041aab19b7f14270e267c7de54be6 (commit) from 32fc535b8a71483b401b964b273cb280758ea8f4 (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 fcd6bdc5b8ed5cd48b19d03a86e2ab9aaa0b0626 Author: Nick Clemens Date: Wed Mar 6 09:29:18 2019 -0500 Bug 18925: (RM follow-up) Remove maxissueqty from issuingrule in SIP tests Signed-off-by: Nick Clemens commit c57967681f3041aab19b7f14270e267c7de54be6 Author: Nick Clemens Date: Wed Mar 6 09:28:08 2019 -0500 Bug 18925: (RM follow-up) Remove schema files for deletedtables Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/BranchBorrowerCircRule.pm | 115 ------------------------- Koha/Schema/Result/DefaultBorrowerCircRule.pm | 89 ------------------- t/db_dependent/SIP/Transaction.t | 1 - 3 files changed, 205 deletions(-) delete mode 100644 Koha/Schema/Result/BranchBorrowerCircRule.pm delete mode 100644 Koha/Schema/Result/DefaultBorrowerCircRule.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 6 23:01:26 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 22:01:26 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-19-g214b7d8 Message-ID: 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, 18.05.x has been updated via 214b7d8db0d3f55251cd7e59d02cbbb9bad1e68a (commit) via 03b59f3dbb1bc40137c51b6af5236464f39b6131 (commit) via 949deafe494db4e8954665fcdfd4175ada0ad78d (commit) from ea6239a434ccbd4f9573df4c71c03ce323aa4a8e (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 214b7d8db0d3f55251cd7e59d02cbbb9bad1e68a Author: Martin Renvoize Date: Fri Feb 8 16:54:37 2019 +0000 Bug 21427: (QA follow-up) Fix for tabs Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit d220725694302f187b3ff92c0eedda583919b735) Signed-off-by: Martin Renvoize (cherry picked from commit 685b9cdec79b5d58e5a4ffdc148df1a182c401ea) Signed-off-by: Lucas Gass commit 03b59f3dbb1bc40137c51b6af5236464f39b6131 Author: Katrin Fischer Date: Fri Jan 11 22:55:35 2019 +0100 Bug 21427: Format prices on ordered/spent lists consistently Some price information on the spent and ordered list already used the $Price filter. With this patch all amounts should be formatted according to the CurrencyFormat system preference. Signed-off-by: Jack Kelliher Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 209570f89d050f22fa90eed6a8a70ad9eb56e8a2) Signed-off-by: Martin Renvoize (cherry picked from commit 71227300a3f367ef8b17572a419d24eeecea9ded) Signed-off-by: Lucas Gass commit 949deafe494db4e8954665fcdfd4175ada0ad78d Author: Jasmine Amohia Date: Wed Jan 16 21:26:10 2019 +0000 Bug 22147: Hidden 'Batch modify' button on report print layout Test plan: 1) Create or run a report that has an itemnumber column 2) Notice the Batch modify button under the itemnumber heading 3) Print the page 4) Notice the button no longer shows on the printed page Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5ea9fb91632d712a6f70f4a3382ba96b4db74f69) Signed-off-by: Martin Renvoize (cherry picked from commit 5054f1a1a30e4921d47941220786118c3a8575ee) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/print.css | 1 + .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 70 +++++++++++--------- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 18 +++-- .../en/modules/reports/guided_reports_start.tt | 2 +- 4 files changed, 56 insertions(+), 35 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 00:04:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 23:04:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-21-ge448cb9 Message-ID: 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, 18.05.x has been updated via e448cb9042e1b449ca64ee99f1ac2576126e2f6d (commit) via e6bfbc6832fb5a4b87f7e12f6e45e6d814f5b311 (commit) from 214b7d8db0d3f55251cd7e59d02cbbb9bad1e68a (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 e448cb9042e1b449ca64ee99f1ac2576126e2f6d Author: Mark Tompsett Date: Sat Feb 18 19:50:32 2017 -0500 Bug 18143: Silence ods MARC framework export flood Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5b0eb51c8066abbd645731593572277ca5b46715) Signed-off-by: Martin Renvoize (cherry picked from commit 854f1ca17a78c5b73c63cfd0b57bcf89108778b2) Signed-off-by: Lucas Gass commit e6bfbc6832fb5a4b87f7e12f6e45e6d814f5b311 Author: Mark Tompsett Date: Sat Feb 18 19:21:59 2017 -0500 Bug 18143: Silence XML MARC Framework export flood TEST PLAN --------- 1) Log in to staff client 2) Click Koha administration 3) Click MARC bibliographic framework 4) export default as xml 5) Read the error log -- it's floody and export is default framework 6) export another framework as xml 7) Read the error log -- it's floody and export is the correct framework 8) apply the patch 9) repeat steps 4-7 -- expected frameworks exported, and no flooding. 10) run koha qa test tools Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 719153455c8c58fb8b1a8e9123acef5052dbd462) Signed-off-by: Martin Renvoize (cherry picked from commit 65a6cd355ef227ab4e11b620f485f010b611e115) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/ImportExportFramework.pm | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 00:55:52 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Mar 2019 23:55:52 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-24-ge581b73 Message-ID: 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, 18.05.x has been updated via e581b73c5d17f48a88424a9467395435fe1e86ff (commit) via 75e9d354720be95de138040482b2ed4764860d2d (commit) via fdf5e5fa9aaa4ee0fb55dfbc42db77c0062d6790 (commit) from e448cb9042e1b449ca64ee99f1ac2576126e2f6d (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 e581b73c5d17f48a88424a9467395435fe1e86ff Author: Jonathan Druart Date: Thu Feb 21 13:25:22 2019 -0300 Bug 22386: Remove debug statements Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 25006c04da500078b2af1b14824b67076f2f9df5) Signed-off-by: Martin Renvoize (cherry picked from commit 111ddbfa573df0fd5d694f1a96a2a5063e8dfb47) Signed-off-by: Lucas Gass commit 75e9d354720be95de138040482b2ed4764860d2d Author: Nick Clemens Date: Thu Feb 21 14:30:22 2019 +0000 Bug 22386: Define patron variable when matchign on extended attributes For all other methods we define a patron object and check the userid, we just need to define the $patron here To test: 0 - Apply unit test patch alone 1 - prove t/db_dependent/Koha/Patrons/Import.t 2 - It dies 3 - Apply this patch 4 - repeat tests 5 - It passes! Signed-off-by: Devlyn Courtier Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 8a9c82c3ec42fb5c2937fa523170b3710288d7fd) Signed-off-by: Martin Renvoize (cherry picked from commit 4771a7da8e30798d1d9e389db94e7efc3428a5e0) Signed-off-by: Lucas Gass commit fdf5e5fa9aaa4ee0fb55dfbc42db77c0062d6790 Author: Nick Clemens Date: Thu Feb 21 14:29:59 2019 +0000 Bug 22386: Unit tests Signed-off-by: Devlyn Courtier Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 9f27a63b9ad770ac56e32a3e79d1ecb657534482) Signed-off-by: Martin Renvoize (cherry picked from commit d6ca92031339629bfa50fdda3c8e1e46b5c33c89) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Patrons/Import.pm | 1 + t/db_dependent/Koha/Patrons/Import.t | 35 ++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 09:35:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 08:35:22 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.16-2-g954cf66 Message-ID: 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, 17.11.x has been updated via 954cf660780797f8cc658e6bcbe4d082ce314b24 (commit) from ca0aa482df9915d5c7f4ec49880f1b76ddbc58ba (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 954cf660780797f8cc658e6bcbe4d082ce314b24 Author: Fridolin Somers Date: Wed Feb 13 13:25:20 2019 +0100 Bug 22323: cronjob runreport.pl CSV add encoding Cronjob runreport.pl runs SQL reports and can export as CSV. This export needs to be UTF-8 encoded. This pathes replaces use of Text::CSV_XS by Text::CSV::Encoded like in other places like tools/viewlog.pl. It adds a decode of headers bcause they will be encoded lika other lines. Test plan: 1) Create a new item with itemnotes 'accentu?' 2) Create a SQL report with : SELECT barcode,itemnotes AS it? FROM items WHERE itemnotes LIKE 'accent?' 3) Run this report 4) You see well encoded header and content 5) Run from command line (replace X by report number) : misc/cronjobs/runreport.pl X --format=csv --csv-header --store-results 6) You well encoded header and content 7) Go to saved reports table 8) Look at saved results of report 9) You well encoded header and content Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 83fe95d0c5d404a2ffc6ed35e822ff0f5ee8b6e6) Signed-off-by: Martin Renvoize (cherry picked from commit 0ad76960cd24b3f12eb5c0e7058f02cd13ba1ac0) Signed-off-by: Lucas Gass (cherry picked from commit bde83720d4f1995bf5047f9429545a56bda3eddc) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/runreport.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 18:52:54 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 17:52:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-665-gcfe4d0e Message-ID: 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 cfe4d0e29546ccf7566ad326be7db76f0e0b4171 (commit) via ed62cb3ecfd714049b15d0728fab29b3a8540e3c (commit) via 7d71d9507202ff667776bf9cb6de0bf2603ad0dd (commit) via 2b86e9659d5b1446fc5658f1f80bd5a21f2017a5 (commit) via 2802f20e386e6e51341a1ef77b1225f858b0d1c6 (commit) via 6be54ad1206491fc9c449b03a8249f8a75c14713 (commit) via 5e2db4c2935b959a6534aab65e2de51239a55942 (commit) via 7b75849412d8e3465ca5e734869c74d5aa3241c1 (commit) via 45595334e64f8996cfcd52673ca0ae68a4815308 (commit) via f5380b401428e8e81667aff278822c7667fcc4c7 (commit) via a68926d9cb1b485ae302a8c72f7e637fc9310fe0 (commit) via 04ac65ba199cab432b19e3cf783a8b0be530e929 (commit) via 6fe5466e5af99975910a382642c4b1c5c3b55c6a (commit) via 8abb7edc98f6d7442984a5a7d1d2991e4abbb7f9 (commit) via 8b4bcb315639ae1852329eba31609c75fd3e3b92 (commit) via eb179d0ec0105fe8801c88ce0fe5c3bf7c2a2d8e (commit) via 84647ff0060a896a29e033b785a033decd7deea2 (commit) via 62a4969057f98728a466c0f83c3bf011ddec4835 (commit) via dde914e1f14875aaee15ee6bbfe03739c6859130 (commit) via d9790c6fdec8d3e574c561bc0ee0945282a74669 (commit) via 3d84f4b9b3a11f32b37f27478de0ee6c5d9d37e4 (commit) via e39541522ce30531cc8ef8d377fa60ebe45b0330 (commit) via 178af5ab27fab49597b1e53c26cd1f21e09a27c1 (commit) from fcd6bdc5b8ed5cd48b19d03a86e2ab9aaa0b0626 (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 cfe4d0e29546ccf7566ad326be7db76f0e0b4171 Author: Nick Clemens Date: Thu Mar 7 17:27:05 2019 +0000 Bug 20912: DBRev 18.12.00.021 Signed-off-by: Nick Clemens commit ed62cb3ecfd714049b15d0728fab29b3a8540e3c Author: Martin Renvoize Date: Thu Mar 7 17:18:02 2019 +0000 Bug 20912: (QA follow-up) Add on_editing to $Price filter Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7d71d9507202ff667776bf9cb6de0bf2603ad0dd Author: Martin Renvoize Date: Thu Mar 7 08:39:30 2019 +0000 Bug 20912: (QA follow-up) Rebase error corrections The automatic rebase after bug 21206 required a helping hand. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 2b86e9659d5b1446fc5658f1f80bd5a21f2017a5 Author: Kyle M Hall Date: Mon Feb 25 11:04:15 2019 -0500 Bug 20912: (QA follow-up) Warn patron of daily and hourly renewal fees Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 2802f20e386e6e51341a1ef77b1225f858b0d1c6 Author: Martin Renvoize Date: Wed Feb 20 08:49:44 2019 +0000 Bug 20912: (follow-up) Prevent double charging on renewal This patch updates the tests the ensure we do not double charge for renewals that take place before the original due date and fixes the corresponding loging in C4::Circulation::AddRenewal. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 6be54ad1206491fc9c449b03a8249f8a75c14713 Author: Tomas Cohen Arazi Date: Mon Feb 4 11:18:29 2019 -0300 Bug 20912: (QA follow-up) The default rule already has renewalsallowed=0 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 5e2db4c2935b959a6534aab65e2de51239a55942 Author: Tomas Cohen Arazi Date: Mon Feb 4 11:06:09 2019 -0300 Bug 20912: (QA follow-up) POD fix Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 7b75849412d8e3465ca5e734869c74d5aa3241c1 Author: Martin Renvoize Date: Thu Jan 31 14:56:54 2019 +0000 Bug 20912: (QA follow-up) Fix some test failures Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 45595334e64f8996cfcd52673ca0ae68a4815308 Author: Martin Renvoize Date: Thu Jan 31 11:50:35 2019 +0000 Bug 20912: (QA follow-up) Fix TestBuilder Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit f5380b401428e8e81667aff278822c7667fcc4c7 Author: Martin Renvoize Date: Wed Jan 30 20:34:13 2019 +0000 Bug 20912: (follow-up) Add hourly support It seemed strange to only add support for Daily loans in the feature when Koha also support loan periods in hours. This patch adds parallel functionaliy for hourly loan periods. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit a68926d9cb1b485ae302a8c72f7e637fc9310fe0 Author: Martin Renvoize Date: Wed Jan 30 16:20:23 2019 +0000 Bug 20912: (follow-up) Improve test coverage Increase test coverage for CanBookBeIssued and fix a introduced during the refactoring to Koha::Fees. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 04ac65ba199cab432b19e3cf783a8b0be530e929 Author: Martin Renvoize Date: Wed Jan 30 11:42:57 2019 +0000 Bug 20912: (QA follow-up) Make DB Update idempotent Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 6fe5466e5af99975910a382642c4b1c5c3b55c6a Author: Martin Renvoize Date: Tue Jan 29 11:51:29 2019 +0000 Bug 20912: (QA follow-up) Test for distinct accountlines Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 8abb7edc98f6d7442984a5a7d1d2991e4abbb7f9 Author: Martin Renvoize Date: Tue Jan 29 11:28:28 2019 +0000 Bug 20912: (QA follow-up) Move Fees to Charges:: In preparation for the introduction of Koha::Charges::Fines I have moved this ::Fees class into the Koha::Charges:: namespace Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 8b4bcb315639ae1852329eba31609c75fd3e3b92 Author: Kyle M Hall Date: Fri Jan 25 12:49:07 2019 -0500 Bug 20912: (QA follow-up): Fix up unit tests Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit eb179d0ec0105fe8801c88ce0fe5c3bf7c2a2d8e Author: Kyle M Hall Date: Fri Jan 25 11:16:41 2019 -0500 Bug 20912: (QA follow-up): Fix up Koha::Fees Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 84647ff0060a896a29e033b785a033decd7deea2 Author: Kyle M Hall Date: Fri Nov 9 13:34:05 2018 -0500 Bug 20912: Move calculation to Koha::Fees Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 62a4969057f98728a466c0f83c3bf011ddec4835 Author: Kyle M Hall Date: Wed Oct 31 15:29:55 2018 -0400 Bug 20912: (QA follow-up) Make unit tests reliable and get rid of perl warnings Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit dde914e1f14875aaee15ee6bbfe03739c6859130 Author: Kyle M Hall Date: Wed Oct 31 15:14:03 2018 -0400 Bug 20912: (QA follow-up) Set daily charge to 0 for item type not being used for test Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit d9790c6fdec8d3e574c561bc0ee0945282a74669 Author: Katrin Fischer Date: Sun Oct 28 17:06:33 2018 +0000 Bug 20912: (QA follow-up) Fix number of tests and correct typos Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 3d84f4b9b3a11f32b37f27478de0ee6c5d9d37e4 Author: Kyle M Hall Date: Thu Jun 14 13:36:51 2018 +0000 Bug 20912: Rental Fees based on Time Period Some libraries would like to be able to charge a rental fee based on the number of days an item will be checked out, as opposed to the flat fee currently offered by Koha. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Edit an itemtype, add a daily rental fee of 1.00 4) Check an item of that itemtype out for 7 days 5) Verify the patron now has rental fee of 7.00 Signed-off-by: Matha Fuerst Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit e39541522ce30531cc8ef8d377fa60ebe45b0330 Author: Kyle M Hall Date: Thu Jun 14 11:13:19 2018 +0000 Bug 20912: Update database Signed-off-by: Matha Fuerst Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 178af5ab27fab49597b1e53c26cd1f21e09a27c1 Author: Martin Renvoize Date: Thu Nov 1 13:28:25 2018 +0000 Bug 21721: Use Koha::Account->add_debit in AddRenewal Known Side Effect: Prior to this patch renewal charges were not recorded in the FinesLog. After this patch, if the FinesLog is enabled then the 'action' will be recorded as `create_rent`. Sponsored-by: PTFS Europe Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 240 ++++++++++++-------- Koha.pm | 2 +- Koha/Charges/Fees.pm | 208 +++++++++++++++++ Koha/ItemType.pm | 4 +- Koha/Schema/Result/Itemtype.pm | 20 +- admin/itemtypes.pl | 33 +-- catalogue/moredetail.pl | 1 - installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/updatedatabase.pl | 20 ++ .../prog/en/modules/admin/itemtypes.tt | 34 ++- .../prog/en/modules/catalogue/moredetail.tt | 3 + .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 8 +- opac/opac-user.pl | 1 + t/db_dependent/Circulation.t | 185 ++++++++++++++- t/db_dependent/Circulation/Returns.t | 4 +- t/db_dependent/Circulation/issue.t | 21 +- t/db_dependent/Koha/Charges/Fees.t | 126 ++++++++++ t/db_dependent/Koha/ItemTypes.t | 19 +- t/lib/TestBuilder.pm | 2 + 19 files changed, 795 insertions(+), 138 deletions(-) create mode 100644 Koha/Charges/Fees.pm create mode 100644 t/db_dependent/Koha/Charges/Fees.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 19:34:57 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 18:34:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-668-g9ff997e Message-ID: 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 9ff997eda7582dbb68d599ab1436b162dd1559da (commit) via 158b3c3a4cfc8a97cc98a3473ca70395fdb398e1 (commit) via c7ef8e6b2db5830745759ad15fe9d6379f6f62b2 (commit) from cfe4d0e29546ccf7566ad326be7db76f0e0b4171 (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 9ff997eda7582dbb68d599ab1436b162dd1559da Author: Jonathan Druart Date: Wed Mar 6 11:59:58 2019 -0300 Bug 22466: Replace existing occurrences Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 158b3c3a4cfc8a97cc98a3473ca70395fdb398e1 Author: Jonathan Druart Date: Wed Mar 6 11:59:55 2019 -0300 Bug 22466: Do not ask for TT methods to be filtered Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit c7ef8e6b2db5830745759ad15fe9d6379f6f62b2 Author: Jonathan Druart Date: Wed Mar 6 11:59:35 2019 -0300 Bug 22466: Add tests Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/reserve/request.tt | 16 ++++++++-------- .../prog/en/modules/serials/serials-search.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- t/lib/QA/TemplateFilters.pm | 7 +++++++ t/template_filters.t | 19 ++++++++++++++++++- 5 files changed, 35 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 7 22:36:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 21:36:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-700-g255af71 Message-ID: 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 255af719e65956d84d62ea52fea12619bb851f70 (commit) via bd68e2f75b2bd0cae7935715f4aa03342809cb9f (commit) via eb7b2907c55d896a7c5b8bccf31daeae8bc5720b (commit) via a0e10d97223ae2945f6ac64b7d86f4ac2fea9e03 (commit) via 1f2685f7d4965d6aa4a25be81aebf91b1ed01b33 (commit) via 916a27686a4e76b0a8b6982dbbbf4ae9eee4267e (commit) via 6d3136c7e893011bd7cdfd0b6415d20929b6a66b (commit) via ef6ad443a872c207654721d1e9edee3a6eb88087 (commit) via a8be1966f3855d6950021018254819b04a5287c3 (commit) via 29bc2b583264a62c29a0f39dd79a5b3a64721ae6 (commit) via 5ebf1a26dae62651d1749a2df2e54ee6d1af148a (commit) via 926d7c4ba11ad6cd768c884ec4b2dc71d864b64c (commit) via eeaf59a31ff33ec505fe86a3ef7278aed1733e25 (commit) via 0499a3bf2b8aad543a6d0e7b87cbee75cd14f166 (commit) via fa243015988028cfba82eaeef35a7ec53a000586 (commit) via 1966c6be2e21613c5e1efb977dc946f0f1c21e20 (commit) via 9cfcd21f24c176cecb743084ee22243aeb44848d (commit) via fe8bc587f6f78600b7aecc0b7efd75306e9a2e12 (commit) via 7a109482865838f1594e2e84f762e3e9c95a22db (commit) via ee5b5175d9dafa906432835d018081ed62fbab05 (commit) via 9bf62c78811e50aa1b3cfbb25e825d2ca093c180 (commit) via e0da941f712a2b2be6e43eefbcdd013ec4bd5adb (commit) via ccd6a334b7447b446bd150d0420f5ad7544bbb8c (commit) via 8035151e41fc2e97e8a0c32cfa0e8c252c393bf2 (commit) via feb866a618ad5fccb4384dbc9c8b6fd23fec6472 (commit) via 695ce65132e7e88bd5d3da46e99b665b91a71eb6 (commit) via a0a7b779ee39fed7e8d88b7357716d7d4a78d8f0 (commit) via 284b543ea4a82dfd4873cc122ba7c2a816f141ca (commit) via 904a4884601588ca89faaaee5e0fd53d3907ec10 (commit) via bd9ef8f5843fa7bcb49dc490001c79750035e0d0 (commit) via a108256face480867de76f348d577ade0481cdfa (commit) via 84f83012295c90995db48775ff32f06b8d082581 (commit) from 9ff997eda7582dbb68d599ab1436b162dd1559da (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 255af719e65956d84d62ea52fea12619bb851f70 Author: Fridolin Somers Date: Mon Feb 11 09:54:43 2019 +0100 Bug 22303: Correct bottom in virtualshelves/addbybiblionumber.tt In virtualshelves/addbybiblionumber.tt the include intranet-bottom.inc which closes the HTML last tag is not the last line of the template. This patch moved bottom include to last line and uses popup-bottom.inc. Test plan : 1) Permission OK : 1.1) Login in staff interface with user 'Bob' 1.2) Create a new list 'Readme' : category public and allow changes to contents from anyone 1.3) Perform a search 1.4) Check some results 1.5) Click 'Add to list' and on the list 'Readme' 1.6) A popup window opens 1.7) Check its HTML is OK, ending with 2) Permission KO : 2.1) Open a new window (Firefox private session) and login in staff interface with user 'Bill' 2.2) Perform a search 2.3) Check some results 2.4) On session of 'Bob', edit list 'Readme' 2.5) Change : category private and allow changes to contents from owner only 2.6) On session of 'Bill' 2.7) Click 'Add to list' and on the list 'Readme' 2.8) A popup window opens saying 'Sorry, you do not have permission to add items to this list' 2.9) Check its HTML is OK, ending with Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit bd68e2f75b2bd0cae7935715f4aa03342809cb9f Author: Ere Maijala Date: Fri Feb 1 13:18:11 2019 +0200 Bug 22246: Fix indexing of large fields with Elasticsearch Deduplicate multivalued fields and make sure sort fields are not excessively long. Also updates default mappings so that sort fields are not created for item fields where it doesn't make sense. Test plan: 1. Reset ES mappings in administration 2. Check that sort is '0' for local-classification in biblio mappings. 3. Change sort back to '1' for local-classification for the next steps. 4. Create a record with 20 items, each with a 100 character long call number 5. Check that when indexed, the record in ES does not have duplicates in any of the item fields and local-classification__sort is truncated to 255 characters. Signed-off-by: Nick Clemens Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit eb7b2907c55d896a7c5b8bccf31daeae8bc5720b Author: Jonathan Druart Date: Tue Mar 5 14:29:58 2019 -0300 Bug 22416: (bug 22140 follow-up) Remove warnings in Search.t Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit a0e10d97223ae2945f6ac64b7d86f4ac2fea9e03 Author: Jonathan Druart Date: Tue Mar 5 15:16:44 2019 -0300 Bug 22419: Records listed twice when select/unselect all from the cart It fixes a browser timeout when records are removed from the cart. The onchange event already call selRecord. Test plan: Launch a search Add all the result to your cart Open the cart Click "select all" Then remove them all from your cart => Without this patch the action will timeout => With this patch applied the action is immediate Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1f2685f7d4965d6aa4a25be81aebf91b1ed01b33 Author: Nick Clemens Date: Thu Mar 7 20:52:59 2019 +0000 Bug 20639: DBRev 18.12.00.023 Signed-off-by: Nick Clemens commit 916a27686a4e76b0a8b6982dbbbf4ae9eee4267e Author: Katrin Fischer Date: Sat Feb 9 23:11:55 2019 +0100 Bug 20639: (QA follow-up) Rephrase system preference Rephrases system preference a tiny bit and explaining case of leaving the pref empty. Signed-off-by: Nick Clemens commit 6d3136c7e893011bd7cdfd0b6415d20929b6a66b Author: Andrew Isherwood Date: Thu Sep 27 11:44:27 2018 +0100 Bug 20639: (follow-up) Fix population of backends The OPAC view wasn't correctly restricting the display of backends when the ILLOpacbackends preference was set. See the test plan on comment 7 Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ef6ad443a872c207654721d1e9edee3a6eb88087 Author: Martin Renvoize Date: Tue Apr 24 14:15:22 2018 +0100 Bug 20639: Add ILLOpacbackends syspref This adds the ILLOpacbackends syspref, allowing users to refine the ill backends available to opac users for initiating ill requests Remove default assignment for backends We don't need a default assignment for the ILLOpacbackends assignment, if the pref isn't set, it returns undef anyway. Also, having this default assignment actually breaks the fetching of the preference Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit a8be1966f3855d6950021018254819b04a5287c3 Author: Martin Renvoize Date: Sat Dec 22 13:55:23 2018 +0000 Bug 22031: Add SQL::Abstract like syntax to haspermission This patch adds an SQL::Abstract inspired query syntax to the haspermission method in C4::Auth. One can now pass Arrayrefs to denote an OR list of flags, a Hashref to denote a AND list of flags. Structures can be nested at arbitrary depth. Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 29bc2b583264a62c29a0f39dd79a5b3a64721ae6 Author: Jonathan Druart Date: Wed Feb 27 09:38:57 2019 -0300 Bug 22275: (bug 15836 follow-up) Fix class_sources.class_split_rule FK creation 18.06.00.060 will fail if custom Classification sources were created. In that case we should use the 'generic' split rule. Test plan: % git checkout -b bug_22395_pre 3a0cba67f1387595f570ab9d9efdeabc856345b4 Reset the DB Go to Home ? Administration ? Classification sources Create a custom "Classification filing rules" Create a custom "Classification sources" using this filing rules % git checkout master % perl installer/data/mysql/updatedatabase.pl => Without this patch you will get: DBD::mysql::db do failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`#sql-33a_67`, CONSTRAINT `class_source_ibfk_2` FOREIGN KEY (`class_split_rule`) REFERENCES `class_split _rules` (`class_split_rule`)) [for Statement " ALTER TABLE class_sources ADD CONSTRAINT class_source_ibfk_2 FOREIGN KEY (class_split_rule) REFERENCES class_split_rules (class_split_rule) "] at installer/data/mysql/updatedatabase.pl line 17104. => With this patch applied the FK will be created successfully class_sources.class_split_rule will be set to "generic" for these custom values. Signed-off-by: Oliver Behnke Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 5ebf1a26dae62651d1749a2df2e54ee6d1af148a Author: David Gustafsson Date: Fri Apr 6 11:15:07 2018 +0200 Bug 20535: ModZebra called with $record with items stripped ModZebra called with $record with items stripped in ModBiblioMarc. Remove $record argument to force record to be loaded again from database with items embedded. How to test: 1) Make sure biblios are indexed (with rebuild_elastic_search.pl). 2) Perform a search that will produce a sample result containing at least one biblio with items. 3) Edit and save a biblio with items. 4) Perform the same search again, the updated biblio should now have no items when viewed in the search results (No items). 5) Apply patch. 6) Repeat step 1-3. 7) The updated biblio should now have items when viewed in the search results. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 926d7c4ba11ad6cd768c884ec4b2dc71d864b64c Author: Julian Maurice Date: Wed Mar 6 08:58:03 2019 +0100 Bug 16251: Fix value of material select for Rancor 008 widget The material type is selected in accordance with the leader (06-07) Test plan: 1. Create a new record using the advanced editor 2. Set the leader 6th position to 'c' 3. Save the record and reload the page 4. 'Music' should be automatically selected for 008 5. Try other values for the leader 6th and 7th positions See comment 0 of this bug for the complete mapping Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit eeaf59a31ff33ec505fe86a3ef7278aed1733e25 Author: Nick Clemens Date: Thu Mar 7 20:40:53 2019 +0000 Bug 15774: DBRev 18.12.00.022 Signed-off-by: Nick Clemens commit 0499a3bf2b8aad543a6d0e7b87cbee75cd14f166 Author: Josef Moravec Date: Thu Feb 28 07:45:13 2019 +0000 Bug 15774: (QA follow-up) Remove asset of datables.css, and corresponding plugins It is now part of doc-head-close.inc Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fa243015988028cfba82eaeef35a7ec53a000586 Author: Josef Moravec Date: Thu Feb 28 07:44:52 2019 +0000 Bug 15774: (QA follow-up) Fix use statemenets Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1966c6be2e21613c5e1efb977dc946f0f1c21e20 Author: Nick Clemens Date: Wed Feb 27 13:22:31 2019 -0500 Bug 15774: (follow-up) fix rebase issues Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 9cfcd21f24c176cecb743084ee22243aeb44848d Author: Nick Clemens Date: Tue Dec 18 12:05:10 2018 +0000 Bug 15774: Add permission for managing additional fields To test: 1 - Have three borrowers, one with order_manage permission, one with edit_subscription permisson, andone with both 2 - Apply patch, updatedatabase 3 - Verify all three now have the manage_additional_fields permission 4 - Visit the admin page with these users, they should all see the 'Manage additional fields' link 5 - Click the link 6 - User with order_manage should see 'Order baskest' 7 - User with edit_subscription should see 'Subscriptions' 8 - User with both should see both 9 - Remove the additional permissions from a user - they should see a note about needing additional permissions Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fe8bc587f6f78600b7aecc0b7efd75306e9a2e12 Author: Jonathan Druart Date: Thu Nov 1 17:58:14 2018 -0300 Bug 15774: Remove unecessary returned value for ->delete Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 7a109482865838f1594e2e84f762e3e9c95a22db Author: Jonathan Druart Date: Thu Nov 1 17:57:54 2018 -0300 Bug 15774: Do not fetch additional fields from GetSubscription Finally we do not want that, they should be fetch when needed Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit ee5b5175d9dafa906432835d018081ed62fbab05 Author: Jonathan Druart Date: Thu Nov 1 17:57:24 2018 -0300 Bug 15774: Fix and unify additional_fields in C4::Serials Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 9bf62c78811e50aa1b3cfbb25e825d2ca093c180 Author: Jonathan Druart Date: Thu Nov 1 17:54:43 2018 -0300 Bug 15774: Add missing tests for Koha::Object::Mixin::AdditionalFields Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit e0da941f712a2b2be6e43eefbcdd013ec4bd5adb Author: Jonathan Druart Date: Thu Nov 1 17:51:56 2018 -0300 Bug 15774: Fix insert and update for subscription Call it a typo Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit ccd6a334b7447b446bd150d0420f5ad7544bbb8c Author: Jonathan Druart Date: Thu Nov 1 17:41:37 2018 -0300 Bug 15774: Use the include file to display the subscription's additional fields We have it, why not to use it? Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 8035151e41fc2e97e8a0c32cfa0e8c252c393bf2 Author: Nick Clemens Date: Thu Nov 1 18:32:05 2018 +0000 Bug 15774: (follow-up) Address QA issues Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit feb866a618ad5fccb4384dbc9c8b6fd23fec6472 Author: Jonathan Druart Date: Tue Oct 16 16:55:18 2018 -0300 Bug 15774: Fix JS check when AV and MARC field are both selected Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 695ce65132e7e88bd5d3da46e99b665b91a71eb6 Author: Nick Clemens Date: Thu Oct 4 19:46:53 2018 +0000 Bug 15774: (follow-up) Add html filters Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a0a7b779ee39fed7e8d88b7357716d7d4a78d8f0 Author: Julian Maurice Date: Wed May 16 09:30:42 2018 +0200 Bug 15774: Show additional field values in edit form Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 284b543ea4a82dfd4873cc122ba7c2a816f141ca Author: Julian Maurice Date: Tue May 15 17:16:34 2018 +0200 Bug 15774: Add POD and license notices Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 904a4884601588ca89faaaee5e0fd53d3907ec10 Author: Julian Maurice Date: Fri May 4 17:35:45 2018 +0200 Bug 15774: Use Koha::Object(s) for additional fields A lot of code can be removed just by using Koha::Object It also makes fetching and updating additional field values easier. Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit bd9ef8f5843fa7bcb49dc490001c79750035e0d0 Author: Julian Maurice Date: Thu Feb 22 13:52:10 2018 +0100 Bug 15774: Fix additional fields filters Addresses the following QA comments: 1/ Regression: On serials/serials-search.pl, the filters are not filled with what the users searched for and the additional fields linked to an AV are not displayed as a dropdown list. 4/ When searching an order, there is no way not to set a "all" value for additional fields linked to AV. 5/ When searching an order and the search does not return any results, the field should contain what the user filled in. https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15774#c10 Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a108256face480867de76f348d577ade0481cdfa Author: Jesse Weaver Date: Thu Jul 21 13:34:26 2016 -0600 Bug 15774: (QA follow-up) Make sure that tablename is correctly saved Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 84f83012295c90995db48775ff32f06b8d082581 Author: Jesse Weaver Date: Wed Feb 10 12:29:06 2016 -0700 Bug 15774: Add additional fields to order baskets This also moves the admin page for additional fields for all tables to a single common screen, and factors out display/input parsing logic. Test plan: 1. Create an additional field for a subscription (under Serials -> Add subscription fields). 2. Apply patch. 3. Visit Additional fields under administration, and verify that the field created above still shows under the list for the subscription table. 4. Create at least four fields for aqbasket for each combination of searchable/not-searchable and with/without an authorized value. 5. Create an order basket, and verify that all fields are visible and correctly save. 6. Edit the basket, verifying that changes to these additional fields are saved. 7. Add an order to the basket (contents are irrelevant). 8. Go to advanced search within acquisitions. 9. Verify that only the searchable fields show in the form, and that their contents may be searched. Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 10 + C4/Auth.pm | 59 ++- C4/Biblio.pm | 2 +- C4/Serials.pm | 47 +-- Koha.pm | 2 +- Koha/Acquisition/Basket.pm | 2 +- Koha/Acquisition/Baskets.pm | 2 +- Koha/AdditionalField.pm | 428 +------------------- Koha/AdditionalFieldValue.pm | 66 +++ Koha/AdditionalFieldValues.pm | 46 +++ Koha/AdditionalFields.pm | 46 +++ Koha/Illrequest.pm | 4 +- Koha/Illrequest/Config.pm | 9 +- Koha/Object/Mixin/AdditionalFields.pm | 100 +++++ Koha/Objects/Mixin/AdditionalFields.pm | 83 ++++ Koha/Schema/Result/Aqbasket.pm | 15 + Koha/Schema/Result/Subscription.pm | 15 + Koha/SearchEngine/Elasticsearch.pm | 21 +- Koha/Subscription.pm | 2 +- Koha/Subscriptions.pm | 2 +- acqui/basket.pl | 7 + acqui/basketheader.pl | 21 + acqui/histsearch.pl | 15 + .../add_fields.pl => admin/additional-fields.pl | 38 +- admin/searchengine/elasticsearch/mappings.yaml | 54 +-- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 38 ++ installer/data/mysql/userpermissions.sql | 1 + .../intranet-tmpl/lib/koha/cateditor/widget.js | 7 + .../prog/en/includes/additional-fields-display.inc | 11 + .../prog/en/includes/additional-fields-entry.inc | 34 ++ .../intranet-tmpl/prog/en/includes/admin-menu.inc | 5 +- .../prog/en/includes/cateditor-widgets-marc21.inc | 26 +- .../prog/en/includes/filter-orders.inc | 1 + .../intranet-tmpl/prog/en/includes/permissions.inc | 1 + .../prog/en/includes/serials-menu.inc | 1 - .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 + .../prog/en/modules/acqui/basketheader.tt | 5 + .../prog/en/modules/admin/additional-fields.tt | 211 ++++++++++ .../prog/en/modules/admin/admin-home.tt | 6 +- .../en/modules/admin/preferences/circulation.pref | 5 + .../prog/en/modules/serials/add_fields.tt | 178 -------- .../prog/en/modules/serials/serials-search.tt | 26 +- .../prog/en/modules/serials/subscription-add.tt | 35 +- .../prog/en/modules/serials/subscription-detail.tt | 13 +- .../en/modules/virtualshelves/addbybiblionumber.tt | 3 +- koha-tmpl/intranet-tmpl/prog/js/cart.js | 2 - opac/opac-illrequests.pl | 5 +- serials/claims.pl | 10 +- serials/serials-search.pl | 31 +- serials/subscription-add.pl | 85 ++-- serials/subscription-batchedit.pl | 30 +- serials/subscription-detail.pl | 17 +- t/Koha/SearchEngine/Elasticsearch.t | 36 +- t/db_dependent/Acquisition.t | 38 +- t/db_dependent/AdditionalField.t | 293 -------------- t/db_dependent/Auth/haspermission.t | 248 ++++++++---- .../Koha/Objects/Mixin/AdditionalFields.t | 156 +++++++ t/db_dependent/Search.t | 2 + 59 files changed, 1438 insertions(+), 1221 deletions(-) create mode 100644 Koha/AdditionalFieldValue.pm create mode 100644 Koha/AdditionalFieldValues.pm create mode 100644 Koha/AdditionalFields.pm create mode 100644 Koha/Object/Mixin/AdditionalFields.pm create mode 100644 Koha/Objects/Mixin/AdditionalFields.pm rename serials/add_fields.pl => admin/additional-fields.pl (73%) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc create mode 100755 koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt delete mode 100644 t/db_dependent/AdditionalField.t create mode 100755 t/db_dependent/Koha/Objects/Mixin/AdditionalFields.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 00:00:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 23:00:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-26-gc6f8b29 Message-ID: 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, 18.05.x has been updated via c6f8b29803a1bb001e0f2caae85506075d4873a7 (commit) via ca706e6310b30d3e110351409dcdbb19c0da7934 (commit) from e581b73c5d17f48a88424a9467395435fe1e86ff (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 c6f8b29803a1bb001e0f2caae85506075d4873a7 Author: Kyle M Hall Date: Thu Dec 13 14:56:22 2018 -0500 Bug 21997: SIP patron information requests can lock patron out of account Many SIP services send an empty password field (AD). Even if allow_empty_passwords is enabled for the given SIP account, this empty password is run though Koha's password checker which increments the number of login attempts for a patron. Thus repeated patron information requests can lock a patron out! Empty password fields in SIP should not call for a password check if allow_empty_passwords is enabled. Test Plan: 1) Enable a patron password attempt with a limit of 3 2) Send 4 patron information requests with an empty AD field 3) Note the patron's account is now locked 4) Apply this patch 5) Repeat step 2 with a different patron 6) Note the patron's account does not get locked! Signed-off-by: Charles Farmer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit fac2c172143b31255767684e4b22c0ba1ae0aaaf) Signed-off-by: Martin Renvoize (cherry picked from commit 9d811184fef4c7db64f616bd631991aef503a8a9) Signed-off-by: Lucas Gass commit ca706e6310b30d3e110351409dcdbb19c0da7934 Author: Kyle M Hall Date: Mon Feb 11 13:16:10 2019 -0500 Bug 21997: Unit tests Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit d0a6469ad58ccd6067bdfbb6cfb0e28dabc5862a) Signed-off-by: Martin Renvoize (cherry picked from commit a72d11e55dc24764faa6717d3d130ca92777afd0) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/SIP/Sip/MsgType.pm | 3 ++- t/db_dependent/SIP/Message.t | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 00:39:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Mar 2019 23:39:40 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-28-g34bfc86 Message-ID: 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, 18.05.x has been updated via 34bfc86402f7b7db67ac1bed1a379604cfdd6014 (commit) via cc3fb766daac2b3bf29f402c90afa2e77a18e00f (commit) from c6f8b29803a1bb001e0f2caae85506075d4873a7 (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 34bfc86402f7b7db67ac1bed1a379604cfdd6014 Author: Martin Renvoize Date: Tue Feb 19 19:34:04 2019 +0000 Bug 21692: (QA follow-up) Enhance test for new Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 569c64252eba27607deb9eccefe7d72678c7bbb9) Signed-off-by: Martin Renvoize (cherry picked from commit 6643dc2a94a1165a5c4ea77bdcf760385446944e) Signed-off-by: Lucas Gass commit cc3fb766daac2b3bf29f402c90afa2e77a18e00f Author: Jasmine Amohia Date: Thu Jan 17 03:33:49 2019 +0000 Bug 21692: created a test for Koha::Account->new Test plan: 1) Run test for /Koha/Account.t and confirm that all tests were successful Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 34c36a32a057c3a9be062e4ea8b6ec46c41859a0) Signed-off-by: Martin Renvoize (cherry picked from commit d0b51ad0f47558b41208c7c7cbc19e1218cc0850) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Account.t | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 03:36:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 02:36:08 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-29-g7ede3a4 Message-ID: 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, 18.05.x has been updated via 7ede3a464f0d0a5c0332ff8dbf2d60a7b5e689c7 (commit) from 34bfc86402f7b7db67ac1bed1a379604cfdd6014 (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 7ede3a464f0d0a5c0332ff8dbf2d60a7b5e689c7 Author: Katrin Fischer Date: Wed Feb 6 12:27:53 2019 +0000 Bug 17236: Add minute and hours to last checked out item on circulation for hourly loans This is a simple fix using the right TT filter: [% issue.date_due | $KohaDates as_due_date => 1 %] The time part of the due date will only display if it's an hourly loan (!=23:59) To test: - Check out 2 items - One with a loan period in days - One with a loan period in hours - Verify the the due date only shows the date part - Apply patch - Return items and repeat - Verify that now the time part will show for the hourly loan Signed-off-by: Owen Leonard Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 8211aad8c7ad772685b5e3624b3b55b738fe18a2) Signed-off-by: Martin Renvoize (cherry picked from commit f4a02e66d3d7485109116f6a9b9f9c33218a4d4a) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 17:18:35 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 16:18:35 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-30-g5c7afb7 Message-ID: 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, 18.05.x has been updated via 5c7afb7095afc2518cc177e0b8cacce9934fe7cf (commit) from 7ede3a464f0d0a5c0332ff8dbf2d60a7b5e689c7 (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 5c7afb7095afc2518cc177e0b8cacce9934fe7cf Author: Katrin Fischer Date: Wed Feb 6 12:13:12 2019 +0000 Bug 18166: Show internal and vendor notes for receivied orders This copies the logic for showing, adding and editing vendor and internal notes from the pending orders to the received orders. To test: - In acquisitions create a basket with orders - Make your you have some internal and vendor notes - Close the basket and receive shipment - Create or reuse an invoice - Receive some of your orders - Verify that the notes don't show for received orders - Apply patch - Verify that the edit/change vendor/internal note links work the same on pending and received orders Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fe0a2474c9b6702e7d452032f7657da9b990e81a) Signed-off-by: Martin Renvoize (cherry picked from commit 684a1e7dc00b45d69a4c857bba5018991519fa44) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 11 +++++++++++ 1 file changed, 11 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 18:21:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 17:21:00 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-32-g7760643 Message-ID: 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, 18.05.x has been updated via 7760643f36ed2a8c4722315a9a31db8ca5da22fd (commit) via 5ac1ebb60f0d496792f933d38550af2aa6d7f9ed (commit) from 5c7afb7095afc2518cc177e0b8cacce9934fe7cf (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 7760643f36ed2a8c4722315a9a31db8ca5da22fd Author: Josef Moravec Date: Tue Feb 12 21:33:50 2019 +0000 Bug 22130: (follow-up) Show not for loan authorised values in batch checkout TEST PLAN 1) In Koha administration, search "BatchCheckouts". 2) Make sure "BatchCheckouts" is set at "Allow". 3) Make sure "BatchCheckoutsValidCategories" contains at least one patron category. 5) Copy the barcode of an item and change the status document so it cannot be loaned. 4) Choose a patron which belongs to the patron category at 3). (their account should not be expired and they should not have active fees preferably) 5) Go to the patron details page. 6) Click on "Batch check out". 7) Enter the item barcode. 8) Notice a number is in brackets under the column "Information". 9) Apply patch. 10) Notice the status description has replaced the number. 11) Try it with both: AllowNotForLoanOverride on and off Signed-off-by: Josef Moravec Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens (cherry picked from commit abb1b4a75053aa026740e16cc0197d86f417818e) Signed-off-by: Martin Renvoize (cherry picked from commit d44ea8003ad6d7c31ac611a221a2fdb245c2dad7) Signed-off-by: Lucas Gass commit 5ac1ebb60f0d496792f933d38550af2aa6d7f9ed Author: Pierre-Marc Thibault Date: Mon Jan 14 14:02:49 2019 -0500 Bug 22130: Correct parameter to get authorized value description. This patch corrects the error that shows an authorized value instead of the obvious description of the document status. TEST PLAN 1) In Koha administration, search "BatchCheckouts". 2) Make sure "BatchCheckouts" is set at "Allow". 3) Make sure "BatchCheckoutsValidCategories" contains at least one patron category. 5) Copy the barcode of an item and change the status document so it cannot be loaned. 4) Choose a patron which belongs to the patron category at 3). (their account should not be expired and they should not have active fees preferably) 5) Go to the patron details page. 6) Click on "Batch check out". 7) Enter the item barcode. 8) Notice a number is in brackets under the column "Information". 9) Apply patch. 10) Notice the status description has replaced the number. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens (cherry picked from commit 9d69a4238269073fd03961e091b5099b85fea6e6) Signed-off-by: Martin Renvoize (cherry picked from commit f534c985eccae18f406ea8991f13298b958a860b) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/circ/circulation_batch_checkouts.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 18:32:09 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 17:32:09 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-33-gd9e1ce3 Message-ID: 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, 18.05.x has been updated via d9e1ce3df55c2bc5f8026a8dd18babd558dab1c7 (commit) from 7760643f36ed2a8c4722315a9a31db8ca5da22fd (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 d9e1ce3df55c2bc5f8026a8dd18babd558dab1c7 Author: Katrin Fischer Date: Tue Feb 5 21:44:58 2019 +0000 Bug 22170: Improve display of add/edit library group modal Tries to bring the emodal for adding/editing library root and sub groups more in line with the rest of Koha. To test: - Go to Administration > Library groups - With and without patch test following actions: - Add a new root group - Edit root group - Add sub-group entry - Edit sub-group entry - Verify that with the patch the display of the labels is more standard (bold and aligned to the right) and the input fields are a bit longer to allow for easier data entry. Signed-off-by: Owen Leonard Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 90b43c6e5fceda3d6bcc4fb24c99934331df1acc) Signed-off-by: Martin Renvoize (cherry picked from commit ca9f17517df3f97a5ee66e99b5f90f37f74989a5) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/library_groups.tt | 53 +++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 20:11:53 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 19:11:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-706-g088e024 Message-ID: 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 088e0243bf7cd16f7769ddbc2eeefd5857c471f7 (commit) via 4cb1a47d0368640b3e10f51d83b0ce8ea5dd953e (commit) via 2b2054e6948477a94408f96c08e4621ae2d2d8ed (commit) via 6b457885cd325da444d39b031eac567eb0f46351 (commit) via 32551fffdb4296456df2061fd5eaaf403a5799c2 (commit) via cc67ff26aad6e6d429a65d6ea3ffb2226b25ab51 (commit) from 255af719e65956d84d62ea52fea12619bb851f70 (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 088e0243bf7cd16f7769ddbc2eeefd5857c471f7 Author: Martin Renvoize Date: Fri Mar 8 16:52:07 2019 +0000 Bug 22483: Restore undef behaviour Turns out that we rely heavily on the side effect that passing undef to haspermission would always return true no matter what permissions or lack of permissions you had. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 4cb1a47d0368640b3e10f51d83b0ce8ea5dd953e Author: Tomas Cohen Arazi Date: Fri Mar 8 13:45:03 2019 -0300 Bug 22483: (follow-up) Fix wrong tests higlighted by bug Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 2b2054e6948477a94408f96c08e4621ae2d2d8ed Author: Martin Renvoize Date: Fri Mar 8 15:10:20 2019 +0000 Bug 22483: (QA follow-up) Tweaking call to haspermission This patch tweaks the logic to check the permissions is defined before passing to haspermission. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 6b457885cd325da444d39b031eac567eb0f46351 Author: Martin Renvoize Date: Fri Mar 8 14:20:41 2019 +0000 Bug 22483: (QA follow-up) Corrections to logic in check_cookie_auth check_cookie_auth needs to allow for cases where we wish to check for ANY permission and cases where we wish to skip the permissions check entirely and just authenticate the session. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 32551fffdb4296456df2061fd5eaaf403a5799c2 Author: Martin Renvoize Date: Fri Mar 8 12:49:10 2019 +0000 Bug 22483: (follow-up) Improve POD as requested in bug 22031 Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit cc67ff26aad6e6d429a65d6ea3ffb2226b25ab51 Author: Martin Renvoize Date: Fri Mar 8 12:24:17 2019 +0000 Bug 22483: Explicitly ban 'undef' as a valid $flagsrequired Before bug 22031 the haspermission subroutine signature allowed for passing 'undef' to mean 'any permission' in $flagsrequired. This feels like a mistake and was only in practical use in two places in the codebase. This patch explicitly forbids this practice (`*` may be used to the same result and is more explicit in it's nature) and replaces the two instances of it's use. Test Plan 1. Before this patch, the API tests are all failing with authentication errors 2. After this patch the API tests should now all pass. 3. t/db_dependent/Auth/haspermission.t should continue to pass (with one addition subtest added herin) 3. /svc/members/search is not unit tested. Please check that patron searching still yields results in the UI after this patch. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 25 +++++++++++++++++++++---- Koha/REST/V1/Auth.pm | 2 +- svc/members/search | 2 +- t/db_dependent/Auth/haspermission.t | 17 ++++++++++++++++- t/db_dependent/api/v1/patrons_password.t | 6 +++--- 5 files changed, 42 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 8 21:02:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Mar 2019 20:02:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-39-gccdc3af Message-ID: 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, 18.05.x has been updated via ccdc3afb148fb6b1e7ab2b295dc9adbf668184df (commit) via 6473493713fcb400829b17b71d8f48626426a461 (commit) via f7c5a910ded2bc15ccc2fa9cea557c61d7989f10 (commit) via 13a769c5a8706825093fd85c79619ce8639573c5 (commit) via 96e43cdecc5a929c07ec5d25b064bb731c7a07b0 (commit) via 7612fc325f48fe7d36ae00a42f29ec1895b2b700 (commit) from d9e1ce3df55c2bc5f8026a8dd18babd558dab1c7 (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 ccdc3afb148fb6b1e7ab2b295dc9adbf668184df Author: Kyle M Hall Date: Tue Jan 8 13:10:53 2019 -0500 Bug 22084: Plugin upgrade method and database plugin version storage will never be triggered for existing installs If an existing plugin begins using the upgrade() method, it will never actually get triggered because the installation has already occurred and no database plugin version was stored at the time. Without that database version, the upgrade method will never be triggered. In addition, if the plugin has no upgrade method, the installed version is never updated in the database! Lastly, when an upgrade succeeds it prints a warning that the upgrade failed. Test Plan: 1) Install an older version of the Kitchen sink plugin: * https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.0/koha-plugin-kitchen-sink-v2.1.0.kpz 2) Delete the "__INSTALLED_VERSION__" key, and the "last_upgraded" key from plugin_data for this plugin, to simulate having installed from an earlier version of Koha 3) Upgrade to the latest version of the Kitchen sink plugin: * https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.22/koha-plugin-kitchen-sink-v2.1.22.kpz 4) Note "__INSTALLED_VERSION__" still doesn't exist for the plugin, in the plugin_data table 5) Apply this patch 6) Restart all the things 7) Browse to the Kitchen sink configuration page, this should trigger the upgrade method 8) Note the "__INSTALLED_VERSION__" and "last_upgraded" keys exist in plugin_data for the Kitchen Sink plugin Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 8c2e03020dc02519dec70b9697794a3624c73937) Signed-off-by: Martin Renvoize (cherry picked from commit b19b36fb6260932dff3961ec9ed1202188d367de) Signed-off-by: Jesse Maseto commit 6473493713fcb400829b17b71d8f48626426a461 Author: Tomas Cohen Arazi Date: Wed Jan 9 07:33:15 2019 -0300 Bug 22084: Regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 57f4c01b9a09d1c2e0fc8a3449ba86574775b840) Signed-off-by: Martin Renvoize (cherry picked from commit 00fff866dd25c89f740b46e6366868027fe7512a) Signed-off-by: Jesse Maseto commit f7c5a910ded2bc15ccc2fa9cea557c61d7989f10 Author: Tomas Cohen Arazi Date: Mon Feb 11 16:05:23 2019 -0300 Bug 21765: Make AutoUnsuspendReserves call Koha::Hold->resume This patch makes the mentioned method use the biult-in method for resuming a suspended hold, instead of manually setting the specific attributes using the accessors. The side effect for this is that HoldsLog is now honoured. This patchset also refactors the tests a bit so they rely on the exposed methods and thus don't rely on specific implementation details (like suspended hold means a date in suspended_until plus suspended=1). To test: - Apply the regression tests patch - Run: $ kshell k$ prove t/db_dependent/Reserves/AutoUnsuspendReserves.t => FAIL: It fails loudly because things are done manually - Apply this patch - Run: k$ prove t/db_dependent/Reserves/AutoUnsuspendReserves.t => SUCCESS: Tests pass! Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 7c3a5c78c1aacbdb0ad7eb758cb9880ecefcce3a) Signed-off-by: Martin Renvoize (cherry picked from commit 7609009a7319ad6e631bac6fd39a8a5397566782) Signed-off-by: Jesse Maseto commit 13a769c5a8706825093fd85c79619ce8639573c5 Author: Tomas Cohen Arazi Date: Mon Feb 11 16:04:59 2019 -0300 Bug 21765: Regression tests Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit d441ce5cdadba7a87570162b9f54600c82f150e2) Signed-off-by: Martin Renvoize (cherry picked from commit eeeae403a1cf3ef0860abec23cd05ac8577e996d) Signed-off-by: Jesse Maseto commit 96e43cdecc5a929c07ec5d25b064bb731c7a07b0 Author: Josef Moravec Date: Mon Feb 25 18:21:26 2019 +0000 Bug 22411: Date and time in log viewer should respect Test plan: Go to log viewer and show some log -- without patch the date ant time in first column is formatted as yyyy-mm-dd hh:mm -- with patch the date is formatted according to your dateformat system preference Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit dd8749661ce7e48e86fc4eeba3c7c42e0321184e) Signed-off-by: Martin Renvoize (cherry picked from commit f9892cd621e9c1c17dac41771b607119bee05840) Signed-off-by: Jesse Maseto commit 7612fc325f48fe7d36ae00a42f29ec1895b2b700 Author: Fridolin Somers Date: Thu Feb 21 17:21:58 2019 +0100 Bug 15149: Serial test prediction pattern does not consider end date To reproduce: 1) add a serial. 2) set first issue = today 3) set frequency = 1/month 4) dont set subscription length 5) set subscription start date = today 6) set subscription start date = today + 1 year 7) set numbering pattern = Number 8) test prediction pattern. => Without patch : you will get a list of 1000 issues, going well beyond subscripton end date. => With patch : shows only the issues within the date range. Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: zhihui Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e3212c8a969ff17783e50d564aaa412bd01a99b1) Signed-off-by: Martin Renvoize (cherry picked from commit c20af7c877b8a13f51cb94aec97dee55fc15db56) Signed-off-by: Jesse Maseto ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 2 +- Koha/Plugins/Base.pm | 7 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +- serials/showpredictionpattern.pl | 2 +- t/db_dependent/Plugins.t | 28 +++- t/db_dependent/Reserves/AutoUnsuspendReserves.t | 135 +++++++++++++++++--- 6 files changed, 151 insertions(+), 26 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 9 09:47:49 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 09 Mar 2019 08:47:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-708-g0d26aa7 Message-ID: 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 0d26aa77e754934daa20b0343dbd25772771678e (commit) via 4cffd7e267a2236140732aaed5ef9fb3983b6379 (commit) from 088e0243bf7cd16f7769ddbc2eeefd5857c471f7 (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 0d26aa77e754934daa20b0343dbd25772771678e Author: Martin Renvoize Date: Sat Mar 9 08:15:14 2019 +0000 Bug 22483: Restore svc/members/search This script used to pass 'undef' to haspermission, this patch restores that behaviour. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi commit 4cffd7e267a2236140732aaed5ef9fb3983b6379 Author: Martin Renvoize Date: Sat Mar 9 08:13:03 2019 +0000 Bug 22483: Restore exact behaviour of undef Passing undef (or nothing) as $flagsrequired to haspermission simply returned the return from fetchrow prior to this patch. Restoring that behaviour. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 2 +- svc/members/search | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 9 10:00:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 09 Mar 2019 09:00:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-709-gd0c7628 Message-ID: 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 d0c76286a2757d511563357820db48d7bbb58ead (commit) from 0d26aa77e754934daa20b0343dbd25772771678e (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 d0c76286a2757d511563357820db48d7bbb58ead Author: Tomas Cohen Arazi Date: Sat Mar 9 05:41:45 2019 -0300 Bug 15774: (follow-up) Fix TestBuilder.t so it doesn't catch wrong classes Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: t/db_dependent/TestBuilder.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 11 14:26:53 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Mar 2019 13:26:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-751-g585273b Message-ID: 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 585273b6147d0cda646296a5121e7a3af021473c (commit) via af182e4d11c570cac02a659007b2991716174b7d (commit) via a38c49f33f80a5198772a7d43bdec78f51f23724 (commit) via d58d61abff146b9b33b651f6486e580e0f5a5462 (commit) via d9be495c36384d4a003e3b3b8938a75584df599d (commit) via c3f28829e50690da8fdfa104cdbacb3d0354da18 (commit) via b701ceae34664e2121942b3e16220cc6f419022e (commit) via 1083256d4168672a1d4bc631fbb42d221371a8ee (commit) via 8856f3933bce2602df860780d1db1a6145f88e0a (commit) via e024c38c7750b8eeb903fb1182e6fd9b520d5ec3 (commit) via 3459fd9493e2ae28ac86c3d5861469cc82c3cc2f (commit) via f8466fcc6a614c81d5b473be59782bb7ef74feba (commit) via dc644fcb0afc05023c07cf2cd299e37e432b239c (commit) via 7c38f63d85f3cd8024bc7038ec7f3e6db6e14f57 (commit) via 9e6d6f4e7c14eb3ec2fea7551d93041d8fbc6583 (commit) via bc269304f42ce653036805f8574261f7d30b95ac (commit) via 94f5a270ed83b4061fd9dd5ad9046ebf4b728283 (commit) via ac3223342e26b60d9d2cc2f601ed1c097f1e48bd (commit) via add47bf472cefacc6efafe0c73a36a1ea309de81 (commit) via 6338bf19a861df01f38b11eb35361760909583ab (commit) via 7bdbea041767393991dab2f6fa7a9065d97c79f1 (commit) via d885aefcd56e827e3f5f19a47636bff17474d804 (commit) via 3189df3ac9ea5ebabc53be0c12eb192afbd68842 (commit) via 417e13225320f124ba6be6a11d0546e0568b24da (commit) via 4d3144310c00398b1f6629c27466bdce04436841 (commit) via 41a8c11fbb7525b5a767d2a37c1e2b473a78a45b (commit) via a134b69cf616aab944282924cf21ed0c11fd5f33 (commit) via 18f06151dc951354f3463ed613d9af0cb23bbf2f (commit) via 1253975389975a8ff11a9bb2ef84582aeb6bd08b (commit) via 0adbf3fc326a103fd819f0853c3a64028da70e81 (commit) via aeab8b50f4ca7a23bf7d3aa8f75f1259fb2e4073 (commit) via 25b927e296fe3adabfe15e6193bc15379add74fc (commit) via bc7d038ac042a1af16836cce60e6f41941359a12 (commit) via abe0050ad6f68f0a6f87912ff5635a2f5411899a (commit) via cab238755a69ca7e52b3822b390b31484abb5c72 (commit) via 56cae15990e289da196f64ca44e27effabf8ff2a (commit) via 1727131ca5b50adc920c0a4395980fe479efa797 (commit) via bc2d9f869ad0bde3e97e3773e0e050503d8083f4 (commit) via c91c1a69a23ff8d826a077c61059953bcc51940b (commit) via ae2caab54f53bd9b7fbe8e5c1575f38e97002bf2 (commit) via 74ac15800bbf358e3f1133a1f212400797640112 (commit) via bb730c1b05c91ee92db09d117293a0ddb87dace1 (commit) from d0c76286a2757d511563357820db48d7bbb58ead (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 585273b6147d0cda646296a5121e7a3af021473c Author: Nick Clemens Date: Mon Mar 11 13:08:54 2019 +0000 Bug 11375: Compiled CSS Signed-off-by: Nick Clemens commit af182e4d11c570cac02a659007b2991716174b7d Author: Josef Moravec Date: Mon Feb 25 14:49:18 2019 +0000 Bug 11375: (QA follow-up) Remove some more treeview occurences Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a38c49f33f80a5198772a7d43bdec78f51f23724 Author: Josef Moravec Date: Mon Feb 25 14:32:23 2019 +0000 Bug 11375: (QA follow-up) Fix typo Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d58d61abff146b9b33b651f6486e580e0f5a5462 Author: Owen Leonard Date: Thu Jan 17 15:37:15 2019 +0000 Bug 11375: (follow-up) Add links to show all/hide all This patch adds links in the toolbar to show or hide all sub-permissions. To test, apply the patch and view the permissions page for a patron. Clicking the "Show all" or "Hide all" links should work to show or hide all sub-permissions. The corresponding "Show details" and "Hide details" links for each permission set should be correctly toggled. Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d9be495c36384d4a003e3b3b8938a75584df599d Author: Owen Leonard Date: Thu May 24 13:48:48 2018 +0000 Bug 11375: Improve patrons permissions display This patch updates the patron permissions interface in order to emphasize permission descriptions (which can be translated) over permission code (which cannot). The tree structure (and jQuery plugin) is removed, and permissions are displayed in a table-like way. Sub-permissions are shown or hidden with a link. A free-text filter is added to the top for narrowing the list by keyword. Save and cancel buttons are now in a floating toolbar. To test, apply the patch, regenerate the staff client CSS, and clear your browser cache if necessary. - Open the "Set permissions" page for any patron. - Confirm that the filter works correctly to show only lines which match your entry - Note that the superlibrarian line stays visible all the time. This is to make it clearer that sub-permissions cannot be selected if superlibrarian is checked. - Check the superlibrarain "hint" text for clarity. - Test the show/hide controls. - Test that checking a "parent" permission displays the sub-permissions. - Test that the toolbar with Save and Cancel floats when scrolling. - Test that changing and saving permissions works correctly. Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit c3f28829e50690da8fdfa104cdbacb3d0354da18 Author: Nick Clemens Date: Mon Mar 11 13:03:37 2019 +0000 Bug 22368: DBRev 18.12.00.024 Signed-off-by: Nick Clemens commit b701ceae34664e2121942b3e16220cc6f419022e Author: Jonathan Druart Date: Tue Feb 26 17:23:13 2019 -0300 Bug 22368: Make sure the tests will always pass Who knows! Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 1083256d4168672a1d4bc631fbb42d221371a8ee Author: Martin Renvoize Date: Tue Feb 26 17:35:22 2019 +0000 Bug 22368: (QA follow-up) Changed to LEFT JOIN as requested Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 8856f3933bce2602df860780d1db1a6145f88e0a Author: Martin Renvoize Date: Mon Feb 25 12:39:19 2019 +0000 Bug 22368: (QA follow-up) Switch to using foreign_key_exists Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit e024c38c7750b8eeb903fb1182e6fd9b520d5ec3 Author: Martin Renvoize Date: Wed Feb 20 16:51:22 2019 +0000 Bug 22368: (QA follow-up) Missing comma in kohastructure.sql Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 3459fd9493e2ae28ac86c3d5861469cc82c3cc2f Author: Josef Moravec Date: Wed Feb 20 16:08:38 2019 +0000 Bug 22368: (QA follow-up) Mute db errors in test Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit f8466fcc6a614c81d5b473be59782bb7ef74feba Author: Martin Renvoize Date: Tue Feb 19 14:03:34 2019 +0000 Bug 22368: Add missing constraints to `suggestions` Signed-off-by: Mark Tompsett Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit dc644fcb0afc05023c07cf2cd299e37e432b239c Author: Martin Renvoize Date: Tue Feb 19 15:31:20 2019 +0000 Bug 22368: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 7c38f63d85f3cd8024bc7038ec7f3e6db6e14f57 Author: Josef Moravec Date: Mon Feb 25 21:43:17 2019 +0000 Bug 19489: (QA follow-up) Revert changes in printinvoice It would be change behaviour, libraries are often using POS printers and wider table could make a problem for them and break theirs workflow. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 9e6d6f4e7c14eb3ec2fea7551d93041d8fbc6583 Author: Josef Moravec Date: Mon Feb 25 21:36:31 2019 +0000 Bug 19489: (QA follow-up) Remove passing issue_id in pay form This is not needed Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit bc269304f42ce653036805f8574261f7d30b95ac Author: Josef Moravec Date: Mon Feb 25 21:33:12 2019 +0000 Bug 19489: (QA follow-up) Update test to use objects and module methods for creating needed data Test plan: prove t/db_dependent/Koha/Account/Lines.t Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 94f5a270ed83b4061fd9dd5ad9046ebf4b728283 Author: Josef Moravec Date: Mon Feb 25 21:32:39 2019 +0000 Bug 19489: (QA follow-up) Cache checkout object in variable Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit ac3223342e26b60d9d2cc2f601ed1c097f1e48bd Author: Nazl? ?etin Date: Wed Feb 20 07:21:33 2019 +0000 Bug 19489: (follow-up) Fix typos in the tests Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit add47bf472cefacc6efafe0c73a36a1ea309de81 Author: Nazl? ?etin Date: Tue Feb 19 12:45:56 2019 +0000 Bug 19489: Change method name issue --> checkout Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 6338bf19a861df01f38b11eb35361760909583ab Author: Nazl? ?etin Date: Mon Feb 18 09:50:10 2019 +0000 Bug 19489: Detailed Description of charges in Patron accounting Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 7bdbea041767393991dab2f6fa7a9065d97c79f1 Author: Nazl? ?etin Date: Mon Feb 18 09:44:24 2019 +0000 Bug 19489: Koha::Account::Line->issue method and Unit test Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit d885aefcd56e827e3f5f19a47636bff17474d804 Author: Jonathan Druart Date: Thu Feb 21 16:02:31 2019 -0300 Bug 22392: Reuse existing pattern Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3189df3ac9ea5ebabc53be0c12eb192afbd68842 Author: Martin Renvoize Date: Thu Feb 21 17:26:33 2019 +0000 Bug 22392: Allow barcode to be passed to build_sample_item Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 417e13225320f124ba6be6a11d0546e0568b24da Author: Nick Clemens Date: Mon Mar 11 12:33:35 2019 +0000 Bug 22045: Compiled CSS Signed-off-by: Nick Clemens commit 4d3144310c00398b1f6629c27466bdce04436841 Author: Owen Leonard Date: Thu Feb 14 19:37:21 2019 +0000 Bug 22045: (follow-up) Fix tab-switching when some tab numbers are missing This patch changes the way tab-switching is done so that it switching tabs based on tab id rather than tab index. Using tab index doesn't work when the tab number doesn't match the tab index. To test, apply the patch and load a record or blank editor using a MARC framework which doesn't include one or more tabs (for instance, by deleting the entries in the framework for one tab: DELETE FROM marc_subfield_structure WHERE frameworkcode = 'KT' AND tab = 4; ...backup first). In the MARC editor the numbered tabs should exclude that number. Tab-switching should work correctly. Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 41a8c11fbb7525b5a767d2a37c1e2b473a78a45b Author: Owen Leonard Date: Mon Feb 11 17:13:55 2019 +0000 Bug 22045: (follow-up) Revert change to numbering of tabs I wanted the tabs to be numbered like humans count, starting from 1. But if the MARC framework setup isn't changed as well it doesn't make sense. This patch removes the change. Also fixed: Some missing template filters, an errant console.log() removed. To test, apply the patch and open a new or existing record for editing. The tabs (now "Sections") should be labeled from 0-9. Signed-off-by: John Doe Signed-off-by: David Nind Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a134b69cf616aab944282924cf21ed0c11fd5f33 Author: Owen Leonard Date: Thu Jan 10 13:07:10 2019 +0000 Bug 22045: Cataloging UX enhancement - Improve access to tabs This patch makes style changes to the standard MARC editor with the goal of both making it more responsive and making it easier to navigate among tabs and tags. Tabs are now part of the page's toolbar, which floats as the page scrolls. In addition to the numbered tabs, there is also a section showing in-page links to the MARC tags which are available on that page. To test, apply the patch, regenerate the staff client CSS, and clear your browser cache if necessary. Open a blank or existing record in the standard cataloging editor. Test the redesigned tabs, the floating toolbar, and the in-page tag links. Confirm that everything works well at various browser widths. Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: John Doe Signed-off-by: David Nind Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 18f06151dc951354f3463ed613d9af0cb23bbf2f Author: Jonathan Druart Date: Fri Feb 22 07:36:11 2019 -0300 Bug 21091: Add missing USE raw statement Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1253975389975a8ff11a9bb2ef84582aeb6bd08b Author: Owen Leonard Date: Wed Nov 28 17:51:10 2018 +0000 Bug 21091: Move add item template JavaScript to a separate file This patch moves the JavaScript in the add item template to separate files: 1 JS file and 1 include file containing translatable strings. While moving the JS to cataloging_additem.js I have made some changes to quiet ESLint warnings (spacing, variable definition). To test, apply the patch and open the add item page for an existing record. Test the various JS-driven functionalities: - Table sorting - Table column configuration - Table searching - Table inline edit/delete links (click anywhere in the table row) - Add multiple item form show/hide - Add multiple item warning when adding 100+ items Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 0adbf3fc326a103fd819f0853c3a64028da70e81 Author: Josef Moravec Date: Mon Feb 25 18:13:04 2019 +0000 Bug 22363: (follow-up) Fix pod Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit aeab8b50f4ca7a23bf7d3aa8f75f1259fb2e4073 Author: Josef Moravec Date: Sun Feb 17 22:45:07 2019 +0000 Bug 22363: Update Circulation.t to use Koha::ActionLogs instead of GetLogs Test plan: prove t/db_dependent/Circulation.t Signed-off-by: Andrew Isherwood Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 25b927e296fe3adabfe15e6193bc15379add74fc Author: Josef Moravec Date: Mon Feb 18 14:08:19 2019 +0000 Bug 22363: Use Koha::ActionLogs->search instead of GetLogs in log viewer Test plan: 1) Use log viewer, try different parameters 2) Try screen and file export 3) prove t/db_dependent/Koha/ActionLogs.t Signed-off-by: Andrew Isherwood Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit bc7d038ac042a1af16836cce60e6f41941359a12 Author: Josef Moravec Date: Mon Feb 18 14:01:44 2019 +0000 Bug 22363: Add tests Signed-off-by: Andrew Isherwood Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit abe0050ad6f68f0a6f87912ff5635a2f5411899a Author: Josef Moravec Date: Mon Feb 18 13:28:34 2019 +0000 Bug 22363: Add Koha::ActionLog[s] objects Signed-off-by: Andrew Isherwood Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit cab238755a69ca7e52b3822b390b31484abb5c72 Author: Katrin Fischer Date: Sun Feb 10 03:09:45 2019 +0100 Bug 17496: Remove undocumented/maintained install-CPAN.pl file The install-CPAN.pl file was added in 2007 and hasn't been updated or documented since. This patch removed it from Koha. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 56cae15990e289da196f64ca44e27effabf8ff2a Author: Josef Moravec Date: Tue Feb 26 12:58:41 2019 +0000 Bug 22452: Fix typos in add mana comment modals There are typos in modal where you can add a comment to mana: 'caracters' should be 'characters' 'commment' should be 'comment' Test plan: 1) Create subscription from Mana 2) On subscription detail page: report mistake > other a modal is shown --> without patch it reads 'Please enter a new commment (max 35 caracters)' --> with patch it reads 'Please enter a new comment (max 35 characters)' 3) The same in mana search resultss and in reports Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1727131ca5b50adc920c0a4395980fe479efa797 Author: Nick Clemens Date: Mon Mar 11 10:42:25 2019 +0000 Bug 22422: Compiled CSS Signed-off-by: Nick Clemens commit bc2d9f869ad0bde3e97e3773e0e050503d8083f4 Author: Fridolin Somers Date: Thu Feb 28 13:37:40 2019 +0100 Bug 22422: improve item location display with class "shelvingloc" In record detail page, item location is displayed with CSS using class "shelvingloc". Many many places at intranet and OPAC can use this class. It allows to change display in all places using CSS customisation. This patch removes the CSS "display:block" for class "shelvingloc". Some places where using "inline" to correct the display. I think the display should not be managed in template. So it will be inline by default and it can be changed by custom CSS, on all places or depending on a selctor. Test plan : 1) Compile SCSS to CSS 2) Add to preferences IntranetUserCSS and OPACUserCSS : .shelvingloc { color:red } 3) Go to pages impacted by patch, be sure to look at cart with "more details" 4) You see item location italic and red Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c91c1a69a23ff8d826a077c61059953bcc51940b Author: Owen Leonard Date: Tue Mar 5 18:22:12 2019 +0000 Bug 21030: Date widget on suspend modal not working correctly This patch makes a change to the suspend hold modal markup in order to allow the datepicker to work properly. To test, apply the patch and locate a patron in the staff client who has holds. - On the checkout or patron detail page, open the holds tab. - Click the "Suspend" button for one of the holds. - In the modal, trigger the date picker and confirm that the dropdowns for selecting month and year work correctly. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ae2caab54f53bd9b7fbe8e5c1575f38e97002bf2 Author: Katrin Fischer Date: Thu Mar 7 03:10:28 2019 +0000 Bug 19046: (QA follow-up) Remove doubled up 'Title as phrase' One search option was doubled up by accident. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 74ac15800bbf358e3f1133a1f212400797640112 Author: Jonathan Druart Date: Mon Mar 4 15:39:29 2019 -0300 Bug 19046: Make seach pulldown to retain index selection This patch also fixes add the term in the search input Test plan: Enable IntranetCatalogSearchPulldown Search for a term using the search input in the header (simple search) Re-do selecting different indices The selection must retain on the search result page. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit bb730c1b05c91ee92db09d117293a0ddb87dace1 Author: Jonathan Druart Date: Mon Mar 4 14:50:36 2019 -0300 Bug 22442: (bug 13618 follow-up) Fix item search CSV export We must not filter assignements statements. Test plan: Export item search result as CSV Without this patch the biblio and biblioitem values are not displayed. With this patch applied everything is displayed correctly Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Account/Line.pm | 15 + Koha/{Acquisition/Invoice.pm => ActionLog.pm} | 14 +- Koha/{Patron/Consents.pm => ActionLogs.pm} | 23 +- Koha/Schema/Result/Biblio.pm | 19 +- Koha/Schema/Result/Borrower.pm | 64 +- Koha/Schema/Result/Branch.pm | 19 +- Koha/Schema/Result/Suggestion.pm | 145 +++- admin/columns_settings.yml | 12 + catalogue/search.pl | 8 + install-CPAN.pl | 45 -- installer/data/mysql/kohastructure.sql | 15 +- installer/data/mysql/updatedatabase.pl | 81 ++ .../lib/jquery/plugins/jquery.treeview.pack.js | 16 - koha-tmpl/intranet-tmpl/prog/css/addbiblio.css | 112 ++- koha-tmpl/intranet-tmpl/prog/css/right-to-left.css | 18 - .../intranet-tmpl/prog/css/src/staff-global.scss | 108 ++- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/css/treeview/images/file.gif | Bin 110 -> 0 bytes .../prog/css/treeview/images/folder-closed.gif | Bin 105 -> 0 bytes .../prog/css/treeview/images/folder.gif | Bin 106 -> 0 bytes .../prog/css/treeview/images/minus.gif | Bin 837 -> 0 bytes .../prog/css/treeview/images/plus.gif | Bin 841 -> 0 bytes .../css/treeview/images/treeview-black-line.gif | Bin 1877 -> 0 bytes .../prog/css/treeview/images/treeview-black.gif | Bin 1216 -> 0 bytes .../css/treeview/images/treeview-default-line.gif | Bin 1993 -> 0 bytes .../prog/css/treeview/images/treeview-default.gif | Bin 1222 -> 0 bytes .../treeview/images/treeview-famfamfam-line.gif | Bin 807 -> 0 bytes .../css/treeview/images/treeview-famfamfam.gif | Bin 1280 -> 0 bytes .../css/treeview/images/treeview-gray-line.gif | Bin 1877 -> 0 bytes .../prog/css/treeview/images/treeview-gray.gif | Bin 1230 -> 0 bytes .../prog/css/treeview/images/treeview-red-line.gif | Bin 1877 -> 0 bytes .../prog/css/treeview/images/treeview-red.gif | Bin 1230 -> 0 bytes .../prog/css/treeview/jquery.treeview.css | 69 -- .../intranet-tmpl/prog/en/includes/cat-search.inc | 2 +- .../en/includes/catalogue/itemsearch_item.csv.inc | 4 +- .../mana/mana-subscription-search-result.inc | 2 +- .../intranet-tmpl/prog/en/includes/permissions.inc | 796 ++++++++++++++++---- .../prog/en/includes/reports-toolbar.inc | 2 +- .../prog/en/includes/search_indexes.inc | 198 ++++- .../prog/en/includes/serials-toolbar.inc | 2 +- .../prog/en/includes/str/cataloging_additem.inc | 17 + .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 5 +- .../prog/en/modules/catalogue/detail.tt | 5 +- .../prog/en/modules/catalogue/results.tt | 6 +- .../prog/en/modules/cataloguing/addbiblio.tt | 71 +- .../prog/en/modules/cataloguing/addbooks.tt | 6 +- .../prog/en/modules/cataloguing/additem.tt | 136 +--- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/members/accountline-details.tt | 21 + .../prog/en/modules/members/boraccount.tt | 8 +- .../prog/en/modules/members/member-flags.tt | 233 +++--- .../intranet-tmpl/prog/en/modules/members/pay.tt | 26 +- .../intranet-tmpl/prog/en/modules/tags/list.tt | 3 +- .../prog/en/modules/virtualshelves/shelves.tt | 4 +- .../intranet-tmpl/prog/js/cataloging_additem.js | 119 +++ koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 1 - .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../bootstrap/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- members/pay.pl | 7 - t/db_dependent/Circulation.t | 45 +- t/db_dependent/Koha/Account/Lines.t | 41 +- t/db_dependent/Koha/ActionLogs.t | 70 ++ t/db_dependent/Koha/Suggestions.t | 95 ++- t/lib/TestBuilder.pm | 5 +- tools/viewlog.pl | 72 +- 74 files changed, 2104 insertions(+), 713 deletions(-) copy Koha/{Acquisition/Invoice.pm => ActionLog.pm} (82%) copy Koha/{Patron/Consents.pm => ActionLogs.pm} (78%) delete mode 100644 install-CPAN.pl delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.treeview.pack.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/file.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder-closed.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/minus.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/plus.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black-line.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default-line.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam-line.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray-line.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red-line.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/treeview/jquery.treeview.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js create mode 100644 t/db_dependent/Koha/ActionLogs.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 11 23:24:28 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Mar 2019 22:24:28 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-40-g8bde7a2 Message-ID: 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, 18.05.x has been updated via 8bde7a22542528eea18ebd21baf54805e8d0cbc7 (commit) from ccdc3afb148fb6b1e7ab2b295dc9adbf668184df (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 8bde7a22542528eea18ebd21baf54805e8d0cbc7 Author: Jonathan Druart Date: Thu Feb 21 15:28:10 2019 -0300 Bug 22360: (bug 21205 follow-up) Restore OPACAcquisitionDetails behavior Caused by commit 7d10549ae8632e6640d3a99014268a2a1e46b3c4 Bug 21205: Replace C4::Items::GetOrderFromItemnumber calls At this point $order is a Koha::Acquisition::Order object, not a hashref anymore. Test plan: Create an order, receive items Enable OPACAcquisitionDetails At the detail page of the bibliographic record you should see "X items are on order." at the bottom of the items list Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 2331b8a295ce3db011b88bf3d42eacd42c9df4ee) Signed-off-by: Martin Renvoize (cherry picked from commit db36421446fcdb40ac6aeeca3a7b7cb4a6711bda) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: opac/opac-detail.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 11 23:29:44 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Mar 2019 22:29:44 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-41-g8126fe6 Message-ID: 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, 18.05.x has been updated via 8126fe6d122140e40053ed74768148952fe30303 (commit) from 8bde7a22542528eea18ebd21baf54805e8d0cbc7 (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 8126fe6d122140e40053ed74768148952fe30303 Author: Lucas Gass Date: Mon Mar 11 22:10:26 2019 +0000 Bug 22360: (rm follow-up) reverting accidental commit This reverts commit db36421446fcdb40ac6aeeca3a7b7cb4a6711bda. Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: opac/opac-detail.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 12 09:36:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Mar 2019 08:36:11 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.16-4-g838875f Message-ID: 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, 17.11.x has been updated via 838875f67c0ce6e60d38ddfaff801eff852bb2d3 (commit) via 878c25efb5d0067a0b398eeee84fa8539a5f4c0d (commit) from 954cf660780797f8cc658e6bcbe4d082ce314b24 (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 838875f67c0ce6e60d38ddfaff801eff852bb2d3 Author: Mark Tompsett Date: Sat Feb 18 19:50:32 2017 -0500 Bug 18143: Silence ods MARC framework export flood Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5b0eb51c8066abbd645731593572277ca5b46715) Signed-off-by: Martin Renvoize (cherry picked from commit 854f1ca17a78c5b73c63cfd0b57bcf89108778b2) Signed-off-by: Lucas Gass (cherry picked from commit e448cb9042e1b449ca64ee99f1ac2576126e2f6d) Signed-off-by: Fridolin Somers commit 878c25efb5d0067a0b398eeee84fa8539a5f4c0d Author: Mark Tompsett Date: Sat Feb 18 19:21:59 2017 -0500 Bug 18143: Silence XML MARC Framework export flood TEST PLAN --------- 1) Log in to staff client 2) Click Koha administration 3) Click MARC bibliographic framework 4) export default as xml 5) Read the error log -- it's floody and export is default framework 6) export another framework as xml 7) Read the error log -- it's floody and export is the correct framework 8) apply the patch 9) repeat steps 4-7 -- expected frameworks exported, and no flooding. 10) run koha qa test tools Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 719153455c8c58fb8b1a8e9123acef5052dbd462) Signed-off-by: Martin Renvoize (cherry picked from commit 65a6cd355ef227ab4e11b620f485f010b611e115) Signed-off-by: Lucas Gass (cherry picked from commit e6bfbc6832fb5a4b87f7e12f6e45e6d814f5b311) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/ImportExportFramework.pm | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 12 10:56:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Mar 2019 09:56:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-121-g9f065fe Message-ID: 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, 18.11.x has been updated via 9f065fe43f62f2bfbecc15b7267d06a9c62b1638 (commit) via a086a063d4895e5a3ac02f300828ca25857d81e5 (commit) via 453e2fe464c6a6b1f3ff39058d164b463c23f55c (commit) via 2084f0e3cb2496b979dbacb70d17aab868d9ee2b (commit) via d558544afd437466f4a0fc342a127610a98ca184 (commit) via 9a82230b2742c51af63f8156e18324556112b572 (commit) via c0dfab31d96e17642f68e7aeb471023eee8c72a8 (commit) via 0c8b515fe724c248cae1d6fa696020c5de9957f1 (commit) via 7d741a69919c17f8c8c6a4c965d93c95c2355793 (commit) via a03d8dd1735520614492aab207a392b957e34630 (commit) via f5d6b6e4e95e1850908fb73b88a36bd6d76b0f5c (commit) via 6729f22ff015cd14c2356f44d7f30843a302937e (commit) via 0e56d43b403c1acb4c9c0ce9427bfa3b33692d8b (commit) via d7988f672f68e0cc875eedce6bad0b634df8941c (commit) via f688c463fd4cee3c6a894d583437b198060265e4 (commit) via b102d73fa51c1dabc46b03b2ad873db9e9b7ca42 (commit) via 4ca973f55d7eed71b4f0afad3b46ed95fec5ce13 (commit) from 85a30f6d9f3170f3652c0c8d4c4d68edb9491bda (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 9f065fe43f62f2bfbecc15b7267d06a9c62b1638 Author: Katrin Fischer Date: Sun Feb 10 03:09:45 2019 +0100 Bug 17496: Remove undocumented/maintained install-CPAN.pl file The install-CPAN.pl file was added in 2007 and hasn't been updated or documented since. This patch removed it from Koha. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit cab238755a69ca7e52b3822b390b31484abb5c72) Signed-off-by: Martin Renvoize commit a086a063d4895e5a3ac02f300828ca25857d81e5 Author: Martin Renvoize Date: Tue Mar 12 09:21:24 2019 +0000 Bug 22422: Compiled CSS Signed-off-by: Martin Renvoize commit 453e2fe464c6a6b1f3ff39058d164b463c23f55c Author: Fridolin Somers Date: Thu Feb 28 13:37:40 2019 +0100 Bug 22422: improve item location display with class "shelvingloc" In record detail page, item location is displayed with CSS using class "shelvingloc". Many many places at intranet and OPAC can use this class. It allows to change display in all places using CSS customisation. This patch removes the CSS "display:block" for class "shelvingloc". Some places where using "inline" to correct the display. I think the display should not be managed in template. So it will be inline by default and it can be changed by custom CSS, on all places or depending on a selctor. Test plan : 1) Compile SCSS to CSS 2) Add to preferences IntranetUserCSS and OPACUserCSS : .shelvingloc { color:red } 3) Go to pages impacted by patch, be sure to look at cart with "more details" 4) You see item location italic and red Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit bc2d9f869ad0bde3e97e3773e0e050503d8083f4) Signed-off-by: Martin Renvoize commit 2084f0e3cb2496b979dbacb70d17aab868d9ee2b Author: Owen Leonard Date: Tue Mar 5 18:22:12 2019 +0000 Bug 21030: Date widget on suspend modal not working correctly This patch makes a change to the suspend hold modal markup in order to allow the datepicker to work properly. To test, apply the patch and locate a patron in the staff client who has holds. - On the checkout or patron detail page, open the holds tab. - Click the "Suspend" button for one of the holds. - In the modal, trigger the date picker and confirm that the dropdowns for selecting month and year work correctly. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c91c1a69a23ff8d826a077c61059953bcc51940b) Signed-off-by: Martin Renvoize commit d558544afd437466f4a0fc342a127610a98ca184 Author: Katrin Fischer Date: Thu Mar 7 03:10:28 2019 +0000 Bug 19046: (QA follow-up) Remove doubled up 'Title as phrase' One search option was doubled up by accident. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ae2caab54f53bd9b7fbe8e5c1575f38e97002bf2) Signed-off-by: Martin Renvoize commit 9a82230b2742c51af63f8156e18324556112b572 Author: Jonathan Druart Date: Mon Mar 4 15:39:29 2019 -0300 Bug 19046: Make seach pulldown to retain index selection This patch also fixes add the term in the search input Test plan: Enable IntranetCatalogSearchPulldown Search for a term using the search input in the header (simple search) Re-do selecting different indices The selection must retain on the search result page. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 74ac15800bbf358e3f1133a1f212400797640112) Signed-off-by: Martin Renvoize commit c0dfab31d96e17642f68e7aeb471023eee8c72a8 Author: Jonathan Druart Date: Mon Mar 4 14:50:36 2019 -0300 Bug 22442: (bug 13618 follow-up) Fix item search CSV export We must not filter assignements statements. Test plan: Export item search result as CSV Without this patch the biblio and biblioitem values are not displayed. With this patch applied everything is displayed correctly Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit bb730c1b05c91ee92db09d117293a0ddb87dace1) Signed-off-by: Martin Renvoize commit 0c8b515fe724c248cae1d6fa696020c5de9957f1 Author: Fridolin Somers Date: Mon Feb 11 09:54:43 2019 +0100 Bug 22303: Correct bottom in virtualshelves/addbybiblionumber.tt In virtualshelves/addbybiblionumber.tt the include intranet-bottom.inc which closes the HTML last tag is not the last line of the template. This patch moved bottom include to last line and uses popup-bottom.inc. Test plan : 1) Permission OK : 1.1) Login in staff interface with user 'Bob' 1.2) Create a new list 'Readme' : category public and allow changes to contents from anyone 1.3) Perform a search 1.4) Check some results 1.5) Click 'Add to list' and on the list 'Readme' 1.6) A popup window opens 1.7) Check its HTML is OK, ending with 2) Permission KO : 2.1) Open a new window (Firefox private session) and login in staff interface with user 'Bill' 2.2) Perform a search 2.3) Check some results 2.4) On session of 'Bob', edit list 'Readme' 2.5) Change : category private and allow changes to contents from owner only 2.6) On session of 'Bill' 2.7) Click 'Add to list' and on the list 'Readme' 2.8) A popup window opens saying 'Sorry, you do not have permission to add items to this list' 2.9) Check its HTML is OK, ending with Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 255af719e65956d84d62ea52fea12619bb851f70) Signed-off-by: Martin Renvoize commit 7d741a69919c17f8c8c6a4c965d93c95c2355793 Author: Ere Maijala Date: Fri Feb 1 13:18:11 2019 +0200 Bug 22246: Fix indexing of large fields with Elasticsearch Deduplicate multivalued fields and make sure sort fields are not excessively long. Also updates default mappings so that sort fields are not created for item fields where it doesn't make sense. Test plan: 1. Reset ES mappings in administration 2. Check that sort is '0' for local-classification in biblio mappings. 3. Change sort back to '1' for local-classification for the next steps. 4. Create a record with 20 items, each with a 100 character long call number 5. Check that when indexed, the record in ES does not have duplicates in any of the item fields and local-classification__sort is truncated to 255 characters. Signed-off-by: Nick Clemens Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit bd68e2f75b2bd0cae7935715f4aa03342809cb9f) Signed-off-by: Martin Renvoize commit a03d8dd1735520614492aab207a392b957e34630 Author: Jonathan Druart Date: Tue Mar 5 14:29:58 2019 -0300 Bug 22416: (bug 22140 follow-up) Remove warnings in Search.t Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit eb7b2907c55d896a7c5b8bccf31daeae8bc5720b) Signed-off-by: Martin Renvoize commit f5d6b6e4e95e1850908fb73b88a36bd6d76b0f5c Author: Jonathan Druart Date: Tue Mar 5 15:16:44 2019 -0300 Bug 22419: Records listed twice when select/unselect all from the cart It fixes a browser timeout when records are removed from the cart. The onchange event already call selRecord. Test plan: Launch a search Add all the result to your cart Open the cart Click "select all" Then remove them all from your cart => Without this patch the action will timeout => With this patch applied the action is immediate Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a0e10d97223ae2945f6ac64b7d86f4ac2fea9e03) Signed-off-by: Martin Renvoize commit 6729f22ff015cd14c2356f44d7f30843a302937e Author: Jonathan Druart Date: Wed Feb 27 09:38:57 2019 -0300 Bug 22275: (bug 15836 follow-up) Fix class_sources.class_split_rule FK creation 18.06.00.060 will fail if custom Classification sources were created. In that case we should use the 'generic' split rule. Test plan: % git checkout -b bug_22395_pre 3a0cba67f1387595f570ab9d9efdeabc856345b4 Reset the DB Go to Home ? Administration ? Classification sources Create a custom "Classification filing rules" Create a custom "Classification sources" using this filing rules % git checkout master % perl installer/data/mysql/updatedatabase.pl => Without this patch you will get: DBD::mysql::db do failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`#sql-33a_67`, CONSTRAINT `class_source_ibfk_2` FOREIGN KEY (`class_split_rule`) REFERENCES `class_split _rules` (`class_split_rule`)) [for Statement " ALTER TABLE class_sources ADD CONSTRAINT class_source_ibfk_2 FOREIGN KEY (class_split_rule) REFERENCES class_split_rules (class_split_rule) "] at installer/data/mysql/updatedatabase.pl line 17104. => With this patch applied the FK will be created successfully class_sources.class_split_rule will be set to "generic" for these custom values. Signed-off-by: Oliver Behnke Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 29bc2b583264a62c29a0f39dd79a5b3a64721ae6) Signed-off-by: Martin Renvoize commit 0e56d43b403c1acb4c9c0ce9427bfa3b33692d8b Author: David Gustafsson Date: Fri Apr 6 11:15:07 2018 +0200 Bug 20535: ModZebra called with $record with items stripped ModZebra called with $record with items stripped in ModBiblioMarc. Remove $record argument to force record to be loaded again from database with items embedded. How to test: 1) Make sure biblios are indexed (with rebuild_elastic_search.pl). 2) Perform a search that will produce a sample result containing at least one biblio with items. 3) Edit and save a biblio with items. 4) Perform the same search again, the updated biblio should now have no items when viewed in the search results (No items). 5) Apply patch. 6) Repeat step 1-3. 7) The updated biblio should now have items when viewed in the search results. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5ebf1a26dae62651d1749a2df2e54ee6d1af148a) Signed-off-by: Martin Renvoize commit d7988f672f68e0cc875eedce6bad0b634df8941c Author: Julian Maurice Date: Wed Mar 6 08:58:03 2019 +0100 Bug 16251: Fix value of material select for Rancor 008 widget The material type is selected in accordance with the leader (06-07) Test plan: 1. Create a new record using the advanced editor 2. Set the leader 6th position to 'c' 3. Save the record and reload the page 4. 'Music' should be automatically selected for 008 5. Try other values for the leader 6th and 7th positions See comment 0 of this bug for the complete mapping Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 926d7c4ba11ad6cd768c884ec4b2dc71d864b64c) Signed-off-by: Martin Renvoize commit f688c463fd4cee3c6a894d583437b198060265e4 Author: Jonathan Druart Date: Wed Mar 6 11:59:58 2019 -0300 Bug 22466: Replace existing occurrences Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9ff997eda7582dbb68d599ab1436b162dd1559da) Signed-off-by: Martin Renvoize commit b102d73fa51c1dabc46b03b2ad873db9e9b7ca42 Author: Jonathan Druart Date: Wed Mar 6 11:59:55 2019 -0300 Bug 22466: Do not ask for TT methods to be filtered Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 158b3c3a4cfc8a97cc98a3473ca70395fdb398e1) Signed-off-by: Martin Renvoize commit 4ca973f55d7eed71b4f0afad3b46ed95fec5ce13 Author: Jonathan Druart Date: Wed Mar 6 11:59:35 2019 -0300 Bug 22466: Add tests Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit c7ef8e6b2db5830745759ad15fe9d6379f6f62b2) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 2 +- Koha/SearchEngine/Elasticsearch.pm | 21 ++- admin/searchengine/elasticsearch/mappings.yaml | 54 +++--- catalogue/search.pl | 8 + install-CPAN.pl | 45 ----- installer/data/mysql/updatedatabase.pl | 7 + .../intranet-tmpl/lib/koha/cateditor/widget.js | 7 + .../intranet-tmpl/prog/css/src/staff-global.scss | 1 - koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/cat-search.inc | 2 +- .../en/includes/catalogue/itemsearch_item.csv.inc | 4 +- .../prog/en/includes/cateditor-widgets-marc21.inc | 26 ++- .../prog/en/includes/search_indexes.inc | 198 ++++++++++++++++---- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 5 +- .../prog/en/modules/catalogue/detail.tt | 5 +- .../prog/en/modules/catalogue/results.tt | 6 +- .../prog/en/modules/cataloguing/addbooks.tt | 6 +- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/reserve/request.tt | 16 +- .../prog/en/modules/serials/serials-search.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/list.tt | 3 +- .../en/modules/virtualshelves/addbybiblionumber.tt | 3 +- .../prog/en/modules/virtualshelves/shelves.tt | 4 +- koha-tmpl/intranet-tmpl/prog/js/cart.js | 2 - koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 1 - .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- t/Koha/SearchEngine/Elasticsearch.t | 36 +++- t/db_dependent/Search.t | 2 + t/lib/QA/TemplateFilters.pm | 7 + t/template_filters.t | 19 +- 39 files changed, 360 insertions(+), 162 deletions(-) delete mode 100644 install-CPAN.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 13 17:52:19 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Mar 2019 16:52:19 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-42-g126d7bc Message-ID: 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, 18.05.x has been updated via 126d7bcbe183c8de98fc6c59cb15874430a38c3e (commit) from 8126fe6d122140e40053ed74768148952fe30303 (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 126d7bcbe183c8de98fc6c59cb15874430a38c3e Author: Jose-Mario Monteiro-Santos Date: Thu Jan 17 16:41:58 2019 -0500 Bug 18723: Change dot into comma This fixes the regression that multiplies the amount entered by 100 when CurrencyFormat is set to FR. It replaces the last dot with a comma before dealing with the value of ActualCost and ReplacementCost. Test Plan: a)Replicate the issue: 0- Set CurrencyFormat to FR 1- Go to Acquisitions 2- Search for a Vendor 3- Click on "New basket" 4- Give basket a name and click "Save" 5- Click on "Add to basket" 6- Add an order through preferred method 7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44) 8- Save your order line 9- Click on "Close this basket" 10- Confirm closing of basket by clicking on "Yes, close" 11- Click on "Receive shipment" 12- Enter an invoice number and click "Next" 13- Click on "Receive" to the right of your order 14- In Accounting details, notice the Actual cost is written with a decimal dot. 15- Change the Actual cost, using a dot decimal (i.e 20.99) 16- Receive the order 17- Click on "Save" 18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00) 19- Click on "Cancel receipt" 20- Click on "Receive" to the right of your order 21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99) 22- Receive the order 23- Click on "Save" 24- In "Already received", notice the price is correct. b)Apply the patch c)Test the patch: 1- Click on "Cancel receipt" 2- Click on "Receive to the right of your order 3- Change the Actual cost/Replacement cost, using a dot decimal (21.99) 4- Receive the order 5- Click on "Save" 6- Notice that the Actual cost and the Replacement cost use commas 7- Change the Actual cost, using a comma decimal (21,99) 8- Click on "Save" 9- In "Already received", notice the price is still correct. Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c7f47ea36a8992356c6c055a22891ea168cbdc9c) Signed-off-by: Martin Renvoize (cherry picked from commit bf7524f0b1cebb68584eebf2d3acaec44126355d) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: acqui/finishreceive.pl | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 13 18:04:55 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Mar 2019 17:04:55 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.16-5-g73891af Message-ID: 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, 17.11.x has been updated via 73891afe8da686ecdbf5c06a9eece21d9e1c7d2e (commit) from 838875f67c0ce6e60d38ddfaff801eff852bb2d3 (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 73891afe8da686ecdbf5c06a9eece21d9e1c7d2e Author: Jose-Mario Monteiro-Santos Date: Thu Jan 17 16:41:58 2019 -0500 Bug 18723: Change dot into comma This fixes the regression that multiplies the amount entered by 100 when CurrencyFormat is set to FR. It replaces the last dot with a comma before dealing with the value of ActualCost and ReplacementCost. Test Plan: a)Replicate the issue: 0- Set CurrencyFormat to FR 1- Go to Acquisitions 2- Search for a Vendor 3- Click on "New basket" 4- Give basket a name and click "Save" 5- Click on "Add to basket" 6- Add an order through preferred method 7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44) 8- Save your order line 9- Click on "Close this basket" 10- Confirm closing of basket by clicking on "Yes, close" 11- Click on "Receive shipment" 12- Enter an invoice number and click "Next" 13- Click on "Receive" to the right of your order 14- In Accounting details, notice the Actual cost is written with a decimal dot. 15- Change the Actual cost, using a dot decimal (i.e 20.99) 16- Receive the order 17- Click on "Save" 18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00) 19- Click on "Cancel receipt" 20- Click on "Receive" to the right of your order 21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99) 22- Receive the order 23- Click on "Save" 24- In "Already received", notice the price is correct. b)Apply the patch c)Test the patch: 1- Click on "Cancel receipt" 2- Click on "Receive to the right of your order 3- Change the Actual cost/Replacement cost, using a dot decimal (21.99) 4- Receive the order 5- Click on "Save" 6- Notice that the Actual cost and the Replacement cost use commas 7- Change the Actual cost, using a comma decimal (21,99) 8- Click on "Save" 9- In "Already received", notice the price is still correct. Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c7f47ea36a8992356c6c055a22891ea168cbdc9c) Signed-off-by: Martin Renvoize (cherry picked from commit bf7524f0b1cebb68584eebf2d3acaec44126355d) Signed-off-by: Lucas Gass (cherry picked from commit 126d7bcbe183c8de98fc6c59cb15874430a38c3e) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/finishreceive.pl | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 14 00:48:52 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Mar 2019 23:48:52 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-43-g4b04265 Message-ID: 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, 18.05.x has been updated via 4b04265188f32033d8c07774d547044aff2d1921 (commit) from 126d7bcbe183c8de98fc6c59cb15874430a38c3e (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 4b04265188f32033d8c07774d547044aff2d1921 Author: Josef Moravec Date: Mon Feb 25 08:46:11 2019 +0000 Bug 22404: Fix parameter "for" of labels in subscription add form Attribute "for" of tag labelshould contain input id, not name. Test plan: 1) Go to serials -> add subscription second step 2) Click on labels of these three fields: - First issue publication date - Subscription start date - Subscription end date --> without patch, nothing happen --> with path, the datepicker is shown Signed-off-by: S?verine QUEUNE Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit d6d91ac32fdd6c8f3e5fad19a29a943044ec0214) Signed-off-by: Martin Renvoize (cherry picked from commit 3641741fa6455e10823090a1e6ca3484c20e1bd1) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/serials/subscription-add.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 14:03:34 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 13:03:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-786-g0c4bf00 Message-ID: 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 0c4bf00c30ce25165a5243bced7b7e19746a7e0b (commit) via 08ea70c109ce3432b5dd1a781d126c7353fca3da (commit) via 2be9fd23d2e9aa91e2e1f38a2817a54a5cdc5d21 (commit) via 3e7620cf46d2e7079ff5494070ff6933fb9650af (commit) via 3d462af21f3c13312b0ffb8496e55d277f703ebd (commit) via 180781f4748d689674a9f91f546d8e76324e7291 (commit) via d7c0547bd20bd266ea8cd023ac4be22c2a9644d0 (commit) via fa4aeaa87e957298874263ec7c3f8478fcaf8b49 (commit) via 293eee9959925397e4fdc84ae0d4baea2cf7d94c (commit) via 04f1b0ca950a5a133f6afe6785787d1982414a1e (commit) via 865f9a165d5d5e025737324843eccb5c39a74efb (commit) via 6c86de628d5873b88a7d6d2d676ecd7b98345aa7 (commit) via 1464328718619a673f233406fdb238f0391b0785 (commit) via 5c41d584cb654efbfd8c854bac0d30d87a054ab5 (commit) via afb39b132b10b74efec31cd8191cdcd72a61d8d3 (commit) via ed5b7e4575917f07a3e895be754abc2bacc37337 (commit) via d48ae4adafbcb1700ac718c45d78957eb2db3b2e (commit) via a8c473c69160634fb18c0dc9de3b72a011ccd719 (commit) via 004609e46814791fac540e1c8bfb21f647758143 (commit) via bc24973c778ce77f1d3726eaad3ce1bc387cd480 (commit) via 467c24cb9da02deb00bf49333351a0843cdeda10 (commit) via 9f5a1bc7ebbe3954607da88b87bab6e9c2689dad (commit) via 7b4ee00a580807b6021758a790fec23c743719d2 (commit) via 1934ca1100517ca1622c9c2c0587832504064b25 (commit) via 9682cc7d21645a673bd274b24aeab323f61f28aa (commit) via 639ad97d844f2774f49881174b559293edd6baa4 (commit) via 99ea714345a6278d68e2abb0d182d8b495cf2950 (commit) via ffb40290f88380418635a951dbb0788bf7b7e3ce (commit) via 5d4f80feac811a9d6e177975b50c57ba85e3434d (commit) via 28edd8848320fd0f0f284245f2f0567a5907619a (commit) via 3bd900496690375b2b711743ffaa57371388f687 (commit) via 2596e9b795d9e65e4f68a72bb587d323c97bad92 (commit) via deb968ea45276e56826b592026617a96398b61da (commit) via 19aebacf7c6162e5628cba1078b2c0f2ec9751a6 (commit) via 3c4232e746cef574de9d1a346be7704dc3cd2e33 (commit) from 585273b6147d0cda646296a5121e7a3af021473c (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 0c4bf00c30ce25165a5243bced7b7e19746a7e0b Author: Fridolin Somers Date: Fri May 25 16:51:15 2018 +0200 Bug 20823: UNIMARC XSLT add subfield t for subjects In UNIMARC, 604 contains subfield t, see http://multimedia.bnf.fr/unimarcb_trad/B604-6-2011.pdf. Actual XSLT files use template tag_subject for 604, it does not use t subfield. This patch adds subfield t to tag_subject and tag_onesubject templates in intranet and OPAC XSLT files. Test plan : 1) In UNIMARC catalog edit a biblio record to add 604$t 2) Use default XSLT files in sysprefs 2) Go to catalogue details page of this record using default XSLT files 3) Check $t is displayed at OPAC and intranet Signed-off-by: S?verine QUEUNE Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 08ea70c109ce3432b5dd1a781d126c7353fca3da Author: Jonathan Druart Date: Mon Mar 4 16:57:26 2019 -0300 Bug 22219: Remove duplicated items in inventory (when skipping waiting holds) Test plan: 0/ Do not apply this patch 1/ Place several holds on a given item 2/ Use the inventory with the "skip waiting holds" option to list this item. It will be displayed several times 3/ Apply this patch and confirm that the item is now only displayed once Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 2be9fd23d2e9aa91e2e1f38a2817a54a5cdc5d21 Author: Jonathan Druart Date: Mon Mar 4 16:52:30 2019 -0300 Bug 22219: Add tests Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3e7620cf46d2e7079ff5494070ff6933fb9650af Author: Owen Leonard Date: Thu Mar 7 17:28:34 2019 +0000 Bug 22477: Missing DataTables configuration when searching patrons for holds This patch adds columns configuration to the holds request page to fix a JavaScript error in the console and to allow the patron search results table to be enabled as a DataTable. To reproduce: Place a hold on a title in the staff client. When prompted for a patron, perform a search which will return multiple results. The patron search results will appear in an unsortable table. A JS error can be seen in the browser console. To test, apply the patch and repeat the steps above. The patron search results table should be sortable and there should be no JS error. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3d462af21f3c13312b0ffb8496e55d277f703ebd Author: Nick Clemens Date: Fri Mar 15 12:32:49 2019 +0000 Bug 21846: DBRev 18.12.00.025 Signed-off-by: Nick Clemens commit 180781f4748d689674a9f91f546d8e76324e7291 Author: Jonathan Druart Date: Tue Feb 26 17:01:41 2019 -0300 Bug 21846: Simplify ugly double for loops Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d7c0547bd20bd266ea8cd023ac4be22c2a9644d0 Author: Jonathan Druart Date: Tue Feb 26 16:32:44 2019 -0300 Bug 21846: Fix pod2usage return values According to existing pattern. However I am not sure it makes sense to return an errno (and print to STDERR) if --help is passed. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fa4aeaa87e957298874263ec7c3f8478fcaf8b49 Author: Tomas Cohen Arazi Date: Tue Feb 26 15:41:02 2019 -0300 Bug 21846: (QA follow-up) Fix maintenance script path Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 293eee9959925397e4fdc84ae0d4baea2cf7d94c Author: Tomas Cohen Arazi Date: Tue Jan 8 13:13:46 2019 -0300 Bug 21846: (follow-up) Add maintenance script This patch adds a maintenance script that generates the missing tags_approval entries based on the tags_all table, and then recalculates the weights for both tags_approval and tags_index tables. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 04f1b0ca950a5a133f6afe6785787d1982414a1e Author: Tomas Cohen Arazi Date: Fri Nov 23 16:47:05 2018 -0300 Bug 21846: Make 'term' use utf8mb_bin collation on tags tables This patch makes the utf8mb4_bin collation preferred for comparing tags. Otherwise suppolemental unicode characters all match. To test: - Enable tags and disable moderation (or plan to moderate and accept tags) - Tag 3 records: a - with ? b - with ? c - with ? - Note the weight on each says '3' - Click the tag to search, you get back all the records - Apply the previous patches from this bug report - Run: $ kshell k$ prove t/db_dependent/Tags.t => FAIL: Tests fail, related to counting stuffs - Apply this patch and (a) Run updatedatabase to upgrade the schema - Run: k$ prove t/db_dependent/Tags.t => SUCCESS: Tests pass! (b) reset_all to get a fresh DB using kohastructure.sql - Run: k$ prove t/db_dependent/Tags.t => SUCCESS: Tests pass too! - Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 865f9a165d5d5e025737324843eccb5c39a74efb Author: Tomas Cohen Arazi Date: Fri Nov 23 15:30:52 2018 -0300 Bug 21846: Regression tests for add_tag_approval Due to collation issues, add_tag_approval wrongly calculates the weight for strings including extended UNICODE characters. This patch introduces a test for this situation. To test: - Apply this patch on master - Run: $ kshell k$ prove t/db_dependent/Tags.t => FAIL: Tests fail because all extended characters match the same Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 6c86de628d5873b88a7d6d2d676ecd7b98345aa7 Author: Tomas Cohen Arazi Date: Fri Nov 23 15:44:04 2018 -0300 Bug 21846: Add Koha::Tags::Approval(s) and Koha::Tags::Index(es) In order to avoid writing the tests using plain DBIC which would later need to be replaced by a Koha::Object-based counterpart, I introduce this stub classes. Stub tests are added as well. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Koha/Tags.t \ t/db_dependent/Koha/Tags/Approvals.t \ t/db_dependent/Koha/Tags/Indexes.t => SUCCESS: Tests pass - Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1464328718619a673f233406fdb238f0391b0785 Author: Nick Clemens Date: Fri Mar 15 12:22:32 2019 +0000 Bug 21987: (RM follow-up) Add text for simple tests Signed-off-by: Nick Clemens commit 5c41d584cb654efbfd8c854bac0d30d87a054ab5 Author: Jonathan Druart Date: Tue Dec 18 14:02:19 2018 -0300 Bug 21987: Do not generate true color thumbnails if not needed If the original image is not a true color image we should not generate a true color thumbnail. Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit afb39b132b10b74efec31cd8191cdcd72a61d8d3 Author: Jonathan Druart Date: Tue Dec 18 14:02:14 2018 -0300 Bug 21987: Add tests Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ed5b7e4575917f07a3e895be754abc2bacc37337 Author: Nick Clemens Date: Mon Mar 11 14:47:01 2019 +0000 Bug 22493: Clean up DecreaseLoanHighHolds.t To test: 1 - prove -v t/db_dependent/DecreaseLoanHighHolds.t 2 - should pass 3 - read code, confirm changes make sense Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d48ae4adafbcb1700ac718c45d78957eb2db3b2e Author: Josef Moravec Date: Fri Mar 15 09:41:22 2019 +0000 Bug 14591: (QA follow-up) Fix AddReturn call in Circulation/issue.t Test plan: prove t/db_dependent/Circulation/issue.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a8c473c69160634fb18c0dc9de3b72a011ccd719 Author: Martin Renvoize Date: Thu Mar 14 16:30:55 2019 +0000 Bug 14591: (QA follow-up) Optimize DateTime passing We were passing around possibly undefined $return_date variables from AddReturn and then instantiating a new DateTime object as a default for each routine. This followup sets the default higher up the stack within AddReturn which provider clearer logic and a small performance improvment. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 004609e46814791fac540e1c8bfb21f647758143 Author: Kyle M Hall Date: Thu Mar 14 08:20:53 2019 -0400 Bug 14591: Update unit tests Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit bc24973c778ce77f1d3726eaad3ce1bc387cd480 Author: Kyle M Hall Date: Thu Mar 14 07:58:09 2019 -0400 Bug 14591: Update other calls to AddReturn Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 467c24cb9da02deb00bf49333351a0843cdeda10 Author: Kyle M Hall Date: Thu Mar 14 07:54:09 2019 -0400 Bug 14591: book drop / drop box mode incorrectly decrements accrued overdue fines Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 9f5a1bc7ebbe3954607da88b87bab6e9c2689dad Author: Kyle M Hall Date: Thu Feb 28 16:13:11 2019 -0500 Bug 22043: (QA follow-up) Add parameter to control behavior Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 7b4ee00a580807b6021758a790fec23c743719d2 Author: Kyle M Hall Date: Fri Dec 21 13:54:18 2018 -0500 Bug 22043: SIP Checkin Response alert flag set to often set to Y incorrectly If a checkin has any messages at all, even informational like LocalUse, the alert flag ( 4th character of the response ) will be set to Y, even if we do not prove a corresponding alert code in the CV field. We should only set the alert flag if we are going to send a value in the CV field.If a checkin has any messages at all, even informational like LocalUse, the alert flag ( 4th character of the response ) will be set to Y, even if we do not prove a corresponding alert code in the CV field. We should only set the alert flag if we are going to send a value in the CV field. Test Plan: 1) Set the checked_in_ok sip account flag to 1 for an account 2) Check in an already checked in item via SIP 3) Note the alert flag is set to Y 4) Apply this patch 5) Restart SIP 6) Check the item in again 7) Note the alert flag is set to N Signed-off-by: Kyle M Hall Signed-off-by: Jill Kleven Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 1934ca1100517ca1622c9c2c0587832504064b25 Author: Josef Moravec Date: Tue Feb 26 15:05:50 2019 +0000 Bug 22222: Don't send empty params to mana service Test plan: 0) Do not apply the patch 1) Go to serials > Search on Mana 2) Insert some value into the form 3) Submit -> you get many (3000+) results 4) Apply the patch and restart_all 5) Repeat, now, you get only the subscription matching your query Signed-off-by: Michal Denar Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit 9682cc7d21645a673bd274b24aeab323f61f28aa Author: Nick Clemens Date: Thu Mar 7 16:49:11 2019 +0000 Bug 22476: Correct default for MarkLostItemsAsReturned Signed-off-by: Bin Wen Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 639ad97d844f2774f49881174b559293edd6baa4 Author: Fridolin Somers Date: Tue Mar 5 15:51:15 2019 +0100 Bug 21560: (follow-up) move use at the top Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 99ea714345a6278d68e2abb0d182d8b495cf2950 Author: Fridolin Somers Date: Tue Feb 19 12:01:16 2019 +0100 Bug 21560: Unit test for Koha::Util::OpenDocument Run prove t/Koha/Util/OpenDocument.t Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ffb40290f88380418635a951dbb0788bf7b7e3ce Author: Fridolin Somers Date: Mon Feb 18 17:33:37 2019 +0100 Bug 21560: create Koha::Util::OpenDocument with subroutine for ODS generation There is nearly the same code in misc/cronjobs/gather_print_notices.pl and reports/guided_reports.pl. This patch creates a new module with subroutine called by both scripts. If file path or content is undefined, subroutine will just return undef. If content is an empty arrayref, empty ods file is still generated. Unicode encoding is kept outisde because it may not be necessary. Note that for print notices the first line of message is always the column names so it is extracted only from first message. Test plan : Run previous patches test plans and check ODS files are the same. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 5d4f80feac811a9d6e177975b50c57ba85e3434d Author: Fridolin Somers Date: Fri Dec 7 10:30:30 2018 +0100 Bug 21560: Optimize ODS export of gather_print_notices.pl Like previous patch, the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan inspired from Bug 11679. Test plan: - define your ODUE notice for the print template as: cardnumber:patron:email:item <>:<> <>:<>:<> - define overdues rules for a patron category - check-out 2 items using a due date in order to generate the overdue notices - check-in these 2 items - launch the script /misc/cronjobs/overdue_notices.pl - the 'message_queue' table should now contain 2 new entries - launch the gather_print_notices cronjob : perl misc/cronjobs/gather_print_notices.pl /tmp/test --ods --letter_code=OVERDUE -d=: - A ods file should be generated in your /tmp/test directory - Compare times with and without patch Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 28edd8848320fd0f0f284245f2f0567a5907619a Author: Fridolin Somers Date: Fri Oct 12 14:09:54 2018 +0200 Bug 21560: report ODS export optimization SQL reports can be exported with CSV, TSV of ODS format. When report has thousands of rows, using ODS format is around 10 times longer than other formats. It also loads CPU and RAM a lot. The longest call is expandTable(). I found that the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan : 1) Don't apply patch yet 2) Create a new SQL report : Home > Reports > Create from SQL 3) Enter a SQL that will return thousands of results 4) Run report 5) Click Download > Semicolon separated text (.csv), look execution time 6) Click Download > Open Document Spreadsheet, look execution time 7) Apply patch 8) Redo 5) and 6) and compare times, CSV export should be the same but ODS export should be better My tests shows 1,5 seconds for CSV export. And for ODS export : 18 seconds without patch and 8 seconds with patch. Signed-off-by: David Nind Signed-off-by: Chris Cormack Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3bd900496690375b2b711743ffaa57371388f687 Author: David Cook Date: Mon Mar 4 17:43:29 2019 +1100 Bug 22429: Infinite loop in patron card printing Text fields in Patron Card Text Layouts can contain regular expression metacharacters, which - instead of being treated as literal values - are interpreted and prevent line wrapping. This causes the process to get stuck in an infinite loop, which keeps running even after the web server has timed out (at least when using CGI). This patch escapes the relevant input from the text field so the regular expression substitution treats characters as literals instead of as metacharacters. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 2596e9b795d9e65e4f68a72bb587d323c97bad92 Author: Owen Leonard Date: Wed Jan 30 17:13:35 2019 +0000 Bug 22237: Subscriptions are not linked to Mana upon edit This patch modifies C4/Serials.pm so that during the process of editing a subscription a link to Mana can be created. To test, apply the patch and go to Serials. - Locate a subscription which was not created using Mana data but which can be found in Mana. - Edit the subscription, skipping to the second page. - View the results returned by Mana and select one. - Save the subscription. - Upon being redirected to the subscription detail page you should see a "Report mistake" button. This shows that the subscription has been linked to Mana successfully. Signed-off-by: Josef Moravec Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit deb968ea45276e56826b592026617a96398b61da Author: Nick Clemens Date: Fri Feb 8 20:24:05 2019 +0000 Bug 22296: Add Invoice Adjustments to GetBudgetHierarchy To test: 1 - prove -v t/db_dependent/Budgets.t 2 - Create some invoices on a single budget Invoice 1: add a non-encumbered adjustment for 1 add an encumbered adjustment 2 leave open Invoice 2: add a non-encumbered adjustment for 4 add an encumbered adjustment for 8 3 - View acq home page, should see 2 order and 12 spent for the budget 4 - View the spent and ordered pages, they should show the correct amounts 5 - Add more orders etc and confirm things total correctly https://bugs.koha-community.org/show_bug.cgi?id=22296 Signed-off-by: Janet McGowan Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 19aebacf7c6162e5628cba1078b2c0f2ec9751a6 Author: Nick Clemens Date: Tue Mar 12 13:15:34 2019 +0000 Bug 22498: Rename variable for budgets loop for invoice adjustments To test: 1 - Try to add some adjustments to an invoice (receive shipments, create invoice, click 'finish receiving') 2 - Note the fund dropdown has only 'No fund' 3 - Apply patch 4 - Refresh page 5 - Note you can now select funds, hooray! Signed-off-by: Janet McGowan Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3c4232e746cef574de9d1a346be7704dc3cd2e33 Author: Martin Renvoize Date: Tue Mar 12 17:29:38 2019 +0000 Bug 22489: Update onboarding tool for bug 18925 When going through the onboarding process, the tool fails on submit of step 5, due to changes made in the database structure and rule definitions by bug 18925. This patch fixes this, adding code that creates a circulation rule where an issuing rule is also created in onboarding.pl. It removes maxissueqty from being sent with params to make an issuing rule, and adds it instead to the params to make a circulation rule, to reflect the changes that have been made in the database. Test plan: 1) Drop and recreate your database 2) Reload the staff client and follow the installer and onboarding process 3) Confirm that the process finishes without errors Signed-off-by: Martin Renvoize Signed-off-by: Liz Rea Bug 22489: (follow-up) Correctly set success messages The original patch was duplicating the success message upon successful circ rule insertion. This corrects that. Signed-off-by: Martin Renvoize Signed-off-by: Liz Rea Signed-off-by: Jonathan Druart Patches squashed for readability Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Budgets.pm | 24 +++- C4/Circulation.pm | 78 +++------- C4/Images.pm | 4 +- C4/Items.pm | 4 +- C4/Patroncards/Patroncard.pm | 3 +- C4/SIP/ILS.pm | 4 +- C4/SIP/ILS/Transaction/Checkin.pm | 13 +- C4/SIP/Sip/MsgType.pm | 2 +- C4/Serials.pm | 6 +- Koha.pm | 2 +- Koha/Checkouts.pm | 21 ++- Koha/SharedContent.pm | 4 +- Koha/{Acquisition/Fund.pm => Tag.pm} | 10 +- Koha/{ApiKeys.pm => Tags.pm} | 13 +- Koha/{Acquisition/Budget.pm => Tags/Approval.pm} | 10 +- Koha/{ApiKeys.pm => Tags/Approvals.pm} | 13 +- Koha/{Acquisition/Fund.pm => Tags/Index.pm} | 10 +- Koha/{ApiKeys.pm => Tags/Indexes.pm} | 13 +- Koha/Util/OpenDocument.pm | 95 +++++++++++++ circ/returns.pl | 32 +++-- etc/SIPconfig.xml | 1 + installer/data/mysql/kohastructure.sql | 6 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 29 ++++ installer/onboarding.pl | 27 +++- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 16 +-- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/reserve/request.tt | 2 + .../prog/en/xslt/UNIMARCslimUtils.xsl | 2 +- .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 2 +- misc/cronjobs/gather_print_notices.pl | 66 +++------ misc/maintenance/fix_tags_weight.pl | 137 ++++++++++++++++++ reports/guided_reports.pl | 51 +++---- .../Koha/Util/OpenDocument.t | 53 ++++--- t/db_dependent/Budgets.t | 46 ++++-- t/db_dependent/Circulation.t | 43 ++---- t/db_dependent/Circulation/StoreLastBorrower.t | 10 +- t/db_dependent/Circulation/issue.t | 2 +- t/db_dependent/DecreaseLoanHighHolds.t | 41 +++--- t/db_dependent/Images.t | 39 +++++ t/db_dependent/Items/GetItemsForInventory.t | 19 ++- t/db_dependent/Koha/Patrons.t | 10 +- t/db_dependent/Koha/SharedContent.t | 2 +- .../{Template/Plugin/To.t => Koha/Tags.t} | 36 +++-- .../Plugin/To.t => Koha/Tags/Approvals.t} | 36 +++-- .../{Template/Plugin/To.t => Koha/Tags/Indexes.t} | 36 +++-- t/db_dependent/SIP/Message.t | 21 ++- t/db_dependent/Tags.t | 149 ++++++++++++++++++-- 48 files changed, 847 insertions(+), 400 deletions(-) copy Koha/{Acquisition/Fund.pm => Tag.pm} (88%) copy Koha/{ApiKeys.pm => Tags.pm} (83%) copy Koha/{Acquisition/Budget.pm => Tags/Approval.pm} (86%) copy Koha/{ApiKeys.pm => Tags/Approvals.pm} (83%) copy Koha/{Acquisition/Fund.pm => Tags/Index.pm} (87%) copy Koha/{ApiKeys.pm => Tags/Indexes.pm} (83%) create mode 100644 Koha/Util/OpenDocument.pm create mode 100755 misc/maintenance/fix_tags_weight.pl copy cataloguing/value_builder/marc21_orgcode.pl => t/Koha/Util/OpenDocument.t (50%) mode change 100755 => 100644 create mode 100644 t/db_dependent/Images.t copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags.t} (61%) copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags/Approvals.t} (60%) copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags/Indexes.t} (61%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 14:51:09 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 13:51:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-787-g6757591 Message-ID: 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 6757591297a148744ca714502271a11ee4b737e6 (commit) from 0c4bf00c30ce25165a5243bced7b7e19746a7e0b (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 6757591297a148744ca714502271a11ee4b737e6 Author: Nick Clemens Date: Fri Mar 15 13:33:11 2019 +0000 Bug 21846: Update Schema Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/TagAll.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 15:53:29 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 14:53:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-788-ga13dff4 Message-ID: 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 a13dff4b88b0c4efc66a05fa33870d81291da9db (commit) from 6757591297a148744ca714502271a11ee4b737e6 (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 a13dff4b88b0c4efc66a05fa33870d81291da9db Author: Kyle M Hall Date: Fri Mar 15 10:32:14 2019 -0400 Bug 14591: (QA follow-up) Fix call to AddReturn for SIP Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/SIP/ILS/Transaction/Checkin.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 18:06:10 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 17:06:10 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-44-g5f858a9 Message-ID: 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, 18.05.x has been updated via 5f858a9746c3210dacc7a3546409ef619379e854 (commit) from 4b04265188f32033d8c07774d547044aff2d1921 (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 5f858a9746c3210dacc7a3546409ef619379e854 Author: Julian Maurice Date: Wed Mar 6 08:58:03 2019 +0100 Bug 16251: Fix value of material select for Rancor 008 widget The material type is selected in accordance with the leader (06-07) Test plan: 1. Create a new record using the advanced editor 2. Set the leader 6th position to 'c' 3. Save the record and reload the page 4. 'Music' should be automatically selected for 008 5. Try other values for the leader 6th and 7th positions See comment 0 of this bug for the complete mapping Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 926d7c4ba11ad6cd768c884ec4b2dc71d864b64c) Signed-off-by: Martin Renvoize (cherry picked from commit d7988f672f68e0cc875eedce6bad0b634df8941c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/lib/koha/cateditor/widget.js | 7 ++++++ .../prog/en/includes/cateditor-widgets-marc21.inc | 26 +++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 18:26:51 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 17:26:51 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-45-gba0b642 Message-ID: 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, 18.05.x has been updated via ba0b642cc5f318c9d23e0e22b494adfdb9a45a03 (commit) from 5f858a9746c3210dacc7a3546409ef619379e854 (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 ba0b642cc5f318c9d23e0e22b494adfdb9a45a03 Author: Jonathan Druart Date: Tue Mar 5 15:16:44 2019 -0300 Bug 22419: Records listed twice when select/unselect all from the cart It fixes a browser timeout when records are removed from the cart. The onchange event already call selRecord. Test plan: Launch a search Add all the result to your cart Open the cart Click "select all" Then remove them all from your cart => Without this patch the action will timeout => With this patch applied the action is immediate Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a0e10d97223ae2945f6ac64b7d86f4ac2fea9e03) Signed-off-by: Martin Renvoize (cherry picked from commit f5d6b6e4e95e1850908fb73b88a36bd6d76b0f5c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/cart.js | 2 -- 1 file changed, 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 18:40:48 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 17:40:48 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-46-g766b862 Message-ID: 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, 18.05.x has been updated via 766b8626c384edb174343952a864ceceb3a844da (commit) from ba0b642cc5f318c9d23e0e22b494adfdb9a45a03 (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 766b8626c384edb174343952a864ceceb3a844da Author: Fridolin Somers Date: Mon Feb 11 09:54:43 2019 +0100 Bug 22303: Correct bottom in virtualshelves/addbybiblionumber.tt In virtualshelves/addbybiblionumber.tt the include intranet-bottom.inc which closes the HTML last tag is not the last line of the template. This patch moved bottom include to last line and uses popup-bottom.inc. Test plan : 1) Permission OK : 1.1) Login in staff interface with user 'Bob' 1.2) Create a new list 'Readme' : category public and allow changes to contents from anyone 1.3) Perform a search 1.4) Check some results 1.5) Click 'Add to list' and on the list 'Readme' 1.6) A popup window opens 1.7) Check its HTML is OK, ending with 2) Permission KO : 2.1) Open a new window (Firefox private session) and login in staff interface with user 'Bill' 2.2) Perform a search 2.3) Check some results 2.4) On session of 'Bob', edit list 'Readme' 2.5) Change : category private and allow changes to contents from owner only 2.6) On session of 'Bill' 2.7) Click 'Add to list' and on the list 'Readme' 2.8) A popup window opens saying 'Sorry, you do not have permission to add items to this list' 2.9) Check its HTML is OK, ending with Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 255af719e65956d84d62ea52fea12619bb851f70) Signed-off-by: Martin Renvoize (cherry picked from commit 0c8b515fe724c248cae1d6fa696020c5de9957f1) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/virtualshelves/addbybiblionumber.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 18:48:04 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 17:48:04 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-47-g1187faf Message-ID: 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, 18.05.x has been updated via 1187faffa103152203a1e60558e72e914bcfa3ec (commit) from 766b8626c384edb174343952a864ceceb3a844da (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 1187faffa103152203a1e60558e72e914bcfa3ec Author: Jonathan Druart Date: Mon Mar 4 15:39:29 2019 -0300 Bug 19046: Make seach pulldown to retain index selection This patch also fixes add the term in the search input Test plan: Enable IntranetCatalogSearchPulldown Search for a term using the search input in the header (simple search) Re-do selecting different indices The selection must retain on the search result page. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 74ac15800bbf358e3f1133a1f212400797640112) Signed-off-by: Martin Renvoize (cherry picked from commit 9a82230b2742c51af63f8156e18324556112b572) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: catalogue/search.pl | 8 + .../intranet-tmpl/prog/en/includes/cat-search.inc | 2 +- .../prog/en/includes/search_indexes.inc | 203 ++++++++++++++++---- 3 files changed, 179 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 18:49:56 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 17:49:56 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-48-g13db1ec Message-ID: 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, 18.05.x has been updated via 13db1eca9d04935f348968c7039d3dd3c2b3c004 (commit) from 1187faffa103152203a1e60558e72e914bcfa3ec (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 13db1eca9d04935f348968c7039d3dd3c2b3c004 Author: Katrin Fischer Date: Thu Mar 7 03:10:28 2019 +0000 Bug 19046: (QA follow-up) Remove doubled up 'Title as phrase' One search option was doubled up by accident. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ae2caab54f53bd9b7fbe8e5c1575f38e97002bf2) Signed-off-by: Martin Renvoize (cherry picked from commit d558544afd437466f4a0fc342a127610a98ca184) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc | 5 ----- 1 file changed, 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 21:13:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 20:13:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-819-gb5a742c Message-ID: 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 b5a742c62f016969dabad9b786a7fe2d75cca760 (commit) via ef231b41119237952ce8a445c953c3957c987734 (commit) via 9ceb745fb2f9c226ffab40a32137c8d43d10ad74 (commit) via 3a7332c742467af3af0c728a3d9c21db00fb4666 (commit) via 57cfc3bab7d76c3a382f8111f5d5c9490eb2eb91 (commit) via 6ebcc255d3def898c491333bc8702c56b09e4537 (commit) via 1db9598e81abf009b80aa44699061e845c9e87e0 (commit) via 6067d2d49f790ab9ffead1381c571c14b0ba43ff (commit) via bcc150a9c05c1de4fe2fc5e07a5469f90d48953c (commit) via 51a887a81d75c5ae561c17143ae9f70651449f04 (commit) via 41f394f4eedc152627080c0b4a89630034706121 (commit) via f6b3d9979dc996dff7bf29fd5747e91695f93d0f (commit) via fc0d64506d75bde53afa3a3385a7f7f42bd566bc (commit) via 52bb9802dda6f6bb3619cc6d8e921ecd8175c8ce (commit) via 62f1b2df68f16dcd7eec324d487963f737cbe450 (commit) via 0af86d0b9b259bc9b171ea60b92cf96865a71c72 (commit) via 5053ceda3c7fd7a0e0f29336e5d0732c03c1836b (commit) via 0c7d9e4cc884f60af39859dcd674688d98cf3fae (commit) via a8435679d41663f9045c4b68d65c06678ac71237 (commit) via 0c41d8631474ae3fd33a1ff904dc241c791746aa (commit) via 6979847e8636d87e46551745e84b54afba64ba00 (commit) via 8fef5120f30b73cd57c8d8f79b288ef0ddbfb608 (commit) via 9e8c18572b1b6dd36edef72d5e47fd62f0c271d1 (commit) via 45662b4cc72c2fda2b4f47cfaeb2501b577f899e (commit) via 67c5956c1915ddab9069a226e45a838380acdf75 (commit) via b1e076fab0da49d7480d22b8c440342af0bbc652 (commit) via 7413de82f2d3f4cc359c9963bcfb9008f8d048f4 (commit) via d777714a573c027dbb4d03f65ae065348ae2448c (commit) via 3b01a6d063d0e40d3a97fe00dec2b4d4d9ce1c27 (commit) via 58b81110dcd871bb0eb5131f4af2b3179dbcc2d5 (commit) via 79d64a37a0d200fc3f6ecf03731ff6c954fc0749 (commit) from a13dff4b88b0c4efc66a05fa33870d81291da9db (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 b5a742c62f016969dabad9b786a7fe2d75cca760 Author: Owen Leonard Date: Fri Feb 22 17:29:36 2019 +0000 Bug 22399: Improve responsive behavior of the basic marc editor This patch makes markup and style changes to the basic MARC editor in order to improve the page's handling of smaller browser widths. It adds Bootstrap grid markup to the form to help accomplish this. To test, apply the patch and load a record for editing in the basic MARC editor. Adjust your browser width and confirm that the form adjusts well to various widths. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ef231b41119237952ce8a445c953c3957c987734 Author: Owen Leonard Date: Mon Sep 24 12:10:47 2018 +0000 Bug 20658: (follow-up) Fix for QA: Add missing html filters This patch adds missing filters to the installer header and footer include files. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 9ceb745fb2f9c226ffab40a32137c8d43d10ad74 Author: Owen Leonard Date: Wed Apr 25 16:28:18 2018 +0000 Bug 20658: Move template JavaScript to the footer: Installer and onboarding This patch updates the installer and onboarding templates so that JavaScript is included in the footer instead of the header. A new include file is added, installer-intranet-bottom.inc, so that only required JS is being loaded. Some markup changes are included to improve validity. To test, apply the patch and start with a blank Koha database. Run through the installer and onboarding processes and confirm that there are no problems. Check especially JS-related interactions like datepickers and fields which are validated via JS, like the password inputs. NOTE: The qa tool will flag this patch for not using the Asset plugin, but it doesn't work correctly for installer files. Signed-off-by: Claire Gravely Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3a7332c742467af3af0c728a3d9c21db00fb4666 Author: Katrin Fischer Date: Mon Feb 4 21:36:08 2019 +0100 Bug 18952: Add internal note to acq details tab Any important notes about an order are usually added to the internal note. This patch makes the note visible on the acq detail tab in the staff client. To test: - Add a basket - Order something - Add an internal note for the order - Go to the detail page of the ordered record - Switch to the Acquisition details tab - Verify that with the patch the internal note shows - Verify that the new column can be toggled using the column visibility settings Signed-off-by: Maryse Simard Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 57cfc3bab7d76c3a382f8111f5d5c9490eb2eb91 Author: Martin Renvoize Date: Mon May 21 12:15:37 2018 +0100 Bug 20782: Fix link from edifactmessages to invoices Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 6ebcc255d3def898c491333bc8702c56b09e4537 Author: Tomas Cohen Arazi Date: Thu Feb 28 10:00:27 2019 -0300 Bug 22206: (follow-up) Voted RFC changes This patch changes expiration_date for end_date as voted when the RFC was approved. It also adds a test for the Location header being added correctly when suspending a hold (SWAGGER3.4.1) Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1db9598e81abf009b80aa44699061e845c9e87e0 Author: Josef Moravec Date: Thu Feb 21 00:59:22 2019 +0000 Bug 22206: (QA follow-up) Fix tests for hold suspension api Test plan: prove t/db_dependent/api/v1/holds.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 6067d2d49f790ab9ffead1381c571c14b0ba43ff Author: Tomas Cohen Arazi Date: Mon Jan 28 07:40:15 2019 -0300 Bug 22206: Add routes to suspend/resume holds This patch introduces: - POST /holds/{hold_id}/suspension { "expiration_date": "2019-01-30" } - DELETE /holds/{hold_id}/suspension to suspend a hold or resume a suspended hold, respectively. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/holds.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit bcc150a9c05c1de4fe2fc5e07a5469f90d48953c Author: Tomas Cohen Arazi Date: Mon Jan 28 07:39:47 2019 -0300 Bug 22206: Unit tests Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 51a887a81d75c5ae561c17143ae9f70651449f04 Author: Tomas Cohen Arazi Date: Mon Jan 28 07:39:27 2019 -0300 Bug 22206: OpenAPI spec Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 41f394f4eedc152627080c0b4a89630034706121 Author: Tomas Cohen Arazi Date: Thu Jan 24 16:13:25 2019 -0300 Bug 20006: (follow-up) Plural class name Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f6b3d9979dc996dff7bf29fd5747e91695f93d0f Author: Tomas Cohen Arazi Date: Thu Jan 24 15:11:21 2019 -0300 Bug 20006: (follow-up) Fix holds.js This patch makes holds.js call the endpoint with 'pickup_library_id' instead of the old 'branchcode' property. To test: - Place a hold - Go to the patron's detail page - Go to the Holds tab - Change the pickup location => SUCCESS: It works! Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit fc0d64506d75bde53afa3a3385a7f7f42bd566bc Author: Tomas Cohen Arazi Date: Thu Jan 24 14:53:30 2019 -0300 Bug 20006: Adapt /holds to the RFC This patch makes the /holds endpoint respect the voted RFC. Some behaviours are changed as well: - As we voted to introduce a /public namespace for unprivileged access to endpoints, this endpoint gets the ability for owners and guarantors to manipulate holds through the API. - GET /holds now uses the objects->search helper, so it now has pagination. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/holds.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 52bb9802dda6f6bb3619cc6d8e921ecd8175c8ce Author: Tomas Cohen Arazi Date: Thu Jan 24 14:51:03 2019 -0300 Bug 20006: Unit tests fixes This patch makes the holds endpoint tests pass and expect data structures that match the voted RFC. As we voted to introduce a /public namespace for unprivileged access to endpoints, this endpoint gets the ability for owners and guarantors to manipulate holds through the API. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 62f1b2df68f16dcd7eec324d487963f737cbe450 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:48:26 2019 -0300 Bug 20006: Spec changes This patch makes the spec match the voted RFC. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0af86d0b9b259bc9b171ea60b92cf96865a71c72 Author: Josef Moravec Date: Mon Mar 11 08:46:54 2019 +0000 Bug 20563: (QA follow-up) Get requested_partners from api Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 5053ceda3c7fd7a0e0f29336e5d0732c03c1836b Author: Josef Moravec Date: Mon Mar 11 08:46:01 2019 +0000 Bug 20563: (QA follow-up) Fix number of tests in api/v1/illrequests.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 0c7d9e4cc884f60af39859dcd674688d98cf3fae Author: Andrew Isherwood Date: Fri Apr 13 09:22:26 2018 +0100 Bug 20563: Allow display of requested partners This patch adds the display of requested partner email addresses when an ILL backend provides the ability to send requests to partners. Partner email addresses are displayed in the illlist and illview displays, they are also included in the 'illrequests' API response. * api/v1/swagger/paths/illrequests.json: - Add 'requested_partners' as an 'embed' enum * Koha/Illrequest.pm: - Add 'requested_partners' accessor calling optional backend 'get_requested_partners' method. - Store requested partners upon email send, calling optional backend 'set_requested_partners' method. - Add 'requested_parners' embed to overloaded TO_JSON method. * koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt: - Add 'requested_partners' embed to illrequests API call - Add render function for "Additional status" datatables column - Add display of requested partner email addresses to illlist table - Add display of requested partner email addresses to illview display To test: 1) Enable Interlibrary loans 2) Add a backend that supports sending requests to partners, e.g. FreeForm 3) Set up at least one partner 4) Create an ILL request 5) Send request to partner(s) 6) Observe partner(s) email address(es) are displayed in "View ILL requests" view 7) Observe partner(s) email address(es) are displayed in "Manage ILL request" view Signed-off-by: mmg at interleaf.ie https://bugs.koha-community.org/show_bug.cgi?id=20653 Bug 20563: (follow-up) Fix requested partners As per: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20563#c10 Thanks for the suggestion on merging the "Status" and "Additional status" columns, looks much better! Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a8435679d41663f9045c4b68d65c06678ac71237 Author: Andrew Isherwood Date: Thu Nov 29 12:26:33 2018 +0000 Bug 20563: (follow-up) Fix rebasing bug Fix erroneous curly brackets Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 0c41d8631474ae3fd33a1ff904dc241c791746aa Author: Andrew Isherwood Date: Fri Nov 9 12:23:32 2018 +0000 Bug 20563: (follow-up) Add unit test Test that requested partners are returned in API response when requested Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 6979847e8636d87e46551745e84b54afba64ba00 Author: Nick Clemens Date: Fri Mar 15 19:31:45 2019 +0000 Bug 18837: DBRev 18.12.00.027 Signed-off-by: Nick Clemens commit 8fef5120f30b73cd57c8d8f79b288ef0ddbfb608 Author: Josef Moravec Date: Mon Mar 11 08:21:24 2019 +0000 Bug 18837: (QA follow-up) Fix order of sysprefa.sql Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 9e8c18572b1b6dd36edef72d5e47fd62f0c271d1 Author: Andrew Isherwood Date: Fri Mar 8 11:28:09 2019 +0000 Bug 18837: (follow-up) Add additional tests As requested by Josef on IRC, we now mock the unmediated_ill backend method and ensure it is called when the ILLModuleUnmediated syspref is enabled and ensure it is not called when the syspref is disabled Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 45662b4cc72c2fda2b4f47cfaeb2501b577f899e Author: Josef Moravec Date: Thu Mar 7 09:49:46 2019 +0000 Bug 18837: (QA follow-up) Update system preference desciprition Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 67c5956c1915ddab9069a226e45a838380acdf75 Author: Andrew Isherwood Date: Thu Apr 26 12:04:58 2018 +0100 Bug 18837: Introduce delegation to backends for unmediated workflows This patch adds support to Illrequest.pm to allow delegation of unmediated requests to happen in backends that support them. It is a recreation of https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=66629&action=diff which had diverged sufficiently as to make it impossible to apply Signed-off-by: Stephen Graham Signed-off-by: David Peacock Signed-off-by: Jayne Maisey Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit b1e076fab0da49d7480d22b8c440342af0bbc652 Author: Andrew Isherwood Date: Thu Apr 26 11:56:19 2018 +0100 Bug 18837: Add ILL Unmediated syspref stuff This patch adds the syspref requirements for unmediated ILL requests. It is a recreation of https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=66628&action=diff which had diverged sufficiently as to make it impossible to apply. * installer/data/mysql/atomicupdate/illunmediated_tables.sql: New file. * installer/data/mysql/sysprefs.sql: Add `ILLModuleUnmediated`. * koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref: Add `ILLModuleUnmediated` handling. Signed-off-by: Stephen Graham Signed-off-by: David Peacock Signed-off-by: Jayne Maisey Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 7413de82f2d3f4cc359c9963bcfb9008f8d048f4 Author: Andrew Isherwood Date: Thu Jul 12 11:12:00 2018 +0100 Bug 21063: Add "Columns settings" for ILL This patch adds the "Columns settings" values for the illrequests table Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie Signed-off-by: Josef Moravec Bug 21063: Add ability to show / hide columns This patch adds the "Column visibility" functionality to the main ILL request list table. To test: - Ensure ILL is enabled and you have some requests - Apply patch - From the "Koha administration screen, select "Configure columns" - In the "Columns settings" page: => TEST: Ensure an "Interlibrary loans" category exists - Upon expanding the category: => TEST: Ensure a table is displayed showing columns => TEST: Ensure the "action" column has "Cannot be toggled" pre-selected => TEST: Change values for columns and ensure they're saved - From the main staff menu, select "ILL requests" - In the table: => TEST: Click the "Column visibility" button and ensure a modal containing all columns (except "Action") is displayed => TEST: Select various columns and ensure they are shown and hidden Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie Signed-off-by: Josef Moravec Bug 21063: (follow-up) Add user ID to column list As originally specified in bug 20883, there is a requirement for some users to be able to display the user ID (borrowernumber) in the UI. This patch adds that ability to this bug, 20883 will be marked as a duplicate of this one. Signed-off-by: Josef Moravec Bug 21063: (follow-up) Amendments for rebase Modify to add the additional changes required now we're rebasing on top of the dependency tree. Includes adding additional columns (and changing indexes for search/filter where appropriate) Signed-off-by: Josef Moravec Bug 21063: (follow-up) Add comments to column list Since this bug is now dependent on Bug 18591 (Allow an arbitrary number of comments on ILLs) we need to add the comments column to this table and the list of selectable columns. This patch does this. Signed-off-by: Josef Moravec Bug 21063: (follow-up) Sanitize datatable data This mitigates bug 22268 by sanitizing data prior to display using the built in $.fn.dataTable.render.text() helper provided by Datatables. The patch was added here, rather that in 22268 since this is the bug that introduced the problem by increasing the number of fields that are displayed in the table, some of which could contain user provided malicious data Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d777714a573c027dbb4d03f65ae065348ae2448c Author: Nick Clemens Date: Fri Mar 15 19:21:25 2019 +0000 Bug 20750: DBRev 18.12.00.026 Signed-off-by: Nick Clemens commit 3b01a6d063d0e40d3a97fe00dec2b4d4d9ce1c27 Author: Josef Moravec Date: Thu Feb 28 11:14:46 2019 +0000 Bug 20750: (QA follow-up) Fix templates Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 58b81110dcd871bb0eb5131f4af2b3179dbcc2d5 Author: Andrew Isherwood Date: Tue Oct 2 14:56:53 2018 +0100 Bug 20750: Add unit tests Signed-off-by: Josef Moravec Bug 20750: (follow-up) Remove status_alias test This test is now redundant. We can't test the return of $req->status_alias against the value of $req->{status_alias} any more since we've overloaded the status_alias method and it won't always return the value of the object's property. We test the functionality of the status_alias method elsewhere so we're still covered. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 79d64a37a0d200fc3f6ecf03731ff6c954fc0749 Author: Andrew Isherwood Date: Tue Oct 2 14:55:58 2018 +0100 Bug 20750: Allow logging of arbitrary actions This patch allows logging of arbitrary actions on request objects. A chronological summary of these actions can then be displayed when viewing a request. This patch also adds logging of request status changes. Additional work has been done on the BLDSS backend to log requests to the BLDSS request status check API. To test: - Apply patch - Ensure the Illlog logging preference is turned on - Create an ILL request and perform actions on it that change it's status. - Navigate to the "Manage ILL request" screen - Click the "Display request log" button - Observe that a modal opens displaying a summary of the status changes. Signed-off-by: Niamh Walker Signed-off-by: Josef Moravec Since this bug now is dependent on Bug 20581, it should be aware of the custom statuses provided in 20581. This patch enables logging of request statuses being changed to custom ones. As such the test plan is modified: To test: - Apply patch - Ensure the Illlog logging preference is turned on - Ensure you have some custom request statuses defined in the Authorised Values ILLSTATUS category - Create an ILL request and perform actions on it that change it's status. - Edit the request and change status to a custom one - Navigate to the "Manage ILL request" screen - Click the "Display request log" button - Observe that a modal opens displaying a summary of the status changes. Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Illrequest.pm | 171 ++++++- Koha/Illrequest/Logger.pm | 237 ++++++++++ Koha/REST/V1/Hold.pm | 171 ------- Koha/REST/V1/Holds.pm | 491 ++++++++++++++++++++ Koha/REST/V1/Illrequests.pm | 12 +- admin/columns_settings.yml | 73 +++ api/v1/swagger/definitions/hold.json | 73 +-- api/v1/swagger/parameters.json | 6 +- api/v1/swagger/parameters/hold.json | 4 +- api/v1/swagger/paths.json | 7 +- api/v1/swagger/paths/holds.json | 244 +++++++--- api/v1/swagger/paths/illrequests.json | 9 +- api/v1/swagger/x-primitives.json | 12 +- ill/ill-requests.pl | 4 +- installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 18 + koha-tmpl/intranet-tmpl/prog/css/addbiblio.css | 48 +- .../prog/en/includes/installer-doc-head-close.inc | 18 - .../prog/en/includes/installer-intranet-bottom.inc | 21 + .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/admin/columns_settings.tt | 6 + .../en/modules/admin/preferences/circulation.pref | 8 + .../prog/en/modules/admin/preferences/logs.pref | 6 + .../prog/en/modules/catalogue/detail.tt | 2 + .../prog/en/modules/cataloguing/addbiblio.tt | 38 +- .../prog/en/modules/ill/ill-requests.tt | 341 ++++++++------ .../prog/en/modules/ill/log/status_change.tt | 12 + .../prog/en/modules/installer/auth.tt | 7 +- .../prog/en/modules/installer/step1.tt | 140 +++--- .../prog/en/modules/installer/step2.tt | 3 +- .../prog/en/modules/installer/step3.tt | 33 +- .../prog/en/modules/onboarding/onboardingstep1.tt | 3 +- .../prog/en/modules/onboarding/onboardingstep2.tt | 12 +- .../prog/en/modules/onboarding/onboardingstep3.tt | 17 +- .../prog/en/modules/onboarding/onboardingstep4.tt | 12 +- .../prog/en/modules/onboarding/onboardingstep5.tt | 12 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 6 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- t/Log.t | 1 - t/db_dependent/Illrequest/Logger.t | 118 +++++ t/db_dependent/Illrequests.t | 44 +- t/db_dependent/api/v1/holds.t | 195 ++++---- t/db_dependent/api/v1/illrequests.t | 11 +- 44 files changed, 1930 insertions(+), 724 deletions(-) create mode 100644 Koha/Illrequest/Logger.pm delete mode 100644 Koha/REST/V1/Hold.pm create mode 100644 Koha/REST/V1/Holds.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt create mode 100644 t/db_dependent/Illrequest/Logger.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 21:14:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 20:14:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-49-gdaac05e Message-ID: 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, 18.05.x has been updated via daac05e506efdb6038dd9978aa3f55911c97bf3a (commit) from 13db1eca9d04935f348968c7039d3dd3c2b3c004 (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 daac05e506efdb6038dd9978aa3f55911c97bf3a Author: Lucas Gass Date: Fri Mar 15 06:51:00 2019 +0000 Bug 22502: rmaint follow up remove footer.js Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 21:23:21 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 20:23:21 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-50-g452bbaf Message-ID: 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, 18.05.x has been updated via 452bbaf624b7d60935340a29f77bb468dd7f90db (commit) from daac05e506efdb6038dd9978aa3f55911c97bf3a (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 452bbaf624b7d60935340a29f77bb468dd7f90db Author: Owen Leonard Date: Tue Mar 5 18:22:12 2019 +0000 Bug 21030: Date widget on suspend modal not working correctly This patch makes a change to the suspend hold modal markup in order to allow the datepicker to work properly. To test, apply the patch and locate a patron in the staff client who has holds. - On the checkout or patron detail page, open the holds tab. - Click the "Suspend" button for one of the holds. - In the modal, trigger the date picker and confirm that the dropdowns for selecting month and year work correctly. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c91c1a69a23ff8d826a077c61059953bcc51940b) Signed-off-by: Martin Renvoize (cherry picked from commit 2084f0e3cb2496b979dbacb70d17aab868d9ee2b) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 15 21:33:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Mar 2019 20:33:11 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-51-g36ed18b Message-ID: 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, 18.05.x has been updated via 36ed18b58f4a95a4ba623675e63beddce9f7c1e1 (commit) from 452bbaf624b7d60935340a29f77bb468dd7f90db (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 36ed18b58f4a95a4ba623675e63beddce9f7c1e1 Author: Katrin Fischer Date: Sun Feb 10 03:09:45 2019 +0100 Bug 17496: Remove undocumented/maintained install-CPAN.pl file The install-CPAN.pl file was added in 2007 and hasn't been updated or documented since. This patch removed it from Koha. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit cab238755a69ca7e52b3822b390b31484abb5c72) Signed-off-by: Martin Renvoize (cherry picked from commit 9f065fe43f62f2bfbecc15b7267d06a9c62b1638) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: install-CPAN.pl | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 install-CPAN.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 16 02:27:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 16 Mar 2019 01:27:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-824-g7391805 Message-ID: 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 739180594608adba137e294cc81a0034e870f0d2 (commit) via 2aa868bad2ecc819fc3878d04e65bb04045c4daa (commit) via 1af8ab1fc73030f903351c0e097ed73f1f869256 (commit) via 46eb540f6401960f10a53bd852c8d8c295d66fb4 (commit) via 757ebbc1700af32eab1bde653b29f7b16428cf1c (commit) from b5a742c62f016969dabad9b786a7fe2d75cca760 (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 739180594608adba137e294cc81a0034e870f0d2 Author: Owen Leonard Date: Thu Mar 7 15:06:26 2019 +0000 Bug 21070: request.pl details links to biblio instead of moredetail.pl for that item This patch alters the hold summary page so that links to records with item-level holds go to the item detail page instead of the bibliographic detail page. There is already a link to the bibliographic detail page in the page heading. To test, apply the patch and place or locate an item-level hold. In the list of existing holds for that record, the linked barcode on the item-level hold should take you to the corresponding item detail page. Signed-off-by: Lisette Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 2aa868bad2ecc819fc3878d04e65bb04045c4daa Author: Owen Leonard Date: Wed Mar 6 18:41:12 2019 +0000 Bug 15911: (follow-up) Allow enter to submit using the submit button This patch modifies the checkEnter function so that it is possible to submit a form by tabbing to the submit button and hitting ENTER to submit. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1af8ab1fc73030f903351c0e097ed73f1f869256 Author: Owen Leonard Date: Fri Feb 22 14:27:07 2019 +0000 Bug 15911: Use noEnterSubmit CSS class instead of prevent_submit.js This patch removes the use of a separate js file, prevent_submit.js, in favor of using a CSS class to trigger the same functionality in staff-global.js. To test, apply the patch and test the following pages to confirm that pressing "Enter" when the cursor is in any field in the main form does not submit the form. - In Acquisitions, add to a basket from a new (empty) record - In Acquisitions, receive an order line - In Serials, locate a subscription and open the "Edit serials" page from the "Serial collection" page. Signed-off-by: Hayley Mapley Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 46eb540f6401960f10a53bd852c8d8c295d66fb4 Author: Owen Leonard Date: Wed Mar 6 15:24:01 2019 +0000 Bug 8775: (follow-up) Change column header to "Collection" This patch changes the table heading for ccode to be "Collection" instead of "Collection code." Current templates vary, but "Collection" is more logical because we show the description, not the code. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 757ebbc1700af32eab1bde653b29f7b16428cf1c Author: Owen Leonard Date: Fri Feb 22 14:00:37 2019 +0000 Bug 8775: Add collection code to lost report This patch adds a column for collection code to the lost items report. To test, apply the patch and run the lost items report. You should see a collection code column. Test column configuration for this table: Go to Administration -> Configure columns. Confirm that the "collection_code" column can be configured and that configuration choices are applied correctly. Signed-off-by: Bin Wen Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: admin/columns_settings.yml | 2 ++ koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 3 +-- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 3 +-- .../intranet-tmpl/prog/en/modules/reports/itemslost.tt | 2 ++ .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/js/prevent_submit.js | 11 ----------- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 6 ++++-- 8 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/prevent_submit.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 16 15:10:54 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 16 Mar 2019 14:10:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-852-g2d8a011 Message-ID: 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 2d8a01172edab1843b093ed484050a787caf6703 (commit) via 0b81721d2d4c6975accc39d4ad456258894e3aba (commit) via 3d167645beae7a05ac6a0dfaac8a87d12b0b4824 (commit) via 40d0a77a01be40b21f1190b195f47ae88c889b5b (commit) via 5c2f3d236aa97ece1cdcfb1addc33bb46544326e (commit) via f5270a792c3f1ae53f050dc7fb861e14f9869afe (commit) via eabd2f0e5464ba4a52f0f638b8af791991c1a7bb (commit) via 3aae5d2751ee5be1fcf4514541a4aee00d5cd01c (commit) via 23ac3f061156f016e9543482833ff8f7f7cd4f64 (commit) via db454c70432b19389e79d508f28e47338ef127b2 (commit) via a344b8cf8cd97b46f11966c2e903ccd883529f91 (commit) via 4fdf3c9849b3226a06c71b2bdaeda406e608e125 (commit) via f97d88ef647fe7a08c101b0e993d4963087f6f6c (commit) via 31ed9cf8bfbcae6f937c1d9f9a36be9ba9b8e23a (commit) via cc8e0b904e9881286e45cbe05333948f858b4c45 (commit) via d922b8871364f10b3af3daf0dad2a0ca9a0451f8 (commit) via 6f5f675194ba3de51e2f24354893faec2856bc91 (commit) via 0c0ac4161eb02acea55b0543b33e9095a5c9521c (commit) via 913b130ee4d7efdf6cff0bbf81136d69ffded4a7 (commit) via 0118ccf9dd06ee93cd1d12976d70ab93b1c210fb (commit) via a23577cefae2312efe4f91709dccdf39370504d9 (commit) via 12a8dfb934bf3819d6581f9df82987475334a302 (commit) via e0e431bab17c095852c752db64d1ac33147324ed (commit) via b99180bcaa0b508c3e41c54f4de26399feb35e49 (commit) via 3fb6cf02895081adb8c3e259a7e5e4e4d659d269 (commit) via c0df2d0e8612e1ca428f51462fcfb99fbc3f0009 (commit) via 20ce110f5c656f51bad262708d4b577568c1a52a (commit) via 0748911eb26f2a35d8ba881dcb92e37a979fc9a9 (commit) from 739180594608adba137e294cc81a0034e870f0d2 (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 2d8a01172edab1843b093ed484050a787caf6703 Author: Martin Renvoize Date: Tue Mar 12 13:14:18 2019 +0000 Bug 19417: (QA follow-up) Fix missing $raw filter Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0b81721d2d4c6975accc39d4ad456258894e3aba Author: Liz Rea Date: Mon Mar 4 20:15:04 2019 +0000 Bug 19417: Make error just a wee more human Small follow up to make the text explicitly say "Import of records failed" instead of "Failed to submit form" Users don't even know that they're submitting a form, what they think they're doing is uploading records. Let's use their words instead of developer words. Signed-off-by: Hayley Mapley Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3d167645beae7a05ac6a0dfaac8a87d12b0b4824 Author: Nick Clemens Date: Thu Oct 5 15:26:46 2017 +0000 Bug 19417: Display full error text when problem importing records To test: 1 - Upload a file to stage 2 - Select your import options 3 - Delete the file from the server, example: sudo rm /tmp/koha_kohadev_uploads/ 4 - 'Click stage for import' 5 - Get an alert 'Failed to submit form: error' 6 - Apply patches 7 - Repeat 1-4 8 - Get a pretty error with additional info Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 40d0a77a01be40b21f1190b195f47ae88c889b5b Author: Tomas Cohen Arazi Date: Tue Mar 5 11:00:44 2019 -0300 Bug 22455: Add Koha::Biblio::hidden_in_opac method This patch adds a hidden_in_opac method that does the same calculation done in places like opac-tags.pl. The condition that is checked is that all items belonging to the biblio are hidden. This is the current behaviour in the code. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/Koha/Biblio.t => SUCCESS: Tests pass! Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 5c2f3d236aa97ece1cdcfb1addc33bb46544326e Author: Tomas Cohen Arazi Date: Tue Mar 5 11:00:31 2019 -0300 Bug 22455: Unit tests Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit f5270a792c3f1ae53f050dc7fb861e14f9869afe Author: Tomas Cohen Arazi Date: Tue Mar 5 09:44:59 2019 -0300 Bug 22454: Add Koha::Item::hidden_in_opac method This patch adds a hidden_in_opac method that does the same calculation done in GetHiddenItemnumbers, but for a single item, and doesn't get the OpacHiddenItems syspref, but expects them to be passed as parameters (to avoid multiple reads). To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/Koha/Item.t => SUCCESS: Tests pass! Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit eabd2f0e5464ba4a52f0f638b8af791991c1a7bb Author: Tomas Cohen Arazi Date: Tue Mar 5 09:44:40 2019 -0300 Bug 22454: Unit tests Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3aae5d2751ee5be1fcf4514541a4aee00d5cd01c Author: Nick Clemens Date: Wed Mar 13 04:08:29 2019 +0000 Bug 22023: Compiled CSS Signed-off-by: Nick Clemens commit 23ac3f061156f016e9543482833ff8f7f7cd4f64 Author: Josef Moravec Date: Tue Mar 12 06:11:51 2019 +0000 Bug 22023: (QA follow-up) Remove console.log used for debugging Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit db454c70432b19389e79d508f28e47338ef127b2 Author: Owen Leonard Date: Mon Mar 11 16:07:59 2019 +0000 Bug 22023: (follow-up) Right-to-left layout improvements This patch makes some corrections to accommodate right-to-left layouts. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a344b8cf8cd97b46f11966c2e903ccd883529f91 Author: Owen Leonard Date: Tue Dec 18 19:10:14 2018 +0000 Bug 22023: Further improve responsive layout handling of staff client menu bar This patch makes a number of changes in order to improve the way the staff client's header menu adjusts at narrower browser widths: - Updated version of Bootstrap 3.3.7 which includes the "collapse" JavaScript plugin. - Modified default Bootstrap CSS using Bootstrap's customization tool. These changes facilitate the removal of some custom CSS (overriding Bootstrap) from staff-global.scss. - Added Bootstrap config file for loading customizations at https://getbootstrap.com/docs/3.3/customize/ - Revised button classes for buttons in Bootstrap-styled toolbars. The modified default CSS resets the base font size in Bootstrap to better match our global CSS. A side-effect of this is that toolbar buttons ended up looking smaller than they should. Changing the button class solves this. - Restructure the header menu in order to allow different rules to govern the appearance of the navigational part of the menu (Circulation, Search, etc) and the user menu (Set library, My account, Log out). - Modify the cart JS to so that the popup works well at narrow widths. To test, apply the patch, regenerate the staff client CSS, and clear your browser cache. - Log in to the staff client and observe the layout of the header menu as you adjust the browser to various widths. - Confirm that sections of the menu "collapse" as the window gets narrower. - Confirm that dropdown menus behave correctly and that links work. - Confirm that the Cart link works as expected when the cart empty and when it has items. - Install and enable multiple translations, including at least one set of sub-languages (e.g. fr-FR and fr-CA). - Test the appearance of the language menus in the footer at various browser widths. - View pages with button toolbars and confirm that they appear unchanged (e.g. biblio detail page, patron detail page). NOTE: While this patch is intended to make improvements to staff client responsiveness, it does so within a limited scope. There are still many pages which do not work well at narrower browser widths. Signed-off-by: Hayley Mapley Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 4fdf3c9849b3226a06c71b2bdaeda406e608e125 Author: Nick Clemens Date: Wed Mar 13 05:30:24 2019 +0000 Bug 21756: DBRev 18.12.00.028 Signed-off-by: Nick Clemens commit f97d88ef647fe7a08c101b0e993d4963087f6f6c Author: Nick Clemens Date: Wed Mar 13 04:02:51 2019 +0000 Bug 21756: Fix spelling error Signed-off-by: Nick Clemens commit 31ed9cf8bfbcae6f937c1d9f9a36be9ba9b8e23a Author: Martin Renvoize Date: Thu Mar 7 14:04:23 2019 +0000 Bug 21756: (QA follow-up) Add offest types to installer file Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit cc8e0b904e9881286e45cbe05333948f858b4c45 Author: Martin Renvoize Date: Fri Feb 22 09:39:49 2019 +0000 Bug 21756: (QA follow-up) Add offset_types to database Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit d922b8871364f10b3af3daf0dad2a0ca9a0451f8 Author: Martin Renvoize Date: Fri Feb 22 09:29:49 2019 +0000 Bug 21756: (QA follow-up) Add `Account Fee` mapping Required for add_enrolement_fee_if_needed within Koha::Patron Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 6f5f675194ba3de51e2f24354893faec2856bc91 Author: Martin Renvoize Date: Thu Feb 21 08:47:55 2019 +0000 Bug 21756: (follow-up) Replace newly introduced manualinvoice call Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 0c0ac4161eb02acea55b0543b33e9095a5c9521c Author: Martin Renvoize Date: Thu Feb 21 08:41:29 2019 +0000 Bug 21756: (follow-up) Add test for deprecation warning Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 913b130ee4d7efdf6cff0bbf81136d69ffded4a7 Author: Josef Moravec Date: Wed Feb 20 13:05:38 2019 +0000 Bug 21756: (QA follow-up) Fix Circulation.t Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 0118ccf9dd06ee93cd1d12976d70ab93b1c210fb Author: Martin Renvoize Date: Wed Feb 20 11:10:49 2019 +0000 Bug 21756: (QA follow-up) Correct the test for 'Lost Item' offsets Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit a23577cefae2312efe4f91709dccdf39370504d9 Author: Martin Renvoize Date: Wed Feb 20 10:43:47 2019 +0000 Bug 21756: (QA follow-up) Fix for 'Spurious text after =cut' Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 12a8dfb934bf3819d6581f9df82987475334a302 Author: Martin Renvoize Date: Mon Dec 17 08:56:53 2018 +0000 Bug 21756: Add deprecation warning to manualinvoice https://bugs.koha-community.org/show_bug.cgi?id=21756 Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit e0e431bab17c095852c752db64d1ac33147324ed Author: Martin Renvoize Date: Sun Dec 16 13:11:42 2018 +0000 Bug 21756: Replace manualinvoice with add_debit in tests Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit b99180bcaa0b508c3e41c54f4de26399feb35e49 Author: Martin Renvoize Date: Sat Dec 15 16:16:33 2018 +0000 Bug 21756: Remove use of manualinvoice from Koha::Hold Known Side Effect: Prior to this patch hold cancellation fees were not recorded in the FinesLog. After this patch, if the FinesLog is enabled then the 'action' will be recorded as `create_hold_expiration`. Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 3fb6cf02895081adb8c3e259a7e5e4e4d659d269 Author: Martin Renvoize Date: Sat Dec 15 15:58:46 2018 +0000 Bug 21756: Remove use of manualinvoice from Koha::Patron Known Side Effect: Prior to this patch enrolment fees were not recorded in the FinesLog. After this patch, if the FinesLog is enabled then the 'action' will be recorded as `create_account`. Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit c0df2d0e8612e1ca428f51462fcfb99fbc3f0009 Author: Fridolin Somers Date: Thu Mar 7 14:46:29 2019 +0100 Bug 21832: add is_expired to ILS-DI example Test plan : 1) Apply patch 2) Enable ILS-DI 3) Go to /cgi-bin/koha/ilsdi.pl?service=Describe&verb=GetPatronInfo 4) Check you see is_expired in example response Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 20ce110f5c656f51bad262708d4b577568c1a52a Author: Fridolin Somers Date: Tue Feb 12 15:52:22 2019 +0100 Bug 21832: add unit test Adds a check that is_expired exists in service GetPatronInfo. Test plan : Run : prove t/db_dependent/ILSDI_Services.t Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Amended patch: remove ref to bug number, we have git for that Signed-off-by: Nick Clemens commit 0748911eb26f2a35d8ba881dcb92e37a979fc9a9 Author: Fridolin Somers Date: Wed Nov 14 11:18:58 2018 +0100 Bug 21832: Restore is_expired in ILS-DI GetPatronInfo service Since Bug 17578 removed C4::Member::GetMemberDetails, the information "is_expired" disappeared from ILS-DI service GetPatronInfo. I propose to restore in by adding the code that exisited in C4::Member::GetMemberDetails directly in C4::ILSDI::Services. Test plan : 1) Enable ILS-DI webservice 2) Choose a patron not expired 3) Call web-service (replace X with patron's borrowernumber) : /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X 4) You see : 0 5) Choose a patron expired 6) Call web-service (replace X with patron's borrowernumber) : /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X 7) You see : 1 Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 24 +- C4/ILSDI/Services.pm | 3 + Koha.pm | 2 +- Koha/Account.pm | 3 +- Koha/Biblio.pm | 25 ++ Koha/Hold.pm | 14 +- Koha/Item.pm | 35 ++ Koha/Patron.pm | 18 +- installer/data/mysql/account_offset_types.sql | 2 + installer/data/mysql/updatedatabase.pl | 14 + .../lib/bootstrap/bootstrap-theme.min.css | 8 +- .../intranet-tmpl/lib/bootstrap/bootstrap.min.css | 8 +- .../intranet-tmpl/lib/bootstrap/bootstrap.min.js | 8 +- koha-tmpl/intranet-tmpl/lib/bootstrap/config.json | 426 ++++++++++++++++++++ .../intranet-tmpl/lib/jquery/plugins/humanmsg.js | 1 - koha-tmpl/intranet-tmpl/prog/css/right-to-left.css | 66 ++- .../intranet-tmpl/prog/css/src/staff-global.scss | 335 ++++++++------- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/includes/acquisitions-toolbar.inc | 10 +- .../prog/en/includes/authorities-toolbar.inc | 6 +- .../prog/en/includes/budgets-admin-toolbar.inc | 8 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 20 +- .../intranet-tmpl/prog/en/includes/header.inc | 19 +- .../prog/en/includes/intranet-bottom.inc | 2 +- .../prog/en/includes/labels-toolbar.inc | 4 +- .../prog/en/includes/members-toolbar.inc | 20 +- .../prog/en/includes/patron-toolbar.inc | 6 +- .../prog/en/includes/quotes-toolbar.inc | 6 +- .../prog/en/includes/reports-toolbar.inc | 21 +- .../prog/en/includes/serials-toolbar.inc | 18 +- .../prog/en/includes/stockrotation-toolbar.inc | 6 +- .../prog/en/includes/virtualshelves-toolbar.inc | 10 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 18 +- .../prog/en/modules/acqui/basketgroup.tt | 10 +- .../prog/en/modules/acqui/supplier.tt | 6 +- .../prog/en/modules/admin/audio_alerts.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branches.tt | 2 +- .../prog/en/modules/admin/categories.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 6 +- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/library_groups.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/printers.tt | 2 +- .../prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../prog/en/modules/authorities/authorities.tt | 8 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 14 +- .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 22 +- .../prog/en/modules/cataloguing/addbooks.tt | 8 +- .../prog/en/modules/cataloguing/editor.tt | 16 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 +- .../prog/en/modules/labels/label-edit-batch.tt | 14 +- .../intranet-tmpl/prog/en/modules/labels/result.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 6 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 4 +- .../en/modules/serials/subscription-frequencies.tt | 2 +- .../modules/serials/subscription-numberpatterns.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../tools/automatic_item_modification_by_age.tt | 10 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 6 +- .../modules/tools/marc_modification_templates.tt | 4 +- .../prog/en/modules/tools/stage-marc-import.tt | 9 +- .../prog/js/background-job-progressbar.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/basket.js | 32 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 1 + t/db_dependent/Accounts.t | 9 +- t/db_dependent/Circulation.t | 31 +- .../Circulation/NoIssuesChargeGuarantees.t | 7 +- t/db_dependent/ILSDI_Services.t | 4 +- t/db_dependent/Koha/Biblio.t | 35 +- t/db_dependent/Koha/{Tags/Indexes.t => Item.t} | 31 +- t/db_dependent/api/v1/patrons_accounts.t | 1 - 91 files changed, 1111 insertions(+), 431 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/lib/bootstrap/config.json copy t/db_dependent/Koha/{Tags/Indexes.t => Item.t} (54%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 18 12:35:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 18 Mar 2019 11:35:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-853-gdccc624 Message-ID: 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 dccc6242fffe8133e07927658327d4bb0d05dd48 (commit) from 2d8a01172edab1843b093ed484050a787caf6703 (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 dccc6242fffe8133e07927658327d4bb0d05dd48 Author: Nick Clemens Date: Mon Mar 18 11:17:31 2019 +0000 Bug 22454: (RM follow-up) Adjusts tests to avoid random failure Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Item.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 19 11:55:31 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 10:55:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-142-gfe46e7d Message-ID: 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, 18.11.x has been updated via fe46e7d393f7e46ffe0d35a9131643b862da4617 (commit) via a5a8aa4b3c4d5019adbaa578b817ec65813be5a2 (commit) via 982ebad2f3c7e141479b01a8a5f112902f5d2b99 (commit) via bd7506c7f36a42659690b1cb2aa8ee0e2357d65d (commit) via e517e34270a18172879e2e1376e19c755b7eb5b4 (commit) via f6e4e66f770a9ff36fee592f55617b39cbf3a6f6 (commit) via 4b8bad7710418b5033b32e94a677abd3ac4f289a (commit) via 2ab1ec967bea11c39795d0b77d40845d3f6fb0a5 (commit) via 53cf1c80f20c301750d515f3f6bd9b02173d6e6d (commit) via 8928ba93250633eb82199e06c2198487b955d734 (commit) via 43a58d640a3193ade1f357a31736bafcd939444a (commit) via af1d1ce1ca672b3063266e14670c98af248c42f0 (commit) via 362a7b464a1037053fb5ff59ebe9e99eee702650 (commit) via 30c9167dd48d1631f2554fa7897638ae4f4f5186 (commit) via 31ebb5abd003f41576febe7a53c27046236e9653 (commit) via c2531f6fef7f741f6557add3f8981148c55c15ce (commit) via 4bc7751e4abe80973e991fbd80506c23f39910d8 (commit) via 0014f64348ea171300afce604cd7ec4f9a0444a7 (commit) via 296f6756ab51103d0e104e16cff312d28a8fd165 (commit) via b45f8d066e40d16245a838a95c6fc61706cededb (commit) via 7fb724b92268070a02cfa59b3fbb0af10691d3d4 (commit) from 9f065fe43f62f2bfbecc15b7267d06a9c62b1638 (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 fe46e7d393f7e46ffe0d35a9131643b862da4617 Author: Nick Clemens Date: Fri Mar 15 12:32:49 2019 +0000 Bug 21846: DBRev 18.11.03.003 Signed-off-by: Nick Clemens (cherry picked from commit 3d462af21f3c13312b0ffb8496e55d277f703ebd) Signed-off-by: Martin Renvoize commit a5a8aa4b3c4d5019adbaa578b817ec65813be5a2 Author: Jonathan Druart Date: Tue Feb 26 17:01:41 2019 -0300 Bug 21846: Simplify ugly double for loops Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 180781f4748d689674a9f91f546d8e76324e7291) Signed-off-by: Martin Renvoize commit 982ebad2f3c7e141479b01a8a5f112902f5d2b99 Author: Jonathan Druart Date: Tue Feb 26 16:32:44 2019 -0300 Bug 21846: Fix pod2usage return values According to existing pattern. However I am not sure it makes sense to return an errno (and print to STDERR) if --help is passed. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit d7c0547bd20bd266ea8cd023ac4be22c2a9644d0) Signed-off-by: Martin Renvoize commit bd7506c7f36a42659690b1cb2aa8ee0e2357d65d Author: Tomas Cohen Arazi Date: Tue Feb 26 15:41:02 2019 -0300 Bug 21846: (QA follow-up) Fix maintenance script path Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fa4aeaa87e957298874263ec7c3f8478fcaf8b49) Signed-off-by: Martin Renvoize commit e517e34270a18172879e2e1376e19c755b7eb5b4 Author: Tomas Cohen Arazi Date: Tue Jan 8 13:13:46 2019 -0300 Bug 21846: (follow-up) Add maintenance script This patch adds a maintenance script that generates the missing tags_approval entries based on the tags_all table, and then recalculates the weights for both tags_approval and tags_index tables. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 293eee9959925397e4fdc84ae0d4baea2cf7d94c) Signed-off-by: Martin Renvoize commit f6e4e66f770a9ff36fee592f55617b39cbf3a6f6 Author: Tomas Cohen Arazi Date: Fri Nov 23 16:47:05 2018 -0300 Bug 21846: Make 'term' use utf8mb_bin collation on tags tables This patch makes the utf8mb4_bin collation preferred for comparing tags. Otherwise suppolemental unicode characters all match. To test: - Enable tags and disable moderation (or plan to moderate and accept tags) - Tag 3 records: a - with ? b - with ? c - with ? - Note the weight on each says '3' - Click the tag to search, you get back all the records - Apply the previous patches from this bug report - Run: $ kshell k$ prove t/db_dependent/Tags.t => FAIL: Tests fail, related to counting stuffs - Apply this patch and (a) Run updatedatabase to upgrade the schema - Run: k$ prove t/db_dependent/Tags.t => SUCCESS: Tests pass! (b) reset_all to get a fresh DB using kohastructure.sql - Run: k$ prove t/db_dependent/Tags.t => SUCCESS: Tests pass too! - Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 04f1b0ca950a5a133f6afe6785787d1982414a1e) Signed-off-by: Martin Renvoize commit 4b8bad7710418b5033b32e94a677abd3ac4f289a Author: Tomas Cohen Arazi Date: Fri Nov 23 15:30:52 2018 -0300 Bug 21846: Regression tests for add_tag_approval Due to collation issues, add_tag_approval wrongly calculates the weight for strings including extended UNICODE characters. This patch introduces a test for this situation. To test: - Apply this patch on master - Run: $ kshell k$ prove t/db_dependent/Tags.t => FAIL: Tests fail because all extended characters match the same Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 865f9a165d5d5e025737324843eccb5c39a74efb) Signed-off-by: Martin Renvoize commit 2ab1ec967bea11c39795d0b77d40845d3f6fb0a5 Author: Tomas Cohen Arazi Date: Fri Nov 23 15:44:04 2018 -0300 Bug 21846: Add Koha::Tags::Approval(s) and Koha::Tags::Index(es) In order to avoid writing the tests using plain DBIC which would later need to be replaced by a Koha::Object-based counterpart, I introduce this stub classes. Stub tests are added as well. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Koha/Tags.t \ t/db_dependent/Koha/Tags/Approvals.t \ t/db_dependent/Koha/Tags/Indexes.t => SUCCESS: Tests pass - Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 6c86de628d5873b88a7d6d2d676ecd7b98345aa7) Signed-off-by: Martin Renvoize commit 53cf1c80f20c301750d515f3f6bd9b02173d6e6d Author: Nick Clemens Date: Fri Mar 15 12:22:32 2019 +0000 Bug 21987: (RM follow-up) Add text for simple tests Signed-off-by: Nick Clemens (cherry picked from commit 1464328718619a673f233406fdb238f0391b0785) Signed-off-by: Martin Renvoize commit 8928ba93250633eb82199e06c2198487b955d734 Author: Jonathan Druart Date: Tue Dec 18 14:02:19 2018 -0300 Bug 21987: Do not generate true color thumbnails if not needed If the original image is not a true color image we should not generate a true color thumbnail. Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5c41d584cb654efbfd8c854bac0d30d87a054ab5) Signed-off-by: Martin Renvoize commit 43a58d640a3193ade1f357a31736bafcd939444a Author: Jonathan Druart Date: Tue Dec 18 14:02:14 2018 -0300 Bug 21987: Add tests Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit afb39b132b10b74efec31cd8191cdcd72a61d8d3) Signed-off-by: Martin Renvoize commit af1d1ce1ca672b3063266e14670c98af248c42f0 Author: Nick Clemens Date: Mon Mar 11 14:47:01 2019 +0000 Bug 22493: Clean up DecreaseLoanHighHolds.t To test: 1 - prove -v t/db_dependent/DecreaseLoanHighHolds.t 2 - should pass 3 - read code, confirm changes make sense Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ed5b7e4575917f07a3e895be754abc2bacc37337) Signed-off-by: Martin Renvoize commit 362a7b464a1037053fb5ff59ebe9e99eee702650 Author: Nick Clemens Date: Thu Mar 7 16:49:11 2019 +0000 Bug 22476: Correct default for MarkLostItemsAsReturned Signed-off-by: Bin Wen Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 9682cc7d21645a673bd274b24aeab323f61f28aa) Signed-off-by: Martin Renvoize commit 30c9167dd48d1631f2554fa7897638ae4f4f5186 Author: Fridolin Somers Date: Tue Mar 5 15:51:15 2019 +0100 Bug 21560: (follow-up) move use at the top Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 639ad97d844f2774f49881174b559293edd6baa4) Signed-off-by: Martin Renvoize commit 31ebb5abd003f41576febe7a53c27046236e9653 Author: Fridolin Somers Date: Tue Feb 19 12:01:16 2019 +0100 Bug 21560: Unit test for Koha::Util::OpenDocument Run prove t/Koha/Util/OpenDocument.t Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 99ea714345a6278d68e2abb0d182d8b495cf2950) Signed-off-by: Martin Renvoize commit c2531f6fef7f741f6557add3f8981148c55c15ce Author: Fridolin Somers Date: Mon Feb 18 17:33:37 2019 +0100 Bug 21560: create Koha::Util::OpenDocument with subroutine for ODS generation There is nearly the same code in misc/cronjobs/gather_print_notices.pl and reports/guided_reports.pl. This patch creates a new module with subroutine called by both scripts. If file path or content is undefined, subroutine will just return undef. If content is an empty arrayref, empty ods file is still generated. Unicode encoding is kept outisde because it may not be necessary. Note that for print notices the first line of message is always the column names so it is extracted only from first message. Test plan : Run previous patches test plans and check ODS files are the same. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ffb40290f88380418635a951dbb0788bf7b7e3ce) Signed-off-by: Martin Renvoize commit 4bc7751e4abe80973e991fbd80506c23f39910d8 Author: Fridolin Somers Date: Fri Dec 7 10:30:30 2018 +0100 Bug 21560: Optimize ODS export of gather_print_notices.pl Like previous patch, the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan inspired from Bug 11679. Test plan: - define your ODUE notice for the print template as: cardnumber:patron:email:item <>:<> <>:<>:<> - define overdues rules for a patron category - check-out 2 items using a due date in order to generate the overdue notices - check-in these 2 items - launch the script /misc/cronjobs/overdue_notices.pl - the 'message_queue' table should now contain 2 new entries - launch the gather_print_notices cronjob : perl misc/cronjobs/gather_print_notices.pl /tmp/test --ods --letter_code=OVERDUE -d=: - A ods file should be generated in your /tmp/test directory - Compare times with and without patch Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5d4f80feac811a9d6e177975b50c57ba85e3434d) Signed-off-by: Martin Renvoize commit 0014f64348ea171300afce604cd7ec4f9a0444a7 Author: Fridolin Somers Date: Fri Oct 12 14:09:54 2018 +0200 Bug 21560: report ODS export optimization SQL reports can be exported with CSV, TSV of ODS format. When report has thousands of rows, using ODS format is around 10 times longer than other formats. It also loads CPU and RAM a lot. The longest call is expandTable(). I found that the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan : 1) Don't apply patch yet 2) Create a new SQL report : Home > Reports > Create from SQL 3) Enter a SQL that will return thousands of results 4) Run report 5) Click Download > Semicolon separated text (.csv), look execution time 6) Click Download > Open Document Spreadsheet, look execution time 7) Apply patch 8) Redo 5) and 6) and compare times, CSV export should be the same but ODS export should be better My tests shows 1,5 seconds for CSV export. And for ODS export : 18 seconds without patch and 8 seconds with patch. Signed-off-by: David Nind Signed-off-by: Chris Cormack Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 28edd8848320fd0f0f284245f2f0567a5907619a) Signed-off-by: Martin Renvoize commit 296f6756ab51103d0e104e16cff312d28a8fd165 Author: David Cook Date: Mon Mar 4 17:43:29 2019 +1100 Bug 22429: Infinite loop in patron card printing Text fields in Patron Card Text Layouts can contain regular expression metacharacters, which - instead of being treated as literal values - are interpreted and prevent line wrapping. This causes the process to get stuck in an infinite loop, which keeps running even after the web server has timed out (at least when using CGI). This patch escapes the relevant input from the text field so the regular expression substitution treats characters as literals instead of as metacharacters. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3bd900496690375b2b711743ffaa57371388f687) Signed-off-by: Martin Renvoize commit b45f8d066e40d16245a838a95c6fc61706cededb Author: Nick Clemens Date: Fri Feb 8 20:24:05 2019 +0000 Bug 22296: Add Invoice Adjustments to GetBudgetHierarchy To test: 1 - prove -v t/db_dependent/Budgets.t 2 - Create some invoices on a single budget Invoice 1: add a non-encumbered adjustment for 1 add an encumbered adjustment 2 leave open Invoice 2: add a non-encumbered adjustment for 4 add an encumbered adjustment for 8 3 - View acq home page, should see 2 order and 12 spent for the budget 4 - View the spent and ordered pages, they should show the correct amounts 5 - Add more orders etc and confirm things total correctly https://bugs.koha-community.org/show_bug.cgi?id=22296 Signed-off-by: Janet McGowan Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit deb968ea45276e56826b592026617a96398b61da) Signed-off-by: Martin Renvoize commit 7fb724b92268070a02cfa59b3fbb0af10691d3d4 Author: Nick Clemens Date: Tue Mar 12 13:15:34 2019 +0000 Bug 22498: Rename variable for budgets loop for invoice adjustments To test: 1 - Try to add some adjustments to an invoice (receive shipments, create invoice, click 'finish receiving') 2 - Note the fund dropdown has only 'No fund' 3 - Apply patch 4 - Refresh page 5 - Note you can now select funds, hooray! Signed-off-by: Janet McGowan Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 19aebacf7c6162e5628cba1078b2c0f2ec9751a6) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Budgets.pm | 24 +++- C4/Images.pm | 4 +- C4/Patroncards/Patroncard.pm | 3 +- Koha.pm | 2 +- Koha/{Acquisition/Fund.pm => Tag.pm} | 10 +- Koha/{ApiKeys.pm => Tags.pm} | 13 +- Koha/{Acquisition/Budget.pm => Tags/Approval.pm} | 10 +- Koha/{ApiKeys.pm => Tags/Approvals.pm} | 13 +- Koha/{Acquisition/Fund.pm => Tags/Index.pm} | 10 +- Koha/{ApiKeys.pm => Tags/Indexes.pm} | 13 +- Koha/Util/OpenDocument.pm | 95 +++++++++++++ installer/data/mysql/kohastructure.sql | 6 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 29 ++++ .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 16 +-- misc/cronjobs/gather_print_notices.pl | 66 +++------ misc/maintenance/fix_tags_weight.pl | 137 ++++++++++++++++++ reports/guided_reports.pl | 51 +++---- .../Koha/Util/OpenDocument.t | 56 ++++---- t/db_dependent/Budgets.t | 46 ++++-- t/db_dependent/DecreaseLoanHighHolds.t | 41 +++--- t/db_dependent/Images.t | 39 +++++ .../{Template/Plugin/To.t => Koha/Tags.t} | 36 +++-- .../Plugin/To.t => Koha/Tags/Approvals.t} | 36 +++-- .../{Template/Plugin/To.t => Koha/Tags/Indexes.t} | 36 +++-- t/db_dependent/Tags.t | 149 ++++++++++++++++++-- 26 files changed, 689 insertions(+), 254 deletions(-) copy Koha/{Acquisition/Fund.pm => Tag.pm} (88%) copy Koha/{ApiKeys.pm => Tags.pm} (83%) copy Koha/{Acquisition/Budget.pm => Tags/Approval.pm} (86%) copy Koha/{ApiKeys.pm => Tags/Approvals.pm} (83%) copy Koha/{Acquisition/Fund.pm => Tags/Index.pm} (87%) copy Koha/{ApiKeys.pm => Tags/Indexes.pm} (83%) create mode 100644 Koha/Util/OpenDocument.pm create mode 100755 misc/maintenance/fix_tags_weight.pl copy cataloguing/value_builder/marc21_field_245h.pl => t/Koha/Util/OpenDocument.t (50%) mode change 100755 => 100644 create mode 100644 t/db_dependent/Images.t copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags.t} (61%) copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags/Approvals.t} (60%) copy t/db_dependent/{Template/Plugin/To.t => Koha/Tags/Indexes.t} (61%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 19 12:23:07 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 11:23:07 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-163-gfffb7b3 Message-ID: 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, 18.11.x has been updated via fffb7b3c6a3762683920aa5448a6128944bf21e1 (commit) via 4e305856af7b713868206e385fb1abac7a79a9d8 (commit) via 531040897b2c02114fe51a6c8de338f8bb61c3cb (commit) via 088a07a926782a2d1ea4be63cd30a5e45d7892dd (commit) via d7df216edb96ed733cb927c6c37204e08f42926f (commit) via 1e1fad3ea6459e94e3966bd6a0d50cea104a4d71 (commit) via 14686972ce6920ec8eb3ce453d6c6bc89914f36c (commit) via 5246c4d9af5f72d311ef6418fe4a9e607f8644ba (commit) via a6ff34be09f4d9271be6bf06a210b7fb7256590e (commit) via 1102aa5693d0b14389f682aac211a70bb7e6652c (commit) via 9a43905ebeb64b9de68e0dea537dc2ebca8124bf (commit) via 61de5b0fa8f60fda1ae2b2d66c983f1b91e9e781 (commit) via cd9e3e24ab8df7d030ae1fe80c1e4cd6c4f925a8 (commit) via c0b46677c64da72f68e92f4d5501cb8fe073c0a5 (commit) via 641f61d84b02fcf4b9efb8d745d82cf5f25022e8 (commit) via 9f8f8de6311d8fe8fb6410c976e90c40a9f7e421 (commit) via de1690a4425620cdb1ffce4f060240b6402b8986 (commit) via e891675295d984815909c803626e184258386940 (commit) via 9fe45dfe17f93bd106b5cf18c42779b9dbaccb93 (commit) via 601463fa198638e8b844c1b83c53e5ccb9e3c13b (commit) via c2a78b89fb4f18621aaa4183725739c4a887904f (commit) from fe46e7d393f7e46ffe0d35a9131643b862da4617 (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 fffb7b3c6a3762683920aa5448a6128944bf21e1 Author: Fridolin Somers Date: Thu Mar 7 14:46:29 2019 +0100 Bug 21832: add is_expired to ILS-DI example Test plan : 1) Apply patch 2) Enable ILS-DI 3) Go to /cgi-bin/koha/ilsdi.pl?service=Describe&verb=GetPatronInfo 4) Check you see is_expired in example response Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit c0df2d0e8612e1ca428f51462fcfb99fbc3f0009) Signed-off-by: Martin Renvoize commit 4e305856af7b713868206e385fb1abac7a79a9d8 Author: Fridolin Somers Date: Tue Feb 12 15:52:22 2019 +0100 Bug 21832: add unit test Adds a check that is_expired exists in service GetPatronInfo. Test plan : Run : prove t/db_dependent/ILSDI_Services.t Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Amended patch: remove ref to bug number, we have git for that Signed-off-by: Nick Clemens (cherry picked from commit 20ce110f5c656f51bad262708d4b577568c1a52a) Signed-off-by: Martin Renvoize commit 531040897b2c02114fe51a6c8de338f8bb61c3cb Author: Fridolin Somers Date: Wed Nov 14 11:18:58 2018 +0100 Bug 21832: Restore is_expired in ILS-DI GetPatronInfo service Since Bug 17578 removed C4::Member::GetMemberDetails, the information "is_expired" disappeared from ILS-DI service GetPatronInfo. I propose to restore in by adding the code that exisited in C4::Member::GetMemberDetails directly in C4::ILSDI::Services. Test plan : 1) Enable ILS-DI webservice 2) Choose a patron not expired 3) Call web-service (replace X with patron's borrowernumber) : /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X 4) You see : 0 5) Choose a patron expired 6) Call web-service (replace X with patron's borrowernumber) : /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X 7) You see : 1 Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 0748911eb26f2a35d8ba881dcb92e37a979fc9a9) Signed-off-by: Martin Renvoize commit 088a07a926782a2d1ea4be63cd30a5e45d7892dd Author: Owen Leonard Date: Mon Sep 24 12:10:47 2018 +0000 Bug 20658: (follow-up) Fix for QA: Add missing html filters This patch adds missing filters to the installer header and footer include files. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit ef231b41119237952ce8a445c953c3957c987734) Signed-off-by: Martin Renvoize commit d7df216edb96ed733cb927c6c37204e08f42926f Author: Owen Leonard Date: Wed Apr 25 16:28:18 2018 +0000 Bug 20658: Move template JavaScript to the footer: Installer and onboarding This patch updates the installer and onboarding templates so that JavaScript is included in the footer instead of the header. A new include file is added, installer-intranet-bottom.inc, so that only required JS is being loaded. Some markup changes are included to improve validity. To test, apply the patch and start with a blank Koha database. Run through the installer and onboarding processes and confirm that there are no problems. Check especially JS-related interactions like datepickers and fields which are validated via JS, like the password inputs. NOTE: The qa tool will flag this patch for not using the Asset plugin, but it doesn't work correctly for installer files. Signed-off-by: Claire Gravely Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 9ceb745fb2f9c226ffab40a32137c8d43d10ad74) Signed-off-by: Martin Renvoize commit 1e1fad3ea6459e94e3966bd6a0d50cea104a4d71 Author: Martin Renvoize Date: Mon May 21 12:15:37 2018 +0100 Bug 20782: Fix link from edifactmessages to invoices Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 57cfc3bab7d76c3a382f8111f5d5c9490eb2eb91) Signed-off-by: Martin Renvoize commit 14686972ce6920ec8eb3ce453d6c6bc89914f36c Author: Tomas Cohen Arazi Date: Thu Feb 28 10:00:27 2019 -0300 Bug 22206: (follow-up) Voted RFC changes This patch changes expiration_date for end_date as voted when the RFC was approved. It also adds a test for the Location header being added correctly when suspending a hold (SWAGGER3.4.1) Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 6ebcc255d3def898c491333bc8702c56b09e4537) Signed-off-by: Martin Renvoize commit 5246c4d9af5f72d311ef6418fe4a9e607f8644ba Author: Josef Moravec Date: Thu Feb 21 00:59:22 2019 +0000 Bug 22206: (QA follow-up) Fix tests for hold suspension api Test plan: prove t/db_dependent/api/v1/holds.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 1db9598e81abf009b80aa44699061e845c9e87e0) Signed-off-by: Martin Renvoize commit a6ff34be09f4d9271be6bf06a210b7fb7256590e Author: Tomas Cohen Arazi Date: Mon Jan 28 07:40:15 2019 -0300 Bug 22206: Add routes to suspend/resume holds This patch introduces: - POST /holds/{hold_id}/suspension { "expiration_date": "2019-01-30" } - DELETE /holds/{hold_id}/suspension to suspend a hold or resume a suspended hold, respectively. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/holds.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 6067d2d49f790ab9ffead1381c571c14b0ba43ff) Signed-off-by: Martin Renvoize commit 1102aa5693d0b14389f682aac211a70bb7e6652c Author: Tomas Cohen Arazi Date: Mon Jan 28 07:39:47 2019 -0300 Bug 22206: Unit tests Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit bcc150a9c05c1de4fe2fc5e07a5469f90d48953c) Signed-off-by: Martin Renvoize commit 9a43905ebeb64b9de68e0dea537dc2ebca8124bf Author: Tomas Cohen Arazi Date: Mon Jan 28 07:39:27 2019 -0300 Bug 22206: OpenAPI spec Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 51a887a81d75c5ae561c17143ae9f70651449f04) Signed-off-by: Martin Renvoize commit 61de5b0fa8f60fda1ae2b2d66c983f1b91e9e781 Author: Tomas Cohen Arazi Date: Thu Jan 24 16:13:25 2019 -0300 Bug 20006: (follow-up) Plural class name Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 41f394f4eedc152627080c0b4a89630034706121) Signed-off-by: Martin Renvoize commit cd9e3e24ab8df7d030ae1fe80c1e4cd6c4f925a8 Author: Tomas Cohen Arazi Date: Thu Jan 24 15:11:21 2019 -0300 Bug 20006: (follow-up) Fix holds.js This patch makes holds.js call the endpoint with 'pickup_library_id' instead of the old 'branchcode' property. To test: - Place a hold - Go to the patron's detail page - Go to the Holds tab - Change the pickup location => SUCCESS: It works! Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit f6b3d9979dc996dff7bf29fd5747e91695f93d0f) Signed-off-by: Martin Renvoize commit c0b46677c64da72f68e92f4d5501cb8fe073c0a5 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:53:30 2019 -0300 Bug 20006: Adapt /holds to the RFC This patch makes the /holds endpoint respect the voted RFC. Some behaviours are changed as well: - As we voted to introduce a /public namespace for unprivileged access to endpoints, this endpoint gets the ability for owners and guarantors to manipulate holds through the API. - GET /holds now uses the objects->search helper, so it now has pagination. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/holds.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit fc0d64506d75bde53afa3a3385a7f7f42bd566bc) Signed-off-by: Martin Renvoize commit 641f61d84b02fcf4b9efb8d745d82cf5f25022e8 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:51:03 2019 -0300 Bug 20006: Unit tests fixes This patch makes the holds endpoint tests pass and expect data structures that match the voted RFC. As we voted to introduce a /public namespace for unprivileged access to endpoints, this endpoint gets the ability for owners and guarantors to manipulate holds through the API. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 52bb9802dda6f6bb3619cc6d8e921ecd8175c8ce) Signed-off-by: Martin Renvoize commit 9f8f8de6311d8fe8fb6410c976e90c40a9f7e421 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:48:26 2019 -0300 Bug 20006: Spec changes This patch makes the spec match the voted RFC. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 62f1b2df68f16dcd7eec324d487963f737cbe450) Signed-off-by: Martin Renvoize commit de1690a4425620cdb1ffce4f060240b6402b8986 Author: Nick Clemens Date: Fri Mar 15 13:33:11 2019 +0000 Bug 21846: Update Schema Signed-off-by: Nick Clemens (cherry picked from commit 6757591297a148744ca714502271a11ee4b737e6) Signed-off-by: Martin Renvoize commit e891675295d984815909c803626e184258386940 Author: Fridolin Somers Date: Fri May 25 16:51:15 2018 +0200 Bug 20823: UNIMARC XSLT add subfield t for subjects In UNIMARC, 604 contains subfield t, see http://multimedia.bnf.fr/unimarcb_trad/B604-6-2011.pdf. Actual XSLT files use template tag_subject for 604, it does not use t subfield. This patch adds subfield t to tag_subject and tag_onesubject templates in intranet and OPAC XSLT files. Test plan : 1) In UNIMARC catalog edit a biblio record to add 604$t 2) Use default XSLT files in sysprefs 2) Go to catalogue details page of this record using default XSLT files 3) Check $t is displayed at OPAC and intranet Signed-off-by: S?verine QUEUNE Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 0c4bf00c30ce25165a5243bced7b7e19746a7e0b) Signed-off-by: Martin Renvoize commit 9fe45dfe17f93bd106b5cf18c42779b9dbaccb93 Author: Jonathan Druart Date: Mon Mar 4 16:57:26 2019 -0300 Bug 22219: Remove duplicated items in inventory (when skipping waiting holds) Test plan: 0/ Do not apply this patch 1/ Place several holds on a given item 2/ Use the inventory with the "skip waiting holds" option to list this item. It will be displayed several times 3/ Apply this patch and confirm that the item is now only displayed once Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 08ea70c109ce3432b5dd1a781d126c7353fca3da) Signed-off-by: Martin Renvoize commit 601463fa198638e8b844c1b83c53e5ccb9e3c13b Author: Jonathan Druart Date: Mon Mar 4 16:52:30 2019 -0300 Bug 22219: Add tests Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 2be9fd23d2e9aa91e2e1f38a2817a54a5cdc5d21) Signed-off-by: Martin Renvoize commit c2a78b89fb4f18621aaa4183725739c4a887904f Author: Owen Leonard Date: Thu Mar 7 17:28:34 2019 +0000 Bug 22477: Missing DataTables configuration when searching patrons for holds This patch adds columns configuration to the holds request page to fix a JavaScript error in the console and to allow the patron search results table to be enabled as a DataTable. To reproduce: Place a hold on a title in the staff client. When prompted for a patron, perform a search which will return multiple results. The patron search results will appear in an unsortable table. A JS error can be seen in the browser console. To test, apply the patch and repeat the steps above. The patron search results table should be sortable and there should be no JS error. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3e7620cf46d2e7079ff5494070ff6933fb9650af) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 3 + C4/Items.pm | 4 +- Koha/REST/V1/Hold.pm | 171 ------- Koha/REST/V1/Holds.pm | 491 ++++++++++++++++++++ Koha/Schema/Result/TagAll.pm | 8 +- api/v1/swagger/definitions/hold.json | 73 +-- api/v1/swagger/parameters.json | 6 +- api/v1/swagger/parameters/hold.json | 4 +- api/v1/swagger/paths.json | 7 +- api/v1/swagger/paths/holds.json | 244 +++++++--- api/v1/swagger/x-primitives.json | 12 +- .../prog/en/includes/installer-doc-head-close.inc | 18 - .../prog/en/includes/installer-intranet-bottom.inc | 21 + .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/installer/auth.tt | 7 +- .../prog/en/modules/installer/step1.tt | 140 +++--- .../prog/en/modules/installer/step2.tt | 3 +- .../prog/en/modules/installer/step3.tt | 33 +- .../prog/en/modules/onboarding/onboardingstep1.tt | 3 +- .../prog/en/modules/onboarding/onboardingstep2.tt | 12 +- .../prog/en/modules/onboarding/onboardingstep3.tt | 17 +- .../prog/en/modules/onboarding/onboardingstep4.tt | 12 +- .../prog/en/modules/onboarding/onboardingstep5.tt | 12 +- .../prog/en/modules/reserve/request.tt | 2 + .../prog/en/xslt/UNIMARCslimUtils.xsl | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 1 + .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 2 +- t/db_dependent/ILSDI_Services.t | 4 +- t/db_dependent/Items/GetItemsForInventory.t | 19 +- t/db_dependent/api/v1/holds.t | 197 ++++---- 31 files changed, 1025 insertions(+), 507 deletions(-) delete mode 100644 Koha/REST/V1/Hold.pm create mode 100644 Koha/REST/V1/Holds.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 19 13:26:31 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 12:26:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-164-g040f850 Message-ID: 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, 18.11.x has been updated via 040f850342e3ea953bad34692ea8cc144fe22c00 (commit) from fffb7b3c6a3762683920aa5448a6128944bf21e1 (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 040f850342e3ea953bad34692ea8cc144fe22c00 Author: Martin Renvoize Date: Tue Mar 19 12:08:21 2019 +0000 Bug 22206: (RMaint follow-up) Fix for bad test plan Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/db_dependent/api/v1/holds.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 00:07:39 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 23:07:39 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-53-gbc429b5 Message-ID: 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, 18.05.x has been updated via bc429b5dd11a9a93b96770233d727ca33687b75b (commit) via 067137eb53840cd36dfdf1671afb8978c32e65d2 (commit) from 36ed18b58f4a95a4ba623675e63beddce9f7c1e1 (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 bc429b5dd11a9a93b96770233d727ca33687b75b Author: Katrin Fischer Date: Sun Jan 13 21:26:12 2019 +0000 Bug 22002: (QA follow-up) Remove some debugging code from template Signed-off-by: Katrin Fischer Signed-off-by: Lucas Gass commit 067137eb53840cd36dfdf1671afb8978c32e65d2 Author: Jonathan Druart Date: Sun Dec 16 11:02:56 2018 -0300 Bug 22002: (bug 21621 follow-up) Re-add GROUP BY in letter.pl and fix it Caused by commit 0cffb0f7589aa52d65bda9a8a4934790a141f3a0 Bug 21621: Remove incorrect GROUP BY from tools/letter.pl The test plan was not complete enough. Test plan: 1) Go to Home ? Tools ? Notices & slips 2) Choose a letter to edit, e.g. PREDUE. Note that there is only a single row. 3) Click the edit button on the notice. 4) Expand the 'Print' section. Put text into the Message subject and Message body text areas. 5) Click save, this will take you back to the 'Notices & slips' page. 6) Clone PREDUE for a specific library 7) The 'all libraries' option must list the templates for all libraries, but without duplicate 8) Select a library in the dropdown list: only the templates for the given library is listed, without duplicate Signed-off-by: Barton Chittenden Signed-off-by: Katrin Fischer Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- tools/letter.pl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 00:25:21 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 23:25:21 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-54-gd272137 Message-ID: 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, 18.05.x has been updated via d272137c4f764f8a21f02f56c4dba0ad315ec4aa (commit) from bc429b5dd11a9a93b96770233d727ca33687b75b (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 d272137c4f764f8a21f02f56c4dba0ad315ec4aa Author: David Cook Date: Mon Mar 4 17:43:29 2019 +1100 Bug 22429: Infinite loop in patron card printing Text fields in Patron Card Text Layouts can contain regular expression metacharacters, which - instead of being treated as literal values - are interpreted and prevent line wrapping. This causes the process to get stuck in an infinite loop, which keeps running even after the web server has timed out (at least when using CGI). This patch escapes the relevant input from the text field so the regular expression substitution treats characters as literals instead of as metacharacters. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3bd900496690375b2b711743ffaa57371388f687) Signed-off-by: Martin Renvoize (cherry picked from commit 296f6756ab51103d0e104e16cff312d28a8fd165) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Patroncards/Patroncard.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 00:32:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 23:32:22 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-59-g9918ef2 Message-ID: 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, 18.05.x has been updated via 9918ef23a39ff5f69ba60c4fcacc5b830a00773c (commit) via 13cdadbe8f13f81e4774403b09c4abd1d27a6c6a (commit) via 3f68db17b9e2b5e6ece289a312f1a53f8d9a3d53 (commit) via ef6d4aef4b34fa22a8850146615adf70411065ea (commit) via ba64a98d076f46e9355818efc278ed3c531d0e00 (commit) from d272137c4f764f8a21f02f56c4dba0ad315ec4aa (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 9918ef23a39ff5f69ba60c4fcacc5b830a00773c Author: Fridolin Somers Date: Tue Mar 5 15:51:15 2019 +0100 Bug 21560: (follow-up) move use at the top Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 639ad97d844f2774f49881174b559293edd6baa4) Signed-off-by: Martin Renvoize (cherry picked from commit 30c9167dd48d1631f2554fa7897638ae4f4f5186) Signed-off-by: Lucas Gass commit 13cdadbe8f13f81e4774403b09c4abd1d27a6c6a Author: Fridolin Somers Date: Tue Feb 19 12:01:16 2019 +0100 Bug 21560: Unit test for Koha::Util::OpenDocument Run prove t/Koha/Util/OpenDocument.t Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 99ea714345a6278d68e2abb0d182d8b495cf2950) Signed-off-by: Martin Renvoize (cherry picked from commit 31ebb5abd003f41576febe7a53c27046236e9653) Signed-off-by: Lucas Gass commit 3f68db17b9e2b5e6ece289a312f1a53f8d9a3d53 Author: Fridolin Somers Date: Mon Feb 18 17:33:37 2019 +0100 Bug 21560: create Koha::Util::OpenDocument with subroutine for ODS generation There is nearly the same code in misc/cronjobs/gather_print_notices.pl and reports/guided_reports.pl. This patch creates a new module with subroutine called by both scripts. If file path or content is undefined, subroutine will just return undef. If content is an empty arrayref, empty ods file is still generated. Unicode encoding is kept outisde because it may not be necessary. Note that for print notices the first line of message is always the column names so it is extracted only from first message. Test plan : Run previous patches test plans and check ODS files are the same. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ffb40290f88380418635a951dbb0788bf7b7e3ce) Signed-off-by: Martin Renvoize (cherry picked from commit c2531f6fef7f741f6557add3f8981148c55c15ce) Signed-off-by: Lucas Gass commit ef6d4aef4b34fa22a8850146615adf70411065ea Author: Fridolin Somers Date: Fri Dec 7 10:30:30 2018 +0100 Bug 21560: Optimize ODS export of gather_print_notices.pl Like previous patch, the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan inspired from Bug 11679. Test plan: - define your ODUE notice for the print template as: cardnumber:patron:email:item <>:<> <>:<>:<> - define overdues rules for a patron category - check-out 2 items using a due date in order to generate the overdue notices - check-in these 2 items - launch the script /misc/cronjobs/overdue_notices.pl - the 'message_queue' table should now contain 2 new entries - launch the gather_print_notices cronjob : perl misc/cronjobs/gather_print_notices.pl /tmp/test --ods --letter_code=OVERDUE -d=: - A ods file should be generated in your /tmp/test directory - Compare times with and without patch Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5d4f80feac811a9d6e177975b50c57ba85e3434d) Signed-off-by: Martin Renvoize (cherry picked from commit 4bc7751e4abe80973e991fbd80506c23f39910d8) Signed-off-by: Lucas Gass commit ba64a98d076f46e9355818efc278ed3c531d0e00 Author: Fridolin Somers Date: Fri Oct 12 14:09:54 2018 +0200 Bug 21560: report ODS export optimization SQL reports can be exported with CSV, TSV of ODS format. When report has thousands of rows, using ODS format is around 10 times longer than other formats. It also loads CPU and RAM a lot. The longest call is expandTable(). I found that the call on OpenOffice-OODoc lib can be optimized. Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table Test plan : 1) Don't apply patch yet 2) Create a new SQL report : Home > Reports > Create from SQL 3) Enter a SQL that will return thousands of results 4) Run report 5) Click Download > Semicolon separated text (.csv), look execution time 6) Click Download > Open Document Spreadsheet, look execution time 7) Apply patch 8) Redo 5) and 6) and compare times, CSV export should be the same but ODS export should be better My tests shows 1,5 seconds for CSV export. And for ODS export : 18 seconds without patch and 8 seconds with patch. Signed-off-by: David Nind Signed-off-by: Chris Cormack Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 28edd8848320fd0f0f284245f2f0567a5907619a) Signed-off-by: Martin Renvoize (cherry picked from commit 0014f64348ea171300afce604cd7ec4f9a0444a7) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Util/OpenDocument.pm | 95 ++++++++++++++++++++ misc/cronjobs/gather_print_notices.pl | 66 +++++--------- reports/guided_reports.pl | 51 ++++------- .../Koha/Util/OpenDocument.t | 41 ++++----- 4 files changed, 155 insertions(+), 98 deletions(-) create mode 100644 Koha/Util/OpenDocument.pm copy cataloguing/value_builder/marc21_field_005.pl => t/Koha/Util/OpenDocument.t (50%) mode change 100755 => 100644 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 00:36:14 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 23:36:14 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-60-g8d18752 Message-ID: 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, 18.05.x has been updated via 8d18752e00228815c0bf727f232250671970579c (commit) from 9918ef23a39ff5f69ba60c4fcacc5b830a00773c (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 8d18752e00228815c0bf727f232250671970579c Author: Nick Clemens Date: Thu Mar 7 16:49:11 2019 +0000 Bug 22476: Correct default for MarkLostItemsAsReturned Signed-off-by: Bin Wen Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 9682cc7d21645a673bd274b24aeab323f61f28aa) Signed-off-by: Martin Renvoize (cherry picked from commit 362a7b464a1037053fb5ff59ebe9e99eee702650) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/sysprefs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 00:47:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Mar 2019 23:47:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-63-g2995ec5 Message-ID: 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, 18.05.x has been updated via 2995ec567629dde5058d147a4bef931a67e10e6e (commit) via 4040c07937330c8afa59234af5799fa4b92a53da (commit) via 4072e23045d9deaec4be54de76ef5a2982894c0c (commit) from 8d18752e00228815c0bf727f232250671970579c (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 2995ec567629dde5058d147a4bef931a67e10e6e Author: Nick Clemens Date: Fri Mar 15 12:22:32 2019 +0000 Bug 21987: (RM follow-up) Add text for simple tests Signed-off-by: Nick Clemens (cherry picked from commit 1464328718619a673f233406fdb238f0391b0785) Signed-off-by: Martin Renvoize (cherry picked from commit 53cf1c80f20c301750d515f3f6bd9b02173d6e6d) Signed-off-by: Lucas Gass commit 4040c07937330c8afa59234af5799fa4b92a53da Author: Jonathan Druart Date: Tue Dec 18 14:02:19 2018 -0300 Bug 21987: Do not generate true color thumbnails if not needed If the original image is not a true color image we should not generate a true color thumbnail. Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5c41d584cb654efbfd8c854bac0d30d87a054ab5) Signed-off-by: Martin Renvoize (cherry picked from commit 8928ba93250633eb82199e06c2198487b955d734) Signed-off-by: Lucas Gass commit 4072e23045d9deaec4be54de76ef5a2982894c0c Author: Jonathan Druart Date: Tue Dec 18 14:02:14 2018 -0300 Bug 21987: Add tests Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit afb39b132b10b74efec31cd8191cdcd72a61d8d3) Signed-off-by: Martin Renvoize (cherry picked from commit 43a58d640a3193ade1f357a31736bafcd939444a) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Images.pm | 4 ++-- t/db_dependent/Images.t | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 t/db_dependent/Images.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 20 16:52:43 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Mar 2019 15:52:43 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.10-64-g5f867fb Message-ID: 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, 18.05.x has been updated via 5f867fbb4bcdbebe41797153f7fa0232a886da57 (commit) from 2995ec567629dde5058d147a4bef931a67e10e6e (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 5f867fbb4bcdbebe41797153f7fa0232a886da57 Author: Lucas Gass Date: Wed Mar 20 00:50:45 2019 +0000 Bug 21987: (RMaint followup) fix bad test Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Images.t | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 21 19:47:09 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Mar 2019 18:47:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-883-g9712c8d Message-ID: 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 9712c8dcacbd33ed270fb455d8ce06d8d14b97c2 (commit) via a98e7521be9b01acd3f13c5e233072e615701099 (commit) via 00697631d7905d687b5ccba9cbd3effe40ece67b (commit) via cb3831317f343a214f5f5fe363de5977a99b8bb9 (commit) via bb231e6208fb8e3f0fccc249da2b8a94e715c244 (commit) via 6e3da5397e00d4f87bcac20b9965fb317707a14f (commit) via e43e972ec57d9e07839ec2d678652469b9995bd5 (commit) via 28ff4f6393e65ebfca60c05611fafc926f1fb239 (commit) via 48e9082043115416063e66217db60f0054b68088 (commit) via bc36d8e06b3b43b09b655718f7fad5a1780b246a (commit) via 0aa4f355d4fa4f973530290044b694ddd2a55e33 (commit) via 0aeae50229c6a381fe112644b72eefd6848fb655 (commit) via 876323cf5bb5185834a875f3da29ac33f7760ef4 (commit) via 2f5e839bf780955d228c9672abce9d6e5ad1aedf (commit) via 9922d2bf40e2b7429f300d4d73134f9fef3b8c65 (commit) via ca28c83abbd449c7e5f1d7b86760b7fb53741988 (commit) via ab4cf23286219b473820b61bca82c884de274e80 (commit) via d9b3d0fa36869a40b9db65375dba4972913697d8 (commit) via 4ccbae8879a386a1846bb48c18b3722f936dc983 (commit) via b17ca2b701fab5307330b6196590e5d3048978e1 (commit) via 00cf699c82aeea46ef5a72bf344fd306430c5aba (commit) via bf0882252f242efa8cc9f08625c0abe305d205a6 (commit) via 7fe5f8cd2c2d1eddd2a835fb644c262cffcbd34c (commit) via aea90223d6f250d6f74e00244abbb3e0334107b5 (commit) via cde6c897d507d8e93453ed62c1f7f579744b9ded (commit) via 2b52e54b201ea8917ac6f6f0306cf36218aead9e (commit) via 821e754e02b576320c29f00bf3d7d04f2655018a (commit) via dbcd0511e7580cce996965d54982bfcce7c97b14 (commit) via 1f35fa518f38e5eea55886b74fb495b3f6105763 (commit) via a57723fc594e92a197da9470959d4067e3d63221 (commit) from dccc6242fffe8133e07927658327d4bb0d05dd48 (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 9712c8dcacbd33ed270fb455d8ce06d8d14b97c2 Author: Nick Clemens Date: Thu Mar 21 18:21:32 2019 +0000 Bug 21683: DBRev 18.12.00.030 Signed-off-by: Nick Clemens commit a98e7521be9b01acd3f13c5e233072e615701099 Author: Josef Moravec Date: Fri Mar 8 06:22:08 2019 +0000 Bug 21683: (follow-up) Remove last occurences of statistics.proccode columns.def is used to define descriptions of db columns in guided reports test is not useful anymore IMO Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 00697631d7905d687b5ccba9cbd3effe40ece67b Author: Martin Renvoize Date: Thu Mar 7 08:12:30 2019 +0000 Bug 21683: (QA follow-up) Drop statistics.proccode Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit cb3831317f343a214f5f5fe363de5977a99b8bb9 Author: Martin Renvoize Date: Fri Feb 22 14:29:50 2019 +0000 Bug 21683: (QA follow-up) Koha::Account::Line rebase fix Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit bb231e6208fb8e3f0fccc249da2b8a94e715c244 Author: Josef Moravec Date: Fri Feb 22 14:33:17 2019 +0000 Bug 21683: (follow-up) Polish the change - based on feedback Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 6e3da5397e00d4f87bcac20b9965fb317707a14f Author: Josef Moravec Date: Fri Feb 22 14:27:21 2019 +0000 Bug 21683: Remove accountlines.accountno Test plan: 1) Play with fines, should work OK 2) Try to print receipts on fines - prinfeercpt.pl, printinvoice.pl 3) git grep getnextacctno -> no occurences 4) git grep accountno should return only: installer/data/mysql/atomicupdate/bug_21683_remove_column_accountno.perl installer/data/mysql/update22to30.pl misc/release_notes/release_notes_3_10_0.txt misc/release_notes/release_notes_3_22_0.txt 5) prove t/db_dependent/Accounts.t t/db_dependent/ILSDI_Services.t t/db_dependent/Stats.t t/db_dependent/Koha/Account.t Rescued-by: Martin Renvoize Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit e43e972ec57d9e07839ec2d678652469b9995bd5 Author: Josef Moravec Date: Fri Oct 26 11:02:58 2018 +0000 Bug 21683: Database update Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 28ff4f6393e65ebfca60c05611fafc926f1fb239 Author: Josef Moravec Date: Wed Mar 20 15:52:07 2019 +0000 Bug 13763: (follow-up) Strip leading whitespace characters from input barcode this makes the work with barcodes from input consistant on checking out, checking in and renewing Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 48e9082043115416063e66217db60f0054b68088 Author: Hayley Mapley Date: Thu Mar 14 04:58:31 2019 +0000 Bug 13763: Added check for filter syspref in renew.pl In Circulation->Renew, the renew feature does not check the system preference itemBarcodeFilter to see whether the barcode needs to be converted. This patch fixes this, adding a check for the system pref and applying it accordingly to convert the barcode if it is needed. Test plan: 1) In Circulation->Renew, enter a barcode that you know exists in the catalogue but add extra spaces, breaking up the barcode. Note that this fails with a warning that says 'No item matches this barcode' 2) In system Preferences, set the itemBarcodeInputFilter pref to Remove spaces and repeat step1. Note that the result is the same as in step 1 3) Apply the patch 4) Repeat step 1, and note that the filter removes the spaces and the item is renewed (or gives an error that indicates it recognises the barcode) Sponsored-by: Catalyst IT Signed-off-by: Bin Wen Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit bc36d8e06b3b43b09b655718f7fad5a1780b246a Author: Nick Clemens Date: Thu Mar 21 18:11:29 2019 +0000 Bug 18736: DBRev 18.12.00.029 Signed-off-by: Nick Clemens commit 0aa4f355d4fa4f973530290044b694ddd2a55e33 Author: Jonathan Druart Date: Thu Nov 1 12:51:54 2018 -0300 Bug 19469: Fix record links on multi holds Signed-off-by: Nick Clemens commit 0aeae50229c6a381fe112644b72eefd6848fb655 Author: Nick Clemens Date: Tue Jan 15 15:06:06 2019 +0000 Bug 18736: Calculate tax depending on rounding Marcel's comments pointed out that while I tried to avoid storing rounded values it is required for tax generation. This patch makes that change and adds test coverage and POD for populate_order_with_prices To test: Follow plan on other patches, ensure that orders and totals match on the basket, invoice, and budget pages prove -v t/db_dependent/Acquisition/populate_order_with_prices.t Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 876323cf5bb5185834a875f3da29ac33f7760ef4 Author: Marcel de Rooy Date: Fri Dec 14 10:46:56 2018 +0100 Bug 18736: (QA follow-up) Resolve uninitialized warn from Biblio.pm L3334 Running t/db/Budgets.t: Use of uninitialized value in join or string at C4/Biblio.pm line 3334. Test plan: Run again. Verify no warnings left. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 2f5e839bf780955d228c9672abce9d6e5ad1aedf Author: Marcel de Rooy Date: Fri Sep 28 11:20:49 2018 +0200 Bug 18736: (QA follow-up) Change to signed, add large int test [1] Add trivial subtest in t/Number/Price.t Checking a negative number and a large number for the MAX_INT change. Note: Confusing to have t/Prices.t too. [2] Change UNSIGNED to SIGNED in get_rounding_sql. Although I did not spot problems with negative prices, we theoretically could while casting. cast(-2 as unsigned) == 18446744073709551614 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 9922d2bf40e2b7429f300d4d73134f9fef3b8c65 Author: Marcel de Rooy Date: Fri Sep 28 10:09:01 2018 +0200 Bug 18736: (QA follow-up) Cosmetic changes [1] Resolve warnings like: Use of uninitialized value $rounding_pref in string eq at /usr/share/koha/devclone/C4/Acquisition.pm line 2040. [2] Fixing unusual use of whitespace too. [3] Remove list operator from get_rounding_sql return. Only used in scalar context. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit ca28c83abbd449c7e5f1d7b86760b7fb53741988 Author: Nick Clemens Date: Thu Sep 20 19:34:10 2018 +0000 Bug 18736: (follow-up) Remove duplicate code and adjust tests Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit ab4cf23286219b473820b61bca82c884de274e80 Author: Nick Clemens Date: Sun Sep 16 01:21:16 2018 +0000 Bug 18736: (follow-up) cast as UNSIGNED instead of INTEGER More recent MySql versions require the use of SIGNED or UNSIGNED rather than INTEGER. UNSIGNED will still work in older installs Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit d9b3d0fa36869a40b9db65375dba4972913697d8 Author: Nick Clemens Date: Fri Aug 24 11:11:19 2018 +0000 Bug 18736: Unit tests for GetBudgetHierarchy prove -v t/db_dependent/Budgets.t Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 4ccbae8879a386a1846bb48c18b3722f936dc983 Author: Nick Clemens Date: Fri Aug 24 01:22:35 2018 +0000 Bug 18736: (follow-up) Fix missing rounding and bad formatting This patch: Adds a missing use Uses 'Koha::Number::Price->round()' instead of 'format()' to ensure numeric returns Ensures too big numbers don't crash round() Uses syspref in 'GetBudgetHierarchy' To test: Follow previous test plan Check values on admin/aqbudgets.pl are affected by syspref Ensure values throughout acquisitions are correctly calculated/displayed (even when greater than 1,000) Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit b17ca2b701fab5307330b6196590e5d3048978e1 Author: Mark Tompsett Date: Tue Apr 17 23:39:57 2018 +0000 Bug 18736: (follow-up) Add missing test cases We now fully cover GetBudgetsPlanCell in these tests Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 00cf699c82aeea46ef5a72bf344fd306430c5aba Author: Nick Clemens Date: Tue Apr 17 14:37:11 2018 +0000 Bug 18736: (follow-up) Add tests and FIXME for GetbudgetsPlanCell prove t/db_dependent/Budgets.t Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit bf0882252f242efa8cc9f08625c0abe305d205a6 Author: Nick Clemens Date: Tue Jun 6 10:37:17 2017 -0400 Bug 18736: Unit tests for rounding Unit tests to highlight the issue To test: Prove t/db_dependent/Budgets.t prove t/Acquisition.t Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 7fe5f8cd2c2d1eddd2a835fb644c262cffcbd34c Author: Nick Clemens Date: Thu Dec 28 15:15:47 2017 +0000 Bug 18736: Use rounding syspref to determine correct prices in calculations To test: Place an order (no tax just for simplicity) listprice/rrp = 16.99 discount = 42% quantity = 8 estimated calculated at 9.85 but order total is 78.83, but 8 times 9.85 = 78.80 Apply patches, set OrderPriceRounding syspref to 'Nearest cent' Not order total is now as expected View ordered.pl and confirm values are correct Complete order, view invoice and confirm values View spent.pl and confirm values Go through acquisitions module and confirm prices throughout are correct. Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit aea90223d6f250d6f74e00244abbb3e0334107b5 Author: Nick Clemens Date: Thu Dec 28 15:11:11 2017 +0000 Bug 18736: Add OrderPriceRounding syspref Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit cde6c897d507d8e93453ed62c1f7f579744b9ded Author: Josef Moravec Date: Wed Mar 20 14:35:24 2019 +0000 Bug 22330: (QA follow-up) Fix number of tests in Reserves.t Test plan: prove t/db_dependent/Reserves.t Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 2b52e54b201ea8917ac6f6f0306cf36218aead9e Author: Josef Moravec Date: Wed Mar 20 14:29:25 2019 +0000 Bug 22330: (QA follow-up) Enable datatable in patron search Test plan: Try to search patron for circulation (or for creating hold), when there are more than 1 patron, you should see a table with patrons found. --> without this patch, the datatable is not created (for example sorting the table by clicking to column heading does not work) --> with this patch, the datatable works Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 821e754e02b576320c29f00bf3d7d04f2655018a Author: Kyle M Hall Date: Wed Mar 20 07:02:11 2019 -0400 Bug 22330: (QA follow-up) Fix QA script failure Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit dbcd0511e7580cce996965d54982bfcce7c97b14 Author: Kyle M Hall Date: Mon Mar 11 14:26:49 2019 -0400 Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1f35fa518f38e5eea55886b74fb495b3f6105763 Author: Kyle M Hall Date: Wed Feb 13 15:45:28 2019 -0500 Bug 22330: Cache item and library objects when building the holds queue Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a57723fc594e92a197da9470959d4067e3d63221 Author: Kyle M Hall Date: Fri Feb 8 14:46:18 2019 -0500 Bug 22330: Transfer limits should be respected for placing holds in staff interface and APIs Branch transfer limits are respected for placing holds in the OPAC but nowhere else. This should be remedied. Test Plan: 1) Set up a branch transfer limit from Library A to Library B 2) Verify you cannot set up a hold for an item from Library A for pickup at Library B from the staff interface ( without overriding ) 3) Verify you cannot place that hold via ILS-DI 4) Verify you cannot place that hold via SIP 4) Verify a forced hold from Library A to Library B will not show up in the holds queue Signed-off-by: Liz Rea Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 27 --- C4/Acquisition.pm | 108 +++++++++--- C4/Biblio.pm | 2 +- C4/Budgets.pm | 22 ++- C4/Circulation.pm | 2 +- C4/HoldsQueue.pm | 16 +- C4/ILSDI/Services.pm | 12 +- C4/Reserves.pm | 42 +++-- C4/SIP/ILS/Transaction/Hold.pm | 6 + C4/Stats.pm | 10 +- Koha.pm | 2 +- Koha/Account.pm | 24 --- Koha/Account/Line.pm | 1 - Koha/Number/Price.pm | 7 +- Koha/REST/V1/Patrons/Account.pm | 1 - Koha/pdfformat/layout3pages.pm | 7 +- Koha/pdfformat/layout3pagesfr.pm | 1 + acqui/basket.pl | 8 +- acqui/basketgroup.pl | 10 +- acqui/invoice.pl | 14 +- acqui/ordered.pl | 3 +- acqui/parcel.pl | 10 +- acqui/spent.pl | 3 +- circ/renew.pl | 2 + installer/data/mysql/kohastructure.sql | 3 - installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 20 +++ koha-tmpl/intranet-tmpl/prog/en/columns.def | 1 - .../en/modules/admin/preferences/acquisitions.pref | 9 +- .../prog/en/modules/reserve/request.tt | 18 +- members/printfeercpt.pl | 1 - members/printinvoice.pl | 1 - misc/cronjobs/staticfines.pl | 9 +- misc/maintenance/fix_accountlines_date.pl | 6 +- .../fix_accountlines_rmdupfines_bug8253.pl | 14 +- reports/orders_by_fund.pl | 4 +- reserve/request.pl | 6 +- t/Acquisition.t | 68 +++++++ t/Number/Price.t | 16 +- t/db_dependent/Accounts.t | 4 - .../Acquisition/populate_order_with_prices.t | 165 +++++++++++++++++ t/db_dependent/Budgets.t | 185 +++++++++++++++++++- t/db_dependent/Holds/HoldFulfillmentPolicy.t | 20 ++- t/db_dependent/HoldsQueue.t | 74 +++++++- t/db_dependent/ILSDI_Services.t | 96 +++++++++- t/db_dependent/Reserves.t | 16 +- t/db_dependent/Stats.t | 7 +- t/lib/TestBuilder.pm | 3 - 48 files changed, 895 insertions(+), 192 deletions(-) create mode 100644 t/Acquisition.t create mode 100644 t/db_dependent/Acquisition/populate_order_with_prices.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 21 20:42:38 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Mar 2019 19:42:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-884-ga1a2a76 Message-ID: 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 a1a2a76615c7ab25bee00e96b3266438130273d5 (commit) from 9712c8dcacbd33ed270fb455d8ce06d8d14b97c2 (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 a1a2a76615c7ab25bee00e96b3266438130273d5 Author: Nick Clemens Date: Thu Mar 21 19:24:59 2019 +0000 Bug 21683: Schema updates Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/Accountline.pm | 12 ++---------- Koha/Schema/Result/Statistic.pm | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 22 14:24:54 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Mar 2019 13:24:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-885-gc194d0e Message-ID: 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 c194d0e1478b494a1b60416891e589f2ae318e78 (commit) from a1a2a76615c7ab25bee00e96b3266438130273d5 (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 c194d0e1478b494a1b60416891e589f2ae318e78 Author: Nick Clemens Date: Fri Mar 22 13:06:49 2019 +0000 Bug 22330: Fix tests Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Holds.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 22 21:51:26 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Mar 2019 20:51:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-922-gb879e68 Message-ID: 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 b879e68326fcebc549d8c5688973b824c31fd761 (commit) via 52bceacd82cdf4e45b2e76bb7353bb84af1ee1b3 (commit) via 441c64d63072d9cd6fd0a97d987dc99a9e0a73ab (commit) via e95733da3c46bb9160bd1105a648d693ac4a7acf (commit) via aab6564c8c74a94ebedf4fe7590f825cece9bb6d (commit) via 58a07a2e6b18a9135b0f6dcf0b6c01616e768edb (commit) via 8378c74c90009df0476f1832d67b859075654bee (commit) via 352d46464ce1dac3d0c8b92f0c43ef583684fc42 (commit) via 17e72b2b1c55d79a5c7cc3cbaa278552ab936c1c (commit) via daac852c04eb0e9c866aef970f8a79e6db9261d3 (commit) via e9fa69ca64e78cc9ea540e3fed1e9ffb1b3488fe (commit) via ee73d577ed564d98e77cf25fcdadcbc594f7217c (commit) via b794643bb075c0aa5de81f2481ae1df56f674309 (commit) via f8c20ac4c91f22017093a2d8ed0dbb8b0a3738bc (commit) via ee1f262f1466e96e9676b3650fe2300b55565d53 (commit) via 7f3dd675b7f20bb011c2fb0659526c6fdf9195e4 (commit) via 4e067c83e427e7d76227c11fd8d84780dca2cefb (commit) via ce49552e6d46e098385a9d70f848793b7218f194 (commit) via 2851d66254fe9dbb0edb2b8991e90de665063fd1 (commit) via e7e27a934a1b1d968ea8d00116c0bf17bb196ec1 (commit) via e18626b6f142128064317e95ef4a7fb089f4f48d (commit) via 5b97398a3a88ab808121c958ddac5d1cd87ee63b (commit) via 48484173e26bf9859984860a17089f09de5c8b6a (commit) via 6e98cc4503cedba411371d4005be41b5822569c8 (commit) via b6be4024196c9e62363eabf0d2ad0b9f9141d15c (commit) via 717975abebe938a5e79ffc07055ed6190b43f206 (commit) via 7a9a8f2f08e4b74af712d59e1f1f9f0a7b3205a0 (commit) via 32020105e8494ba82a8a505711c5047560c9d304 (commit) via 0ad8984eb51a39beb9c1774d907ef19c7d01396e (commit) via 027f01e0c8ef05c23151085da33137be77faa05b (commit) via 7236422768aa22d8e9157d23d2a2608e6c3e8b5a (commit) via 374dbe02480ba8aafae7583e9ba8378b33186287 (commit) via 0429aadc217f05a98bbaa51f955b835ac552fd7a (commit) via 5334e0f32a8b93c407c2bfc931397a0ae70b8d64 (commit) via e64fb90311a9f2b37b49fc670962089cbb3d32de (commit) via 478f2392ce7b7cedd4f1c93ed3c64800a16a425b (commit) via a0b81b906d26312aeb5ef6cab035954ad676790c (commit) from c194d0e1478b494a1b60416891e589f2ae318e78 (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 b879e68326fcebc549d8c5688973b824c31fd761 Author: Nick Clemens Date: Fri Mar 22 20:29:19 2019 +0000 Bug 22032: Compiled CSS Signed-off-by: Nick Clemens commit 52bceacd82cdf4e45b2e76bb7353bb84af1ee1b3 Author: Owen Leonard Date: Thu Dec 20 16:32:34 2018 +0000 Bug 22032: Improve local cover image tab on detail page This patch makes a variety of improvements to the images tab of the staff client's bibliographic detail page. To test, apply the patch and regenerate the staff client CSS. - Enable the LocalCoverImages system preference. - Locate a bibliographic record which has no images attached. - There should be a "no images" message and an upload button. - Upload an image and return to the detail page. - The "Images" tab should have a nicely-styled thumbnail of the image you uploaded. - Test the "Delete image" link: It should ask for a confirmation. If you confirm, the image should disappear and a "loading" spinner should appear. - When the image has been deleted the thumbnail container should disappear and the "no images" message should reappear. - Test this process with AllowMultipleCovers enabled and disabled. Extra credit: Modify the AJAX url in the removeLocalImage function in detail.tt. After misspelling a parameter name or the URL path, clicking the "Delete image" link should trigger an alert and re-show the image thumbnail. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 441c64d63072d9cd6fd0a97d987dc99a9e0a73ab Author: Josef Moravec Date: Mon Mar 18 14:33:24 2019 +0000 Bug 18589: (QA follow-up) Remove dateFormat from javascript on ill requests pages. This is not needed, the right formatting is done in calendar.inc Test plan: Use datepickers on ILL requests list page and ensure they work as expected and the list is right filterred Signed-off-by: Josef Moravec Signed-off-by: Andrew Isherwood Signed-off-by: Nick Clemens commit e95733da3c46bb9160bd1105a648d693ac4a7acf Author: Josef Moravec Date: Mon Mar 18 13:40:54 2019 +0000 Bug 18589: (QA follow-up) Move template to bootstrap grid Test plan: Go to patrons Ill request history page and ensure the layout is not broken and is consistant with other patron pages (except Circulation and Details pages) Signed-off-by: Josef Moravec Signed-off-by: Andrew Isherwood Signed-off-by: Nick Clemens commit aab6564c8c74a94ebedf4fe7590f825cece9bb6d Author: Josef Moravec Date: Mon Mar 18 09:32:11 2019 +0000 Bug 18589: (QA follow-up) Rename page to "ILL requests history" for consistancy Signed-off-by: Josef Moravec Signed-off-by: Andrew Isherwood Signed-off-by: Nick Clemens commit 58a07a2e6b18a9135b0f6dcf0b6c01616e768edb Author: Andrew Isherwood Date: Tue Mar 12 09:41:56 2019 +0000 Bug 18589: (follow-up) Fix merge problem Bug in passing row to getStatusName As per item 3) in comment #20: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18589#c20 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 8378c74c90009df0476f1832d67b859075654bee Author: Andrew Isherwood Date: Tue Mar 12 09:19:56 2019 +0000 Bug 18589: (follow-up) Add borrowernumber test As per comment #21: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18589#c21 We now test borrowernumber filter works. This test has come from https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=83184&action=diff and will be removed from that bug Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 352d46464ce1dac3d0c8b92f0c43ef583684fc42 Author: Andrew Isherwood Date: Mon Mar 11 15:58:42 2019 +0000 Bug 18589: (follow-up) Fix QA tool failures As per comment #17: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18589#c17 Sorry Josef, I honestly have no idea where those tabs came from :( Every once in a while my copy of Vim decides to embarass me and stick in tabs instead of spaces... Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 17e72b2b1c55d79a5c7cc3cbaa278552ab936c1c Author: Andrew Isherwood Date: Mon Mar 11 14:19:36 2019 +0000 Bug 18589: (follow-up) Remove redundant-ness Following feedback from Josef via IRC, removing redundant code Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit daac852c04eb0e9c866aef970f8a79e6db9261d3 Author: Andrew Isherwood Date: Mon Mar 11 11:56:28 2019 +0000 Bug 18589: Show ILLs as part of patron profile This patch moves the display of a patron's ILL requests to be inline in the Patron Profile page, as per all other patron information. It includes a substantial refactor of koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt in that it moves the display of the illlist table (which is populated by an API request) into it's own separate include file. It also moves the datatable related Javascript for this table into it's own JS file. Doing this allows us to reuse both in both the new members/ill-requests.tt template and the pre-existing ill/ill-requests.tt template. To test: 1) Ensure ILL is enabled and your user has sufficient permissions 2) Ensure your user has some ILL requests 3) Navigate to the user's patron profile page 4) Click on the "Interlibrary loans" tab 5) Observe that the requests table is displayed inline 6) Observe that only your user's requests are displayed Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie This is essentially a reimplementation of attachment 84796 to take into account all changes that had happened beneath this bug and also to ensure JS strings are translatable. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit e9fa69ca64e78cc9ea540e3fed1e9ffb1b3488fe Author: Jonathan Druart Date: Wed Feb 27 14:49:35 2019 -0300 Bug 21998: Silent tests Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ee73d577ed564d98e77cf25fcdadcbc594f7217c Author: Josef Moravec Date: Tue Dec 18 11:53:21 2018 +0000 Bug 21998: Throw exception on bad pattern Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b794643bb075c0aa5de81f2481ae1df56f674309 Author: Marcel de Rooy Date: Wed Sep 19 15:36:36 2018 +0200 Bug 21998: Add pattern parameter in Koha::Token Allow a pattern too in Koha::Token->generate. Only supported length. Does not affect CSRF calls. So tiny change without further impact. Test plan: Run t/Token.t Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f8c20ac4c91f22017093a2d8ed0dbb8b0a3738bc Author: Nick Clemens Date: Fri Mar 22 20:04:33 2019 +0000 Bug 22008: DBRev 18.12.00.031 Signed-off-by: Nick Clemens commit ee1f262f1466e96e9676b3650fe2300b55565d53 Author: Kyle M Hall Date: Wed Mar 6 08:08:19 2019 -0500 Bug 22008: Fixes to make unit tests pass Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 7f3dd675b7f20bb011c2fb0659526c6fdf9195e4 Author: Martin Renvoize Date: Wed Feb 27 12:04:46 2019 +0000 Bug 22008: Add missing constraints Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 4e067c83e427e7d76227c11fd8d84780dca2cefb Author: Martin Renvoize Date: Wed Feb 27 12:02:36 2019 +0000 Bug 22008: Add tests for new constraints Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit ce49552e6d46e098385a9d70f848793b7218f194 Author: Nick Clemens Date: Fri Mar 22 19:56:18 2019 +0000 Bug 20478: Fix qa complaints Signed-off-by: Nick Clemens commit 2851d66254fe9dbb0edb2b8991e90de665063fd1 Author: Martin Renvoize Date: Fri Mar 8 10:35:49 2019 +0000 Bug 20478: (QA follow-up) Make test more standard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e7e27a934a1b1d968ea8d00116c0bf17bb196ec1 Author: Andreas Jonsson Date: Mon Jan 22 10:37:14 2018 +0000 Bug 20478: Have the cronjob script advance_notices.pl send digest messages per branch. Desired behavior of the script advance_notices.pl is that the sender address on the notice message is that of the branch of the issues in question. Thus, the solution is to generate digest messages per branch. To test: 1) Inspect unit test in t/db_dependent/cronjobs/advance_notices_digest.t and note that: - There are three libraries - There is a borrower - The borrower is registered at library1 - The borrower has message preference wants_digest set to 1 - The borrower has message preference days_in_advance set to 1 - The content of the letter PREDUEDGST is '<> <>' - There are three items - There is one issue per item - There is one issues at library2 - There are two issues at library3 - The date_due of the issues are set to tomorrow - For the default case (no -digest-per-message) - It is asserted that there is one message in the message queue after running the script - It is asserted that there are three items in the message. - It is asserted that the branchname is that of the borrower's home library. - For the case where -digest-per-message is enabled - It is asserted that there are two messages in the message queue after running the script - It is asserted that the item count of the message corresponding to library2 is 1 - It is asserted that the item count of the message corresponding to library3 is 2 - It is asserted that the branchnames are correct. 2) Run unit test: prove t/db_dependent/cronjobs/advance_notices_digest.t Sponsored-By: Bibliotek Mellansj?, which is a cooperation between Sponsored-By: Gullsp?ngs kommunbibliotek Sponsored-By: Hjo stadsbibliotek Sponsored-By: Karlsborgs bibliotek Sponsored-By: Mariestads stadsbibliotek Sponsored-By: Sk?vde stadsbibliotek Sponsored-By: Tibro bibliotek Sponsored-By: Tidaholms stadsbibliotek Sponsored-By: T?reboda kommunbibliotek Signed-off-by: Andreas Jonsson Signed-off-by: Magnus Enger Adding the --digest-per-branch switch turns the digest into one digest per library. I think it makes perfect sense to keep the default behaviour and hide this new functionality behind a command line switch. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit e18626b6f142128064317e95ef4a7fb089f4f48d Author: Andreas Jonsson Date: Tue Mar 27 11:22:45 2018 +0200 Bug 20478: Refactor to remove code duplication. Signed-off-by: Magnus Enger Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 5b97398a3a88ab808121c958ddac5d1cd87ee63b Author: Andreas Jonsson Date: Mon Jan 22 08:50:10 2018 +0000 Bug 20478: Add unit test for advance_notices.pl cronjob. Signed-off-by: Magnus Enger Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 48484173e26bf9859984860a17089f09de5c8b6a Author: Josef Moravec Date: Tue Feb 26 09:16:05 2019 +0000 Bug 19661: (follow-up) Use Basic auth in tests Test plan: prove t/db_dependent/api/v1/acquisitions_funds.t Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 6e98cc4503cedba411371d4005be41b5822569c8 Author: Matthias Meusburger Date: Tue Jan 15 10:46:04 2019 +0100 Bug 19661: Add and change properties and parameters to conform to the funds RFC. Also, perform an exact search when searching on the fund owner id. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b6be4024196c9e62363eabf0d2ad0b9f9141d15c Author: Matthias Meusburger Date: Wed Jan 17 11:49:14 2018 +0100 Bug 19661: Use Koha::Acquisition::Funds instead of C4::Budgets Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 717975abebe938a5e79ffc07055ed6190b43f206 Author: Matthias Meusburger Date: Thu Oct 12 07:55:12 2017 +0000 Bug 19661: REST API - Funds Endpoint This patch adds a new route to the REST api: /api/v1/acquisitions/funds/ Signed-off-by: David Bourgault Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7a9a8f2f08e4b74af712d59e1f1f9f0a7b3205a0 Author: Nick Clemens Date: Fri Mar 22 19:20:55 2019 +0000 Bug 21948: Compiled CSS Signed-off-by: Nick Clemens commit 32020105e8494ba82a8a505711c5047560c9d304 Author: Owen Leonard Date: Tue Dec 4 19:53:29 2018 +0000 Bug 21948: Clean up style of item detail page This patch removes some page-specific style from the item detail page in the staff client and adds some markup in order to trigger a more generally-used style. This patch also adds a font-awesome icon to the "Edit item" link on the page. To test, apply the patch and regenerate the staff client CSS. Open a bibliographic record and view the "Items tab." Signed-off-by: Hayley Mapley Signed-off-by: Nick Clemens commit 0ad8984eb51a39beb9c1774d907ef19c7d01396e Author: Nick Clemens Date: Fri Mar 22 19:16:46 2019 +0000 Bug 21304: Compiled CSS Signed-off-by: Nick Clemens commit 027f01e0c8ef05c23151085da33137be77faa05b Author: Owen Leonard Date: Tue Mar 19 15:46:42 2019 +0000 Bug 21304: (follow-up) Correct hc-sticky configuration This patch corrects the element passed to the hc-sticky plugin to define which element the floating toolbar sticks to. To test, apply the patch and perform a search in the staff client which will return multiple results. Confirm that scrolling down the page triggers the floating toolbar. Signed-off-by: Nick Clemens commit 7236422768aa22d8e9157d23d2a2608e6c3e8b5a Author: Owen Leonard Date: Wed Sep 5 12:38:33 2018 +0000 Bug 21304: (follow-up) Fix style of search results browser This follow-up revises the style of the search result browser in the staff client, making it behave better at smaller browser widths. The patch also makes a couple of ESLint-prompted changes to browser.js To test, apply the patch and regenerate CSS. - Perform a catalog search in the staff client. - Click on one of the search results. - On the bibliographic detail page there should be results browsing controls in the left-hand sidebar. - Resize the browser window and confirm that the controls work well at various sizes. - Test with both the first and last search result. Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 374dbe02480ba8aafae7583e9ba8378b33186287 Author: Owen Leonard Date: Wed May 2 14:06:23 2018 +0000 Bug 21304: Update two-column templates with Bootstrap grid: Catalog This patch modifies several catalog templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from