[koha-commits] main Koha release repository branch master updated. v20.05.00-1688-g6dd1dbc3a1
Git repo owner
gitmaster at git.koha-community.org
Thu Nov 5 15:58:06 CET 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 6dd1dbc3a117e8aa4a320b4d3c87458b4e74333d (commit)
via 0efa25c86afad07cfcb4cd8a0ffe23e0e0c50dc7 (commit)
via d31403133d7c54d5ceb0c095859f3d01d3c39d3a (commit)
via 6dad46e0ec84a71e34fe8b7c557512b8da1ded97 (commit)
via 946edb595b96c4e53a996461757770b6aa53d6e9 (commit)
via 08ef42582fea11a4283a386ce6744939ee574e22 (commit)
via f11659c48b55eefe02bd1e829b396cd68d8a105d (commit)
via 2b298ece04d7d055acc38e56904b1c9e7bf7949e (commit)
via ff87a03f94d352b55271ae2355498f71a8cd938a (commit)
via d6b9032073f6ed95a09417cc5e02841184df0dbb (commit)
via 932e2d05bca743d1862efd123f485d8c352fa778 (commit)
via 57f58f29b158e0910c5c33d66619c07f88e7157c (commit)
via 0351013fdf7bec4df828962d16716135ceae1a9a (commit)
via ff5c4f151fa32d43858cef7619e7b6a34d30bc97 (commit)
via eaabed085f9b7afcab53d793c5a8c796ad3b75f3 (commit)
via d12c1f6a25ad74a11d2b57447791e5fba78e921a (commit)
via 88b5b5d00ac04c5286dfeb5c05c674e82b3f2728 (commit)
via a851aaeebf60e2da4ea9381151521e5f03a994c8 (commit)
via 83bb93ccc96b69739900af559c5112602bc13490 (commit)
via ddf8dfcad06f4ecc99495754299cea65e3be0ea2 (commit)
via bea89005ca2e59dc3c082e872f2ba3c1872a2dd3 (commit)
via cb3753d29254cb2f17661a36ddece56919ba980d (commit)
via a10db1347dfbe5a444e669e363aab9b635d74069 (commit)
via 0d438de0186fb08d2a1f8eb82b0df0204efff5ef (commit)
via 31e38bc371943d1e76f49aacd1dd159a254f71e7 (commit)
via 42c0475a948577442e44b11dbb12b45b25171418 (commit)
via d3f8624315dc1c9327c0c7eaa23e9ff21d15032e (commit)
from 31e9ac9a2c6e54e458a7f5bc49b83a2d05a83d2c (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 6dd1dbc3a117e8aa4a320b4d3c87458b4e74333d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 5 11:07:01 2020 +0000
Bug 25334: DBRev 20.06.00.060
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0efa25c86afad07cfcb4cd8a0ffe23e0e0c50dc7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 5 14:12:56 2020 +0100
Bug 25334: MTT is itiva not talkingtech
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d31403133d7c54d5ceb0c095859f3d01d3c39d3a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Nov 3 13:21:24 2020 -0500
Bug 25334: (QA follow-up) Update overduerules.tt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6dad46e0ec84a71e34fe8b7c557512b8da1ded97
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Nov 3 18:13:28 2020 +0000
Bug 25334: (QA follow-up) Update opac messaging
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 946edb595b96c4e53a996461757770b6aa53d6e9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 30 13:35:48 2020 -0400
Bug 25334: Add generic 'phone' message transport type
As bug 25333 changed the 'phone' transport type to 'talkingtech', we can
now re-add 'phone' as a transport type again, and allow it to behave and
support the same notices as the email transport type.
Test Plan;
1) Apply this patch
2) Run updatedatabase
3) Restart all the things!
4) Disable TalkingTechItivaPhoneNotificationi if enabled
5) Enable new PhoneNotification system preference
6) Go to a patron's messaging preferences, not you can select the
'phone' option for all the same notices as the 'email' option
7) Enable the phone option for all the message types
8) Browser to the Notices and slips editor
9) Add a phone notice version for each notice you wish to test
10) Test some notices ( CHECKIN, CHECKOUT, etc )
11) Notices should show in the patron's messages as 'phone' notices
Signed-off-by: Christopher Zorn <Christofer.Zorn at ajaxlibrary.ca>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 08ef42582fea11a4283a386ce6744939ee574e22
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Jun 2 11:27:02 2020 +0400
Bug 25650: Add location and itype descriptions in ILS-DI GetRecords
Test plan:
1. Create a record with an item, and set the item's shelving location
and itemtype.
2. Go to
http://<OPAC>/cgi-bin/koha/ilsdi.pl?service=GetRecords&id=<biblionumber>
3. Check that there is <itype_description> and <location_description>
and that their value is correct.
Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f11659c48b55eefe02bd1e829b396cd68d8a105d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 2 18:13:04 2020 +0000
Bug 26148: OpenLibrary "Preview" link target is unclear to patrons
This patch makes changes to the display of the Open Library "read" links
in the OPAC search results and detail page. The link is now grouped with
other details about the record ("Publisher," "Location(s)," etc. On the
detail page, the "Preview" link will no longer appear under the cover
image.
The label is changed to "Found in Open Library," and the link now opens
the Open Library reader in a new window.
The patch also changes the Open Library button image links so that they
use https and makes it so that the "Found in Open Library" information
is hidden until the availability information has loaded.
To test, apply the patch and enable the OpenLibrarySearch system
preference.
- Perform a search in the OPAC which will return results found in Open
Library, e.g. "poetry" in the sample data.
- Confirm that the "Read now" images from Open Library appear on some
search results.
- View the detail page for one of these titles.
- Confirm that the "Read now" button appears in the same format on the
detail page.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2b298ece04d7d055acc38e56904b1c9e7bf7949e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 5 12:06:33 2020 +0100
Bug 26172: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff87a03f94d352b55271ae2355498f71a8cd938a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 3 11:40:57 2020 +0100
Bug 26172: Replace _result[set] calls
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d6b9032073f6ed95a09417cc5e02841184df0dbb
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 15 14:05:45 2020 +0100
Bug 26172: (QA follow-up) Add tests for previous cashups
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 932e2d05bca743d1862efd123f485d8c352fa778
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 15 11:45:26 2020 +0200
Bug 26172: Fix return value for ->register
There is a ON DELETE CASCADE clause on this FK
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 57f58f29b158e0910c5c33d66619c07f88e7157c
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 14 17:15:30 2020 +0100
Bug 26172: (QA follow-up) Add Unit Test
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0351013fdf7bec4df828962d16716135ceae1a9a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 14 17:14:47 2020 +0100
Bug 26172: (QA follow-up) Fix order of summary
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff5c4f151fa32d43858cef7619e7b6a34d30bc97
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 4 15:54:31 2020 +0000
Bug 26172: (QA follow-up) Add missing filter
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eaabed085f9b7afcab53d793c5a8c796ad3b75f3
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 21 14:45:28 2020 +0100
Bug 26172: (follow-up) Add print option
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d12c1f6a25ad74a11d2b57447791e5fba78e921a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 21 14:09:46 2020 +0100
Bug 26172: (follow-up) Summary by payment_type
This patch alters the modal so that the totals are broken down by
payment type's available on the system.
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 88b5b5d00ac04c5286dfeb5c05c674e82b3f2728
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 7 10:15:20 2020 +0100
Bug 26172: Add cashup summary view modal
This patch adds a cashup summary modal to the register details page.
Test plan
1/ Enable Cash Registers and Point of Sale
2/ Enable some debit_types as 'Sale items'
3/ Perform a series of transactions
4/ Perform a 'Cashup' on the register
5/ Note the new '(Summary)' link next to the last cashup on the register
page.
6/ Click the link and confirm the modal contains the pertinent
information
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a851aaeebf60e2da4ea9381151521e5f03a994c8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 30 15:39:05 2020 -0300
Bug 26584: Remove unused C4::Acquisition::CloseBasket function
This patch makes code use the new Koha::Acquisition::Basket->close
method and makes CloseBasket obsolete.
It then removes it, and adapts the few places in which it was used.
1. Apply this patch
2. Run:
$ kshell
k$ git diff origin/master --name-only | grep -e '\.t$' | xargs prove
=> SUCCESS: Tests pass!
3. Try playing with baskets, closing them
=> SUCCESS: All works as expected!
4. Sign off :-D
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 83bb93ccc96b69739900af559c5112602bc13490
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 15 11:33:33 2020 -0300
Bug 26582: (QA follow-up) Rename closed => is_closed
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ddf8dfcad06f4ecc99495754299cea65e3be0ea2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 30 14:40:54 2020 -0300
Bug 26582: Add Koha::Acquisition::Basket->close
This patch adds two methods to Koha::Acquisition::Basket:
- 'closed': that tells if the basket is closed
- 'close': that closes the basket
It inherits the behaviour from CloseBasket (as it actually makes sense).
It improves CloseBasket by wrapping the action inside a transaction. It
uses the $orders->update call with no_trigger as there's no trigger to
trigger and the update can be done on a single DB call.
A new exceptions file is added for basket-related exceptions. The only
specific exception that gets added is
Koha::Exceptions::Acquisition::Basket::AlreadyClosed
To test:
1. Apply this patches
2. Run:
$ kshell
k$ prove t/db_dependent/Koha/Acquisition/Basket.t
=> SUCCESS: Tests pass!
3. Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bea89005ca2e59dc3c082e872f2ba3c1872a2dd3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 30 14:40:36 2020 -0300
Bug 26582: Unit tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cb3753d29254cb2f17661a36ddece56919ba980d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 5 09:12:12 2020 +0100
Bug 26935: Don't use basket for claimacquisition and claimissues
Incorrect basketid is sent for claimacquisition and claimissues.
The basket info are not used in the default template of these notices, but if it
is used, a wrong basket may be passed to generate the notice.
This has been caught by a test failure after bug 26745.
# Failed test 'SendAlerts - claimissue'
# at t/db_dependent/Letters.t line 642.
C4::Letters::_substitute_tables(): DBI Exception: DBD::mysql::st execute failed: called with 2 bind variables when 1 are needed [for Statement "SELECT * FROM aqbasket WHERE basketno = ?" with ParamValues: 0=53] at /kohadevbox/koha/C4/Letters.pm line 679
This is a quick patch to fix the failing test, but more work would needed.
We are removing the basket info from those 2 notices and keeping it only
for orderacquisition.
Technically: the $externalid is coming from the parameter list of
SendAlerts, but it is a basketno only for orderacquisition. We must not
pass it for other notices.
Test plan:
Confirm that the failing test is now passing and that the changes make
sense.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a10db1347dfbe5a444e669e363aab9b635d74069
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Nov 5 12:42:47 2020 +0000
Bug 26908: (follow-up) Alter template check
This alters the template check to use the presence of the plugins
arrayref rather than requiring a second call to check for
plugins_enabled.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0d438de0186fb08d2a1f8eb82b0df0204efff5ef
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Nov 3 08:31:39 2020 -0500
Bug 26908: Restore ability to view and select EDI plugins for a vendor account
Test Plan:
1) Install an EDI plugin
2) Browse to edi_accounts.pl, create or edit an account
3) Note the plugins pulldown is missing
4) Apply this patch
5) Restart all the things!
6) Reload the page
7) Note the pulldown is back!
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 31e38bc371943d1e76f49aacd1dd159a254f71e7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 3 16:45:33 2020 +0100
Bug 26911: (bug 18936 follow-up) Remove invalid data before copying the circ rules
UPDATE: changed queries to not touch * values
To test:
1 - Checkout 19.11.x and reset_all
2 - Add a new patron category, itemtype, and branch to your system
3 - Create issuing rules using thise 3 values, and others
4 - Delete the new category, itemtype and branch
5 - Checkout master
6 - Restart_all
7 - updatedatabase
8 - you get errors
9 - repeat 1-5
10 - apply patch
11 - restart_all
12 - updatedatabase
13 - no errors!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 42c0475a948577442e44b11dbb12b45b25171418
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 4 09:04:19 2020 +0100
Bug 26915: Fix FinePaymentAutoPopup behaviour
The behaviour of the syspref FinePaymentAutoPopup is broken, the popup
explodes with
Can't call method "unblessed" on an undefined value at /home/vagrant/kohaclone/members/printfeercpt.pl line 64
It has been broken by
commit a2449a81be55aa5b3710ca2c6df7884513f89540
Bug 23051: (follow-up) Add renewal feedback and move code to subroutines and test
which modified the return value of Koha::Account->pay (from $payment_id
to a hashref)
Test plan:
- To test activate FinePaymentAutoPopup
- Create a manual fee
- Write it off using the write off button on the account line (not below table)
=> Without the patch you get the error
=> With the patch applied the popup is correctly displayed
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3f8624315dc1c9327c0c7eaa23e9ff21d15032e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 4 17:36:06 2020 +0100
Bug 7143: Update about page for new dev - Ivan Masár
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 24 +-
C4/ILSDI/Services.pm | 14 +
C4/Letters.pm | 8 +-
C4/Reserves.pm | 1 +
Koha.pm | 2 +-
Koha/Acquisition/Basket.pm | 48 +++
Koha/Cash/Register/Action.pm | 109 +++++++
Koha/EDI.pm | 4 +-
.../Exceptions/{Token.pm => Acquisition/Basket.pm} | 23 +-
acqui/basket.pl | 31 +-
docs/contributors.yaml | 3 +
.../mysql/mandatory/message_transport_types.sql | 1 +
.../sample_notices_message_transports.sql | 9 +-
installer/data/mysql/mandatory/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 42 +++
.../intranet-tmpl/prog/css/src/staff-global.scss | 33 ++
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/includes/messaging-preference-form.inc | 34 +-
.../prog/en/modules/admin/edi_accounts.tt | 2 +-
.../prog/en/modules/admin/preferences/patrons.pref | 8 +
.../intranet-tmpl/prog/en/modules/pos/register.tt | 78 ++++-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 9 +-
.../prog/en/modules/tools/overduerules.tt | 4 +
.../bootstrap/en/includes/opac-bottom.inc | 1 -
.../bootstrap/en/includes/openlibrary-readapi.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +-
.../bootstrap/en/modules/opac-messaging.tt | 20 ++
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 5 +-
koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 13 +-
members/pay.pl | 2 +-
t/db_dependent/Acquisition.t | 2 +-
.../Acquisition/GetBasketsInfosByBookseller.t | 4 +-
t/db_dependent/Acquisition/close_reopen_basket.t | 6 +-
t/db_dependent/Koha/Acquisition/Basket.t | 76 ++++-
t/db_dependent/Koha/Cash/Register/Action.t | 350 +++++++++++++++++++++
t/db_dependent/Letters.t | 2 +-
36 files changed, 894 insertions(+), 85 deletions(-)
copy Koha/Exceptions/{Token.pm => Acquisition/Basket.pm} (58%)
create mode 100755 t/db_dependent/Koha/Cash/Register/Action.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list