From gitmaster at git.koha-community.org Wed Jan 2 11:12:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Jan 2019 10:12:05 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.13-9-gb74f4e9 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 b74f4e9cce345801a062d81ea7e0dc5a697f975a (commit) via 43e626493ba758bcd46b5e70d8065d0d33c1b8fb (commit) via e55b5f9bace77e3ec4250cedc7baca5e30efd6f2 (commit) via d2d640a55a78c5edc9eb1230f626525f0a775afa (commit) via e2e7dc62202957428fc0170573af8e347cbf5e58 (commit) via 172fed8521f939480d00a68bb620a5e634b13022 (commit) via a704b28c495ee115961daf034d87b065edaf8fe7 (commit) via a0653c28f0477772c2752c0026ce56cb34bd2e22 (commit) via cdeb4c8051412184f22eb5665c66da2850941f42 (commit) from eac60108318813b30f52c1a65bf8c6e8fecab30a (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 b74f4e9cce345801a062d81ea7e0dc5a697f975a Author: Julian Maurice Date: Fri Dec 7 10:19:44 2018 +0100 Bug 21908: (QA follow-up) Remove useless parentheses in query Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit 875f3162c8008ef288adfcd18ada490cf06ecc15) Signed-off-by: Martin Renvoize (cherry picked from commit 0c99c3a30a4ebe2ef18db1a6d1e48a99ef7ea0b6) Signed-off-by: Lucas Gass (cherry picked from commit 247b57388a168b358878c1acd50b8591a3335808) Signed-off-by: Fridolin Somers commit 43e626493ba758bcd46b5e70d8065d0d33c1b8fb Author: Fridolin Somers Date: Thu Nov 29 10:50:06 2018 +0100 Bug 21908: Add DISTINCT biblionumber to rebuild_zebra.pl Zebra indexing script misc/migration_tools/rebuild_zebra.pl as a table arg to allow filtering. When using table=items we should use DISTINCT(biblionumber) to avoid indexing several times the same biblio record when it has several items. This patch adds DISTINCT(biblionumber) in all cases it does not harm if its already unique. Test plan : 1) Be sur you have a biblio record with biblionumber 1 with 3 items 2) Run misc/migration_tools/rebuild_zebra.pl -v -b --table items --where="biblionumber=1" 3) Without patch you see "Records exported: 3", with patch only one 4) Check indexing works well Signed-off-by: Pierre-Marc Thibault Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit a1b08269a7031417312e6265ace9ef5b995933fa) Signed-off-by: Martin Renvoize (cherry picked from commit 397f2e850ced3acaeb8d0f103694262ba339d63f) Signed-off-by: Lucas Gass (cherry picked from commit 7008d6ae03a1f5dac6b6c3b7fd42a13d3393abab) Signed-off-by: Fridolin Somers commit e55b5f9bace77e3ec4250cedc7baca5e30efd6f2 Author: Fridolin Somers Date: Thu Nov 29 10:15:00 2018 +0100 Bug 21908: Add biblio_metadata to rebuild_zebra.pl tables Zebra indexing script misc/migration_tools/rebuild_zebra.pl as a table arg to allow filtering. It is missing biblio_metadata to allow filtering on MARCXML with ExtractValue. Test plan : 1) Be sur you have a biblio record with biblionumber 1 2) Run misc/migration_tools/rebuild_zebra.pl -h 3) You see : --table specify a table (can be items, biblioitems, biblio, biblio_metadata) to retrieve biblionumber to index. 4) Run misc/migration_tools/rebuild_zebra.pl -v -b --table biblio_metadata --where="biblio_metadata.biblionumber=1" 5) Check you dont have SQL errors Signed-off-by: Pierre-Marc Thibault Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit c36597bc0c72cc31249c02af5aaaf1c1f977ee50) Signed-off-by: Martin Renvoize (cherry picked from commit 33b8f3ff1df670d4512695213d004b1a189f9c25) Signed-off-by: Lucas Gass (cherry picked from commit 2f7868e9c6d3a1646b9c0d9e8736301b317750e9) Signed-off-by: Fridolin Somers commit d2d640a55a78c5edc9eb1230f626525f0a775afa Author: Kyle M Hall Date: Fri Nov 16 07:01:39 2018 -0500 Bug 21849: Two useless Koha::Account::Offset->new calls need attention Came across those calls in bug 20598 in _FixOverduesOnReturn Koha::Account::Offset->new( { debit_id => $accountline->id, type => 'Forgiven', amount => $amountoutstanding * -1, } ); This does nothing if you don't store data. Test Plan: 1) Apply this patch 2) Set up 2 items with overdue fines 3) Return one with dropbox mode 4) Note the dropbox account offset is created 5) Return one with full fine forgiveness 6) Note the forgiven account offset is created Signed-off-by: Tomas Cohen Arazi Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a2b5407ba5c74f826c1665c1a2ef1ff6d52689fd) Signed-off-by: Martin Renvoize (cherry picked from commit ff3d3776a4d9b52da49b6ad4b2a1dde1da9425ee) Signed-off-by: Lucas Gass (cherry picked from commit 56cbc940acba33003cb49f3edc964976dd2e0340) Signed-off-by: Fridolin Somers commit e2e7dc62202957428fc0170573af8e347cbf5e58 Author: Kyle M Hall Date: Fri Nov 16 09:54:39 2018 -0500 Bug 21849: Add unit tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 2dbaaa300877ff6d96ae84b5a703753d97b6c340) Signed-off-by: Martin Renvoize (cherry picked from commit aa565b8e9919ee414d0693f391b141985ebacb93) Signed-off-by: Lucas Gass (cherry picked from commit 0a6c0c32604ebbd89ccff8d2dc0ff4a11bd204dd) Signed-off-by: Fridolin Somers commit 172fed8521f939480d00a68bb620a5e634b13022 Author: Nick Clemens Date: Wed Nov 7 01:32:26 2018 +0000 Bug 21778: Sort user list by surname,firstname unless user cannot manage patron lists OR edit patrons To test: 1 - Create four users: 1 superlibrarian (or with both edit patrons and manage patron lists) 1 with only edit patrons and catalogue 1 with only add to list and catalogue 1 with catalogue but neither edit patrons or manage patron lists 2 - Search patrons signed in as each user 3 - Note different sorting 4 - Apply patch 5 - Try searching with each patron 6 - Results should always be sorted by surname, firstname 7 - Only in the case of neither extra permission should the checkboxes be absent Signed-off-by: Devinim Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 96b3889390f8efe9851aaa9c2cafa9e20bda3f43) Signed-off-by: Martin Renvoize (cherry picked from commit f228847155bc46433cbad4f834c2df89734b9c5c) Signed-off-by: Jesse Maseto (cherry picked from commit f0b6ec9e3934badb1a9b6c8a165a3a4012d83186) Signed-off-by: Fridolin Somers commit a704b28c495ee115961daf034d87b065edaf8fe7 Author: Jesse Maseto Date: Wed Dec 19 17:46:58 2018 +0000 Bug 21962: (RMaint follow-up) Fixed bad rebase. Signed-off-by: Jesse Maseto (cherry picked from commit b60fa7296b4c54ed30b568cb429a557933c876de) Signed-off-by: Fridolin Somers commit a0653c28f0477772c2752c0026ce56cb34bd2e22 Author: Nick Clemens Date: Thu Dec 6 12:42:45 2018 +0000 Bug 21962: Fix authority search using 'all' To test: 1 - Set search engine to Zebra 2 - Have some authorities and indexes up to date 3 - Search authorities with option 'search entire record' 4 - No results 5 - Apply patch 6 - Run unit tests, they pass! 7 - Repeat search 8 - Results! Signed-off-by: Pierre-Marc Thibault Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 3adf7708d544338250703165fe7e87f2690d8639) Signed-off-by: Martin Renvoize (cherry picked from commit a110125338202f30cec0bc061141d82c80652f30) (cherry picked from commit f6f5de147af71d7ff6f8eb505c58c272d26173ee) Signed-off-by: Fridolin Somers commit cdeb4c8051412184f22eb5665c66da2850941f42 Author: Nick Clemens Date: Thu Dec 6 12:41:41 2018 +0000 Bug 21962: Unit tests Signed-off-by: Pierre-Marc Thibault Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 39c93e87f648978ec7907220710efaf64e556ea0) Signed-off-by: Martin Renvoize (cherry picked from commit d6b7e00b9cd04e15c472b2f7b075d85886ffa3e5) (cherry picked from commit f9a4e3656102d982923989ce49641ff0a267322f) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 3 +++ C4/Circulation.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 2 +- misc/migration_tools/rebuild_zebra.pl | 6 +++--- t/db_dependent/Circulation.t | 8 +++++++- t/db_dependent/Search.t | 8 ++++++-- 6 files changed, 22 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 2 11:38:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Jan 2019 10:38:11 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.13-12-g209b733 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 209b733faecd0189ea95e1556ae547a0f8314ad3 (commit) via 7e21b1fd2d9e72d3b5f94bd111f0f8f2d8d7e104 (commit) via aa0bd18ff1c098a5becaf936d0f187dfec45fa46 (commit) from b74f4e9cce345801a062d81ea7e0dc5a697f975a (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 209b733faecd0189ea95e1556ae547a0f8314ad3 Author: Jonathan Druart Date: Fri Dec 7 14:14:06 2018 -0300 Bug 14334: Remove AutoCommit from tests And use a DBIx transaction instead. Test plan: prove that the test files modified by this patch are passing Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 64242cabea21e9ee7673666cad88eb403d1053d6) Signed-off-by: Martin Renvoize (cherry picked from commit 10148dc26ba801d3f86401dc24a3fb5b6618a02b) Signed-off-by: Lucas Gass (cherry picked from commit 61784f5e2607afaa1a89ee3a4384ea0155bacba0) Signed-off-by: Fridolin Somers commit 7e21b1fd2d9e72d3b5f94bd111f0f8f2d8d7e104 Author: Jonathan Druart Date: Wed Dec 12 11:05:19 2018 -0300 Bug 21986: Do not escape quotation marks when cataloguing In several places we escape quotation marks using $value =~ s/"/"/g; All the occurrences are wrong and must be removed. Most of them are leftover of bug 11638 (Remove HTML from addbiblio.pl), which removes the construction of html from pl scripts. The problem has been highlighted by bug 13618, I did not track down why the issue did not exist before (?) Test plan: 0/ Use strings with quotation marks, like: 'Fiddle tune history : "bad" tunes' You can also use other html characters to make the tests more complete, like 'Fiddle tune history : <"bad" tunes>' 1/ authorities/authorities.pl a. Edit an authority filling different fields with quotation marks b. Edit it again => The display (inputs' values) is wrong, if you save the escaped quotes will be inserted 2/ cataloguing/addbiblio.pl Same editing a bibliographic record 3/ cataloguing/additem.pl Same editing items 4/ members/memberentry.pl Edit a patron's record and fill some fields with quotation marks + fields borrowernotes and opacnotes => The quotes are inserted directly in DB (escape is done before the insert!) 5/ opac/opac-review.pl For QA only: $js_ok_review is never used 6/ tools/batchMod.pl For QA only: $value is always undefined at that point Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit d561273ef84f4bc2534ac63d0f8793c9eb2a7fb9) Signed-off-by: Martin Renvoize (cherry picked from commit 305729fdc04c723b2eb372441500d3151e1a62d3) Signed-off-by: Lucas Gass (cherry picked from commit e2cfc2615c119252e5c317059312c0d020f2924f) Signed-off-by: Fridolin Somers commit aa0bd18ff1c098a5becaf936d0f187dfec45fa46 Author: Jonathan Druart Date: Fri Dec 7 16:49:00 2018 -0300 Bug 21931: Do not reset the ES mapping on 3.23.00.050 This update DB entry uses DBIx schema which does not make it crashes if the table structure is changed. Which happens on 18.06.00.054, that added search_field.weight The entry 3.23.00.050 fails with Unknown column 'me.weight' in 'field list' This patch removes the reset of the mapping and display a warning to tell the administrator the mapping must be reset/inserted Test plan: Use a 3.22 dump and upgrade it Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit e29f0bce403d5d7c1f292d57b105e0a2ab31e01d) Signed-off-by: Martin Renvoize (cherry picked from commit 1fdc679955feb2357c8e897040f9d29cc3df930d) Signed-off-by: Lucas Gass (cherry picked from commit b89e7f3a2741390ca1acf7f254f058883d7b957c) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: authorities/authorities.pl | 2 -- cataloguing/addbiblio.pl | 2 -- cataloguing/additem.pl | 1 - installer/data/mysql/updatedatabase.pl | 11 +++-------- members/memberentry.pl | 1 - opac/opac-review.pl | 3 --- t/db_dependent/Acquisition/FillWithDefaultValues.t | 6 +++--- t/db_dependent/AdditionalField.t | 8 +++----- t/db_dependent/Auth_with_cas.t | 11 +++-------- t/db_dependent/BackgroundJob.t | 8 ++++---- t/db_dependent/Charset.t | 8 ++++---- t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 8 +------- t/db_dependent/Circulation/CheckValidBarcode.t | 8 +++----- t/db_dependent/Circulation/GetHardDueDate.t | 9 +++------ t/db_dependent/Circulation/OfflineOperation.t | 9 +++------ t/db_dependent/ColumnsSettings.t | 8 ++++---- t/db_dependent/Contract.t | 7 +++---- t/db_dependent/Fines.t | 7 ++----- t/db_dependent/Koha/GetDailyQuote.t | 9 +++------ t/db_dependent/Koha/Item/Search/Field.t | 7 +++---- t/db_dependent/Koha_Misc_Files.t | 8 +++----- t/db_dependent/Labels/t_Batch.t | 8 +++----- t/db_dependent/Languages.t | 10 ++++------ t/db_dependent/Letters/GetLetterTemplates.t | 5 +++-- t/db_dependent/Letters/GetLettersAvailableForALibrary.t | 5 +++-- t/db_dependent/MarcModificationTemplates.t | 5 +++-- t/db_dependent/MungeMarcPrice.t | 13 ++++--------- t/db_dependent/NewsChannels.t | 9 +++------ t/db_dependent/Overdues.t | 5 +++-- t/db_dependent/Record.t | 7 +++---- t/db_dependent/Record/marcrecord2csv.t | 5 +++-- t/db_dependent/RotatingCollections.t | 10 +++------- t/db_dependent/Serials.t | 10 +++------- t/db_dependent/Serials/Claims.t | 5 +++-- t/db_dependent/Serials/Frequency.t | 7 +++---- t/db_dependent/Serials/GetNextSeq.t | 8 +++----- t/db_dependent/Serials/Numberpattern.t | 12 ++++++------ t/db_dependent/Stats.t | 9 +++------ t/db_dependent/Virtualshelves.t | 4 +++- t/db_dependent/XISBN.t | 8 +++----- t/db_dependent/sysprefs.t | 8 +++----- tools/batchMod.pl | 3 +-- 42 files changed, 114 insertions(+), 183 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 2 13:57:54 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Jan 2019 12:57:54 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.13-14-g87a7d26 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 87a7d26d62f306d21d5e5df2d70c2ee9f81abbb9 (commit) via 1d5f4aff2419e1c29a3fcd9ebae6b883916a198a (commit) from 209b733faecd0189ea95e1556ae547a0f8314ad3 (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 87a7d26d62f306d21d5e5df2d70c2ee9f81abbb9 Author: Marcel de Rooy Date: Fri Nov 16 09:41:04 2018 +0100 Bug 21848: Remove Text::Unaccent from C4::Members At refactoring time the unac_string call was moved to Koha::Patron. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 5e17032700790032088fe3f2209c3d173e77d540) Signed-off-by: Martin Renvoize (cherry picked from commit 7f4a7c42ad23e84e3dab1cffaaa81f7897171758) Signed-off-by: Lucas Gass (cherry picked from commit 939db7252afc31a4e770d2970d2b0cd94432c0b0) Signed-off-by: Fridolin Somers commit 1d5f4aff2419e1c29a3fcd9ebae6b883916a198a Author: Marcel de Rooy Date: Thu Dec 13 13:07:48 2018 +0100 Bug 21848: Resolve unac_string warning from Circulation.t Just add "use utf8". Test plan: Run Circulation.t; verify there are no warnings. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 3e731ce09433cf2121332f5356b27f90ccb34654) Signed-off-by: Martin Renvoize (cherry picked from commit 4dbb5e636093c9145dc3f3d02de4b119d93b13fb) Signed-off-by: Lucas Gass (cherry picked from commit f8bebfc09a15a5314d2fcd12208cf23a6b566285) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 1 - t/db_dependent/Circulation.t | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 2 16:40:37 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Jan 2019 15:40:37 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.13-16-gae6bf4d 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 ae6bf4d58db401c3d945b5963bff8bfb3ae432cd (commit) via d2ed3b55aa6d473ae8d56b8f9ece55c3ea02d907 (commit) from 87a7d26d62f306d21d5e5df2d70c2ee9f81abbb9 (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 ae6bf4d58db401c3d945b5963bff8bfb3ae432cd Author: Fridolin Somers Date: Wed Jan 2 16:21:56 2019 +0100 Revert "Bug 21848: Resolve unac_string warning from Circulation.t" This reverts commit 1d5f4aff2419e1c29a3fcd9ebae6b883916a198a. commit d2ed3b55aa6d473ae8d56b8f9ece55c3ea02d907 Author: Fridolin Somers Date: Wed Jan 2 16:21:54 2019 +0100 Revert "Bug 21848: Remove Text::Unaccent from C4::Members" This reverts commit 87a7d26d62f306d21d5e5df2d70c2ee9f81abbb9. ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 1 + t/db_dependent/Circulation.t | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 2 22:20:18 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Jan 2019 21:20:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-98-gfb98450 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 fb98450172cbd446768375cd9374962447df7cfe (commit) via 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22 (commit) via d44a42e417b563f501f038cc5226eda0f5fb3ca5 (commit) via 54e295e4c14e3d2b3959e3185a54447a9b90d945 (commit) via ad0575ab80ab550ac936ece84e08cdcf458c9159 (commit) via 464bf007d60bb647ce3dda183134363962c76209 (commit) via a8fa74ab02d037d059e4bf78b74232aeba219212 (commit) via 912fb42458a422248986c74fd8a1fd92df531fb5 (commit) via 5d49ea039c981ee73085c70b326ea47c29bee0ba (commit) via a440f6a4102f73073c76a31ad2d015be2af8ef48 (commit) via e1ae3036e63db085a0e23d1619c44b0b8e91673a (commit) via 364c0d6bc56fc1cb5e6721e2ae3e62be98109a60 (commit) via f3011690fc24dae2c39c2afd4d13afb43ebaecc4 (commit) via 94bdfc2beee9da1ed3b8159e211272a42d01e4fa (commit) via d3ff671f215398ad51a6ce550c33c0c6ca3aa30a (commit) via 85c474e59761e2bb27d9921180752249b5edca9e (commit) via 8748d801099e1c4e4f8f845a69d1cdba4a21e7aa (commit) via ca124b5c14a3f0a34fafe307fec9ade4008eaa41 (commit) from 3f734900f0a86e5478afc22cb77b493500e998e9 (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 fb98450172cbd446768375cd9374962447df7cfe Author: Nick Clemens Date: Wed Jan 2 20:55:54 2019 +0000 Bug 21802: Compiled CSS Signed-off-by: Nick Clemens commit 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22 Author: Jonathan Druart Date: Sun Dec 16 12:58:14 2018 -0300 Bug 21802: Align fieldset with accordion headers when editing notice's template Test plan: Regenerate the css using `yarn css` Edit a notice's template and confirm that the fieldsets are aligned with the accordion headers Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens commit d44a42e417b563f501f038cc5226eda0f5fb3ca5 Author: Jonathan Druart Date: Wed Dec 12 12:22:47 2018 -0300 Bug 21990: Replace dialog .error with .alert
will display a div without background color, the correct class is "dialog alert". https://wiki.koha-community.org/wiki/Interface_patterns#Error_messages Test plan: Hit /cgi-bin/koha/acqui/parcel.pl Notice the background color change with and without this patch Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 54e295e4c14e3d2b3959e3185a54447a9b90d945 Author: Jonathan Druart Date: Thu Dec 20 19:55:46 2018 -0300 Bug 22034: Handle default framework for MARC view with framework To test: - Create a record in any framework that is not default - Search for the record in your catalog - Switch to the MARC tab - Change framework pull down to default on top - Note the page reloads and the framework stay default - Verify it works for other frameworks Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on) Signed-off-by: Nazl? ?etin Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ad0575ab80ab550ac936ece84e08cdcf458c9159 Author: Tomas Cohen Arazi Date: Thu Dec 6 16:27:31 2018 -0300 Bug 21578: Terminology changes in patron's account section (staff) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 464bf007d60bb647ce3dda183134363962c76209 Author: Jonathan Druart Date: Fri Dec 14 17:34:59 2018 -0300 Bug 22007: Generated with add_missing_filters.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit a8fa74ab02d037d059e4bf78b74232aeba219212 Author: Jonathan Druart Date: Fri Dec 14 17:34:52 2018 -0300 Bug 22007: Also handle Price and HtmlTags Those 2 filters should return safe output as well Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 912fb42458a422248986c74fd8a1fd92df531fb5 Author: Jonathan Druart Date: Fri Dec 14 17:29:18 2018 -0300 Bug 22007: Handle safe filtered output (KohaDates) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 5d49ea039c981ee73085c70b326ea47c29bee0ba Author: Jonathan Druart Date: Fri Dec 14 17:20:52 2018 -0300 Bug 22007: Remove html filters when KohaDates called with a parameter Bug 13618 took care of the KohaDates output but not if it is called with a parameter (eg. [% var | $KohaDates with_hours => 1 %]). We could avoid unnecessary processing by removing the extra html filter. Patch generated with the following command: % perl -p -i -e 's/KohaDates([^%\|]*)\s?\|\s?html\s?/KohaDates $1/g' **/*.inc **/*.tt Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit a440f6a4102f73073c76a31ad2d015be2af8ef48 Author: Jonathan Druart Date: Wed Dec 5 18:17:14 2018 -0300 Bug 21928: (bug 18789 follow-up) Fix CircAutoPrintQuickSlip=clear caused by commit 105b3e10e8b31b7de6d733e676c3e661a39b1280 bug 18789 To recreate: 1 - Set CircAutoPrintQuickSlip to 'clear' 2 - Bring up a patron in circulation 3 - Click in checkout box and hit enter to submit empty 4 - Patron is partially loaded 5 - Apply patch 6 - Restart all the things 7 - Test again 8 - Patron is cleared correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit e1ae3036e63db085a0e23d1619c44b0b8e91673a Author: Aleisha Amohia Date: Tue Oct 23 00:06:27 2018 +0000 Bug 16939: (follow-up) Adding missing bracket Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 364c0d6bc56fc1cb5e6721e2ae3e62be98109a60 Author: Owen Leonard Date: Tue May 29 18:09:44 2018 +0000 Bug 16939: (follow-up) Correction for orderreceive.tt This patch makes a change to orderreceive.tt which corresponds to the changes made in the previous patch. To test, apply the patch and set the AcqCreateItem system preference to "receiving an order." - Go to Acquisitions -> Vendor -> Receive shipment. - Submit the "Receive a new shipment" form. - Click "Receive" for an order line. - Fill out the item form and click "Add item." - The table of existing items should display correctly, with a single "Actions" column containing an "Edit" and "Delete" button. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit f3011690fc24dae2c39c2afd4d13afb43ebaecc4 Author: Aleisha Date: Tue Jul 19 05:03:45 2016 +0000 Bug 16939: Making all 'add to basket' actions buttons Edit: Fixing 'clas' typo in addorderiso2709.tt Edit: Adding actions class to td Edit: Fixing js error Edit: circ/reserveratios.tt updated so that the plus icon doesn't show if there is no link Edit: fixing logic in circ/reserveratios.tt Edit: merge conflicts Edit: updating buttons to bootstrap 3, which i believe fixes the problem in comment 16 To test: 1) Go to Acqui -> find a vendor -> view a basket 2) Click add to basket -> fill in 'for an existing record' and hit search 3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons 4) Click Order 5) Click add item when you are redirected to the New order page (no need to fill in any details) 6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons 7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) 8) Confirm that 'Order' shows as a button with appropriate icon 9) Go back to your basket and click add to basket -> from an external source 10) fill in any fields and click search to bring up results 11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row 12) Go back to your basket and click add to basket -> from a staged file 13) 'Add orders' should now show as a button with appropriate icon 14) Go back to your basket and click add to basket -> from titles with highest hold ratios 15) 'X to order' should now show as a button with appropriate icon Sponsored-by: Catalyst IT Signed-off-by: Nicole C Engard Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 94bdfc2beee9da1ed3b8159e211272a42d01e4fa Author: Tomas Cohen Arazi Date: Thu Nov 29 12:15:33 2018 -0300 Bug 21909: Add return type explanation to POD Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d3ff671f215398ad51a6ce550c33c0c6ca3aa30a Author: Tomas Cohen Arazi Date: Thu Nov 29 12:10:21 2018 -0300 Bug 21909: Make Koha::Account::outstanding_* preserve context This patch modifies the methods so they preserve the caller's context (list and scalar). To test: - Apply the first patch - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => FAIL: outstanding_credits and outstanding_debits tests fail - Apply this patch - Run: k$ prove t/db_dependent/Koha/Account.t => SUCCESS: We are so happy now :-D - Sign off :-D Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 85c474e59761e2bb27d9921180752249b5edca9e Author: Tomas Cohen Arazi Date: Thu Nov 29 12:08:03 2018 -0300 Bug 21909: Unit tests This patch introduces regression tests for the behaviour to be introduced. Both outstanding_credits and outstanding_debits methods should return a Koha::Account::Lines object in scalar context, and a list of Koha::Account::Line objects in list context. To test: - Apply this patch - Run $ kshell k$ prove t/db_dependent/Koha/Account.t => FAIL: The current behaviour doesn't match the described Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 8748d801099e1c4e4f8f845a69d1cdba4a21e7aa Author: Jonathan Druart Date: Tue Dec 11 12:28:53 2018 -0300 Bug 21817: Fix 2 failing tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit ca124b5c14a3f0a34fafe307fec9ade4008eaa41 Author: Jonathan Druart Date: Mon Nov 12 18:21:58 2018 -0300 Bug 21817: Centralize the mock of userenv from tests This patch adds a new method mock_userenv from t::lib::Mocks in order to simplify the mock of the userenv. Test plan: prove all the test files modified by this patch Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/Account.pm | 18 ++++-- catalogue/MARCdetail.pl | 3 +- catalogue/labeledMARCdetail.pl | 3 +- circ/circulation.pl | 1 + .../intranet-tmpl/prog/css/src/staff-global.scss | 2 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 ++++---- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 13 ++--- .../prog/en/modules/acqui/neworderempty.tt | 3 +- .../prog/en/modules/acqui/newordersubscription.tt | 8 +-- .../prog/en/modules/acqui/orderreceive.tt | 7 +-- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +- .../prog/en/modules/acqui/z3950_search.tt | 29 ++++++---- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../prog/en/modules/admin/categories.tt | 4 +- .../prog/en/modules/catalogue/issuehistory.tt | 8 +-- .../prog/en/modules/catalogue/search-history.tt | 8 +-- .../prog/en/modules/circ/bookcount.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 16 +++++- .../prog/en/modules/ill/ill-requests.tt | 4 +- .../prog/en/modules/members/accountline-details.tt | 4 +- .../prog/en/modules/members/boraccount.tt | 4 +- .../prog/en/modules/members/mancredit.tt | 4 +- .../prog/en/modules/members/maninvoice.tt | 4 +- .../prog/en/modules/members/moremember-print.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 8 +-- .../prog/en/modules/members/paycollect.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 8 +-- .../en/modules/reports/guided_reports_start.tt | 4 +- .../prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +-- .../bootstrap/en/modules/opac-course-details.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-search-history.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +- t/Budgets/CanUserModifyBudget.t | 18 ++---- t/Budgets/CanUserUseBudget.t | 13 +---- t/Circulation_barcodedecode.t | 4 +- t/LangInstaller/templates/simple.tt | 1 + t/db_dependent/Acquisition/NewOrder.t | 10 ++-- t/db_dependent/ArticleRequests.t | 16 +----- t/db_dependent/Bookseller.t | 6 +- t/db_dependent/Budgets.t | 18 +++--- t/db_dependent/Circulation.t | 5 +- t/db_dependent/Circulation/IsItemIssued.t | 10 +--- .../Circulation/IssuingRules/maxsuspensiondays.t | 10 +--- t/db_dependent/Circulation/MarkIssueReturned.t | 3 +- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 3 +- t/db_dependent/Circulation/TooMany.t | 4 +- t/db_dependent/Circulation/issue.t | 31 ++++------ t/db_dependent/DecreaseLoanHighHolds.t | 4 +- .../Holds/DisallowHoldIfItemsAvailable.t | 4 +- t/db_dependent/Holds/RevertWaitingStatus.t | 8 +-- t/db_dependent/Koha/Account.t | 20 +++++-- t/db_dependent/Koha/Items.t | 3 +- t/db_dependent/Koha/Object.t | 5 +- t/db_dependent/Koha/Patron/Modifications.t | 15 +---- t/db_dependent/Koha/Patrons.t | 59 ++++++-------------- t/db_dependent/Koha/Reviews.t | 14 +---- t/db_dependent/Labels/t_Label.t | 3 +- t/db_dependent/Letters.t | 18 ++---- t/db_dependent/Letters/TemplateToolkit.t | 4 +- t/db_dependent/MarcModificationTemplates.t | 20 +------ t/db_dependent/Members.t | 19 +------ t/db_dependent/Members/Attributes.t | 6 +- t/db_dependent/Patron/Borrower_Discharge.t | 18 ++---- t/db_dependent/Patron/Borrower_PrevCheckout.t | 8 +-- t/db_dependent/PatronLists.t | 4 +- t/db_dependent/Reserves.t | 4 +- t/db_dependent/Template/Plugin/Branches.t | 3 +- t/db_dependent/Utils/Datatables_Members.t | 14 +---- t/db_dependent/Utils/Datatables_Virtualshelves.t | 8 ++- t/db_dependent/rollingloans.t | 4 +- t/lib/Mocks.pm | 25 +++++++++ t/lib/QA/TemplateFilters.pm | 24 +++++++- t/template_filters.t | 45 ++++++++++++++- 87 files changed, 355 insertions(+), 416 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jan 3 15:45:37 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Jan 2019 14:45:37 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.01-7-g1d9b0fa 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 1d9b0fa57efd9a7215b38e5f5b7d30fba788caa6 (commit) via 8b27475331dce6cdd01dd765b1eca0e42a51be5f (commit) via 66502804d2571c473a647cac2ab3e63fa62e1aa8 (commit) via ddfa48bf7029216051da386d211bbd4327a7453b (commit) via af6136fad7e3f777d647724f73fff3c926fbb6ff (commit) via ee0711bac4c175212f80cfb0826e2ce6f3152e60 (commit) from 46d725c128ad238794974dfd2bf35e99e3a5b6bc (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 1d9b0fa57efd9a7215b38e5f5b7d30fba788caa6 Author: Tomas Cohen Arazi Date: Wed Dec 26 12:25:54 2018 -0300 Bug 21547: (follow-up) Rely on Koha::Patron->set_password checks This patch makes the controller just call $patron->set_password and use the exceptions it might raise instead of manually checking the passwor strength. No behaviour change should be expected. It also removes some leftovers. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 3f734900f0a86e5478afc22cb77b493500e998e9) Signed-off-by: Martin Renvoize commit 8b27475331dce6cdd01dd765b1eca0e42a51be5f Author: Marcel de Rooy Date: Thu Oct 11 12:00:31 2018 +0200 Bug 21547: Use set_password in opac-passwd and remove sub goodkey Remove sql statement to change password by calling set_password. Remove sub goodkey by calling C4::Auth::checkpw_hash. Adding the scalar before param Oldkey (from bug 21036). Rebased on top of 21178 (using set_password instead of update_password). Test plan: Try to change password in OPAC with good and bad pw. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 085cfc6bca30718a6d719d645709097cf86f01db) Signed-off-by: Martin Renvoize commit 66502804d2571c473a647cac2ab3e63fa62e1aa8 Author: Andrew Isherwood Date: Sat Dec 1 10:05:38 2018 +0000 Bug 21929: Typo in orderreceive.tt lass -> class Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 3c14a0d3526351fde4d785b5f60117f62edea5a9) Signed-off-by: Martin Renvoize commit ddfa48bf7029216051da386d211bbd4327a7453b Author: Jonathan Druart Date: Tue Oct 16 11:51:40 2018 -0300 Bug 21571: Make ACCTDETAILS translatable This patch makes the notice "ACCTDETAILS" translatable. Test plan: 1. Switch on TranslateNotices and AutoEmailOpacUser 2. Define templates for different languages for ACCTDETAILS 3. Create a new patron, define an email address, userid and password. Also pick a different "preferred language" then the default value 4. You should receive the email with the correct, translated, email. Signed-off-by: Hugo Agud Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a200aafd3b181b736dc288e208730a50372fbfd8) Signed-off-by: Martin Renvoize commit af6136fad7e3f777d647724f73fff3c926fbb6ff Author: Julian Maurice Date: Wed Dec 16 01:25:44 2015 +0100 Bug 21789: Example usage of I18N Template::Toolkit plugin Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 727f33d858e50d26dfb60cec516533d0c4107d2a) Signed-off-by: Martin Renvoize commit ee0711bac4c175212f80cfb0826e2ce6f3152e60 Author: Jonathan Druart Date: Thu Dec 20 18:55:34 2018 -0300 Bug 22033: Remove related_resultset from the list of available methods It is not covered by tests. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit ccbed38e213de6a6b9331fc34d2f872bf5ab5fc7) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 1 + C4/Search.pm | 1 - Koha/Object.pm | 4 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 3 +- opac/opac-passwd.pl | 47 ++++++-------------- 6 files changed, 19 insertions(+), 39 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jan 3 20:22:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Jan 2019 19:22:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-108-g224718b 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 224718b3adee28d33999379b0ebab1092ae88169 (commit) via 73aa20afd0ed62c9af9d379bc9c002f13d673098 (commit) via d18c992c5af8d4a97baf273798a3de67d4b3fb2a (commit) via faafdb53b7c3614420bae1df1b023ad4cb64db2e (commit) via 48dab3c1261870bf23c01eda3b57aa76a9814250 (commit) via 040d5c57e7fb8976588c25d24ba288f52a83af95 (commit) via 485584d2ccb05a25384aa28431b11f01a5ad22b0 (commit) via 258720579bff87b4e4b5386261f9a7669068a0fd (commit) via 897ddc82b34b18576e4a2dd459691111836d6357 (commit) via bf75f243512364a6b83ebe766105bf444bc43097 (commit) from fb98450172cbd446768375cd9374962447df7cfe (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 224718b3adee28d33999379b0ebab1092ae88169 Author: Nick Clemens Date: Thu Jan 3 18:56:14 2019 +0000 Bug 19066: DBRev 18.12.00.004 Signed-off-by: Nick Clemens commit 73aa20afd0ed62c9af9d379bc9c002f13d673098 Author: Nick Clemens Date: Thu Jan 3 18:55:50 2019 +0000 Bug 19066: (RM follow-up) Fix test count and structure error Signed-off-by: Nick Clemens commit d18c992c5af8d4a97baf273798a3de67d4b3fb2a Author: Martin Renvoize Date: Mon Dec 17 11:15:50 2018 +0000 Bug 19066: (QA follow-up) Define foreign key for branchcode Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit faafdb53b7c3614420bae1df1b023ad4cb64db2e Author: Tomas Cohen Arazi Date: Thu Nov 8 11:15:25 2018 -0300 Bug 19066: Add tests for Koha::Account->pay This patch adds tests for Koha::Account->pay, to make sure the library_id param is used to set the branchcode attribute. The use of userenv to set branchcode if library_id not passed is removed. Responsability is left to the callers to pass library_id. To test: - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => SUCCESS: Tests pass! Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 48dab3c1261870bf23c01eda3b57aa76a9814250 Author: Tomas Cohen Arazi Date: Wed Nov 7 17:06:26 2018 -0300 Bug 19066: (QA follow-up) Fix ChargeReserveFee This patch fixes a bug in ChargeReserveFee: To test: - Run: $ kshell k$ prove t/db_dependent/Reserves.t => FAIL: Tests fail because branchcode is not set - Apply this patch - Run: k$ prove t/db_dependent/Reserves.t => SUCCESS: Tests pass! Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 040d5c57e7fb8976588c25d24ba288f52a83af95 Author: Tomas Cohen Arazi Date: Wed Nov 7 17:05:25 2018 -0300 Bug 19066: Tests for AddRenewal AddIssuingCharge and ChargeReserveFee This patch adds some tests that cover functions changed by this patchset. A bug in ChargeReserveFee is highlighted. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 485584d2ccb05a25384aa28431b11f01a5ad22b0 Author: Kyle M Hall Date: Fri Nov 2 14:38:56 2018 -0400 Bug 19066: (QA follow-up) Remove bad and unecessary test Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 258720579bff87b4e4b5386261f9a7669068a0fd Author: Martin Renvoize Date: Fri Nov 2 15:10:44 2018 +0000 Bug 19066: (QA follow-up) Add handling in add_credit Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 897ddc82b34b18576e4a2dd459691111836d6357 Author: Kyle M Hall Date: Wed Aug 9 16:55:56 2017 +0000 Bug 19066: Add branchcode to accountlines For the purposes of statistics, it appears that it would help many libraries to have branchcode recorded in the accountlines table. For payments, the field would contain the code for the branch the payment was made at. For manual invoices, it would be the code of the library that created the invoice. Test Plan: 1) Apply this patch set 2) Create and pay some fees 3) Note the branchcode for those fees and payments is set to your logged in branch Signed-off-by: Lisette Scheer Signed-off-by: Lisette Scheer Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit bf75f243512364a6b83ebe766105bf444bc43097 Author: Kyle M Hall Date: Wed Aug 9 09:50:21 2017 -0400 Bug 19066: Update Database Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Squashing for cleaner history Bug 19066: (QA follow-up) Move db update to perl Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 8 +++ C4/Circulation.pm | 34 ++++++++---- C4/Reserves.pm | 26 ++++++--- Koha.pm | 2 +- Koha/Account.pm | 9 ++-- Koha/Schema/Result/Accountline.pm | 33 +++++++++++- Koha/Schema/Result/Branch.pm | 19 ++++++- installer/data/mysql/kohastructure.sql | 5 +- installer/data/mysql/updatedatabase.pl | 10 ++++ t/db_dependent/Accounts.t | 40 +++++++++++++- t/db_dependent/Circulation.t | 90 +++++++++++++++++++++++++++++++- t/db_dependent/Koha/Account.t | 29 +++++++++- t/db_dependent/Reserves.t | 27 +++++++++- 13 files changed, 301 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jan 3 22:51:12 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Jan 2019 21:51:12 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.07-21-g3d3a3bb 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 3d3a3bbe92926f61f3b93e6f0bd7e4f6742083fc (commit) from 939db7252afc31a4e770d2970d2b0cd94432c0b0 (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 3d3a3bbe92926f61f3b93e6f0bd7e4f6742083fc Author: Jonathan Druart Date: Tue Oct 16 11:51:40 2018 -0300 Bug 21571: Make ACCTDETAILS translatable This patch makes the notice "ACCTDETAILS" translatable. Test plan: 1. Switch on TranslateNotices and AutoEmailOpacUser 2. Define templates for different languages for ACCTDETAILS 3. Create a new patron, define an email address, userid and password. Also pick a different "preferred language" then the default value 4. You should receive the email with the correct, translated, email. Signed-off-by: Hugo Agud Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a200aafd3b181b736dc288e208730a50372fbfd8) Signed-off-by: Martin Renvoize (cherry picked from commit ddfa48bf7029216051da386d211bbd4327a7453b) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jan 4 23:06:46 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 04 Jan 2019 22:06:46 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.07-22-g42c69b2 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 42c69b2ca66f8b963fd1eb23f8bc0bd02afc6c04 (commit) from 3d3a3bbe92926f61f3b93e6f0bd7e4f6742083fc (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 42c69b2ca66f8b963fd1eb23f8bc0bd02afc6c04 Author: Andrew Isherwood Date: Sat Dec 1 10:05:38 2018 +0000 Bug 21929: Typo in orderreceive.tt lass -> class Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 3c14a0d3526351fde4d785b5f60117f62edea5a9) Signed-off-by: Martin Renvoize (cherry picked from commit 66502804d2571c473a647cac2ab3e63fa62e1aa8) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jan 7 16:25:57 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Jan 2019 15:25:57 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.01-13-g25a22f2 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 25a22f2e639d368cff4813043130e29e53ab6940 (commit) via 86c2e32296432dfed63cf2ad2e9aa4cf3f1745fc (commit) via 52c696006cc40ab6e38734f7cf255e614f8c92ce (commit) via 5cc46f9b9cb196c0d242c8c5a08cb88da7c5bd95 (commit) via c24fded0f973782e1e706cde17fa30aa80219fa7 (commit) via 336fedc15dc1ec0e826388abaa317ceaaac16614 (commit) from 1d9b0fa57efd9a7215b38e5f5b7d30fba788caa6 (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 25a22f2e639d368cff4813043130e29e53ab6940 Author: Jonathan Druart Date: Wed Dec 5 18:17:14 2018 -0300 Bug 21928: (bug 18789 follow-up) Fix CircAutoPrintQuickSlip=clear caused by commit 105b3e10e8b31b7de6d733e676c3e661a39b1280 bug 18789 To recreate: 1 - Set CircAutoPrintQuickSlip to 'clear' 2 - Bring up a patron in circulation 3 - Click in checkout box and hit enter to submit empty 4 - Patron is partially loaded 5 - Apply patch 6 - Restart all the things 7 - Test again 8 - Patron is cleared correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a440f6a4102f73073c76a31ad2d015be2af8ef48) Signed-off-by: Martin Renvoize commit 86c2e32296432dfed63cf2ad2e9aa4cf3f1745fc Author: Tomas Cohen Arazi Date: Thu Nov 29 12:15:33 2018 -0300 Bug 21909: Add return type explanation to POD Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 94bdfc2beee9da1ed3b8159e211272a42d01e4fa) Signed-off-by: Martin Renvoize commit 52c696006cc40ab6e38734f7cf255e614f8c92ce Author: Tomas Cohen Arazi Date: Thu Nov 29 12:10:21 2018 -0300 Bug 21909: Make Koha::Account::outstanding_* preserve context This patch modifies the methods so they preserve the caller's context (list and scalar). To test: - Apply the first patch - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => FAIL: outstanding_credits and outstanding_debits tests fail - Apply this patch - Run: k$ prove t/db_dependent/Koha/Account.t => SUCCESS: We are so happy now :-D - Sign off :-D Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit d3ff671f215398ad51a6ce550c33c0c6ca3aa30a) Signed-off-by: Martin Renvoize commit 5cc46f9b9cb196c0d242c8c5a08cb88da7c5bd95 Author: Tomas Cohen Arazi Date: Thu Nov 29 12:08:03 2018 -0300 Bug 21909: Unit tests This patch introduces regression tests for the behaviour to be introduced. Both outstanding_credits and outstanding_debits methods should return a Koha::Account::Lines object in scalar context, and a list of Koha::Account::Line objects in list context. To test: - Apply this patch - Run $ kshell k$ prove t/db_dependent/Koha/Account.t => FAIL: The current behaviour doesn't match the described Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 85c474e59761e2bb27d9921180752249b5edca9e) Signed-off-by: Martin Renvoize commit c24fded0f973782e1e706cde17fa30aa80219fa7 Author: Jonathan Druart Date: Tue Dec 11 12:28:53 2018 -0300 Bug 21817: Fix 2 failing tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8748d801099e1c4e4f8f845a69d1cdba4a21e7aa) Signed-off-by: Martin Renvoize commit 336fedc15dc1ec0e826388abaa317ceaaac16614 Author: Jonathan Druart Date: Mon Nov 12 18:21:58 2018 -0300 Bug 21817: Centralize the mock of userenv from tests This patch adds a new method mock_userenv from t::lib::Mocks in order to simplify the mock of the userenv. Test plan: prove all the test files modified by this patch Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit ca124b5c14a3f0a34fafe307fec9ade4008eaa41) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Account.pm | 18 ++++-- circ/circulation.pl | 1 + t/Budgets/CanUserModifyBudget.t | 18 ++---- t/Budgets/CanUserUseBudget.t | 13 +---- t/Circulation_barcodedecode.t | 4 +- t/db_dependent/Acquisition/NewOrder.t | 10 ++-- t/db_dependent/ArticleRequests.t | 16 +----- t/db_dependent/Bookseller.t | 6 +- t/db_dependent/Budgets.t | 18 +++--- t/db_dependent/Circulation.t | 5 +- t/db_dependent/Circulation/IsItemIssued.t | 10 +--- .../Circulation/IssuingRules/maxsuspensiondays.t | 10 +--- t/db_dependent/Circulation/MarkIssueReturned.t | 3 +- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 3 +- t/db_dependent/Circulation/TooMany.t | 4 +- t/db_dependent/Circulation/issue.t | 31 ++++------ t/db_dependent/DecreaseLoanHighHolds.t | 4 +- .../Holds/DisallowHoldIfItemsAvailable.t | 4 +- t/db_dependent/Holds/RevertWaitingStatus.t | 8 +-- t/db_dependent/Koha/Account.t | 20 +++++-- t/db_dependent/Koha/Items.t | 3 +- t/db_dependent/Koha/Object.t | 5 +- t/db_dependent/Koha/Patron/Modifications.t | 15 +---- t/db_dependent/Koha/Patrons.t | 59 ++++++-------------- t/db_dependent/Koha/Reviews.t | 14 +---- t/db_dependent/Labels/t_Label.t | 3 +- t/db_dependent/Letters.t | 18 ++---- t/db_dependent/Letters/TemplateToolkit.t | 4 +- t/db_dependent/MarcModificationTemplates.t | 20 +------ t/db_dependent/Members.t | 19 +------ t/db_dependent/Members/Attributes.t | 6 +- t/db_dependent/Patron/Borrower_Discharge.t | 18 ++---- t/db_dependent/Patron/Borrower_PrevCheckout.t | 8 +-- t/db_dependent/PatronLists.t | 4 +- t/db_dependent/Reserves.t | 4 +- t/db_dependent/Template/Plugin/Branches.t | 3 +- t/db_dependent/Utils/Datatables_Members.t | 14 +---- t/db_dependent/Utils/Datatables_Virtualshelves.t | 8 ++- t/db_dependent/rollingloans.t | 4 +- t/lib/Mocks.pm | 25 +++++++++ 40 files changed, 162 insertions(+), 298 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jan 7 16:57:54 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Jan 2019 15:57:54 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.01-21-g965d86e 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 965d86ecf804f4e761282ece8994e492e8084f0a (commit) via 8e73dc678ff8e5b902f1cbbf97fe9eec1b305c8b (commit) via 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1 (commit) via 270138aa678e858b835f65f5533e6b182e07ac76 (commit) via 5a255af085c126a5b7610a08ed6153e1cfc3087c (commit) via bfe255f8619996749b3996d96fc747862a637aa0 (commit) via dbb15a2c977890f0f57d6ef12091ef1ce571bf40 (commit) via b6cf429827da2c8ca0e8d0827e85355a8ae9b5de (commit) from 25a22f2e639d368cff4813043130e29e53ab6940 (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 965d86ecf804f4e761282ece8994e492e8084f0a Author: Martin Renvoize Date: Mon Jan 7 15:41:32 2019 +0000 Bug 21802: Compiled CSS Signed-off-by: Martin Renvoize commit 8e73dc678ff8e5b902f1cbbf97fe9eec1b305c8b Author: Jonathan Druart Date: Sun Dec 16 12:58:14 2018 -0300 Bug 21802: Align fieldset with accordion headers when editing notice's template Test plan: Regenerate the css using `yarn css` Edit a notice's template and confirm that the fieldsets are aligned with the accordion headers Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens (cherry picked from commit 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22) Signed-off-by: Martin Renvoize commit 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1 Author: Jonathan Druart Date: Wed Dec 12 12:22:47 2018 -0300 Bug 21990: Replace dialog .error with .alert
will display a div without background color, the correct class is "dialog alert". https://wiki.koha-community.org/wiki/Interface_patterns#Error_messages Test plan: Hit /cgi-bin/koha/acqui/parcel.pl Notice the background color change with and without this patch Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit d44a42e417b563f501f038cc5226eda0f5fb3ca5) Signed-off-by: Martin Renvoize commit 270138aa678e858b835f65f5533e6b182e07ac76 Author: Jonathan Druart Date: Thu Dec 20 19:55:46 2018 -0300 Bug 22034: Handle default framework for MARC view with framework To test: - Create a record in any framework that is not default - Search for the record in your catalog - Switch to the MARC tab - Change framework pull down to default on top - Note the page reloads and the framework stay default - Verify it works for other frameworks Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on) Signed-off-by: Nazl? ?etin Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 54e295e4c14e3d2b3959e3185a54447a9b90d945) Signed-off-by: Martin Renvoize commit 5a255af085c126a5b7610a08ed6153e1cfc3087c Author: Jonathan Druart Date: Fri Dec 14 17:34:59 2018 -0300 Bug 22007: Generated with add_missing_filters.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 464bf007d60bb647ce3dda183134363962c76209) Signed-off-by: Martin Renvoize commit bfe255f8619996749b3996d96fc747862a637aa0 Author: Jonathan Druart Date: Fri Dec 14 17:34:52 2018 -0300 Bug 22007: Also handle Price and HtmlTags Those 2 filters should return safe output as well Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a8fa74ab02d037d059e4bf78b74232aeba219212) Signed-off-by: Martin Renvoize commit dbb15a2c977890f0f57d6ef12091ef1ce571bf40 Author: Jonathan Druart Date: Fri Dec 14 17:29:18 2018 -0300 Bug 22007: Handle safe filtered output (KohaDates) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 912fb42458a422248986c74fd8a1fd92df531fb5) Signed-off-by: Martin Renvoize commit b6cf429827da2c8ca0e8d0827e85355a8ae9b5de Author: Jonathan Druart Date: Fri Dec 14 17:20:52 2018 -0300 Bug 22007: Remove html filters when KohaDates called with a parameter Bug 13618 took care of the KohaDates output but not if it is called with a parameter (eg. [% var | $KohaDates with_hours => 1 %]). We could avoid unnecessary processing by removing the extra html filter. Patch generated with the following command: % perl -p -i -e 's/KohaDates([^%\|]*)\s?\|\s?html\s?/KohaDates $1/g' **/*.inc **/*.tt Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 5d49ea039c981ee73085c70b326ea47c29bee0ba) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: catalogue/MARCdetail.pl | 3 +- catalogue/labeledMARCdetail.pl | 3 +- .../intranet-tmpl/prog/css/src/staff-global.scss | 2 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 +++++------ .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../prog/en/modules/admin/categories.tt | 4 +- .../prog/en/modules/catalogue/issuehistory.tt | 8 ++-- .../prog/en/modules/catalogue/search-history.tt | 8 ++-- .../prog/en/modules/circ/bookcount.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 4 +- .../prog/en/modules/members/accountline-details.tt | 4 +- .../prog/en/modules/members/moremember-print.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 8 ++-- .../en/modules/reports/guided_reports_start.tt | 4 +- .../prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../bootstrap/en/modules/opac-course-details.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-search-history.tt | 8 ++-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +- t/LangInstaller/templates/simple.tt | 1 + t/lib/QA/TemplateFilters.pm | 24 +++++++++-- t/template_filters.t | 45 +++++++++++++++++++- 37 files changed, 134 insertions(+), 74 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jan 8 08:18:36 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Jan 2019 07:18:36 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.13-17-g92f5aea 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 92f5aead92f1ef1c6af30682779d7c7f3e95a8aa (commit) from ae6bf4d58db401c3d945b5963bff8bfb3ae432cd (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 92f5aead92f1ef1c6af30682779d7c7f3e95a8aa Author: Jonathan Druart Date: Tue Oct 16 11:51:40 2018 -0300 Bug 21571: Make ACCTDETAILS translatable This patch makes the notice "ACCTDETAILS" translatable. Test plan: 1. Switch on TranslateNotices and AutoEmailOpacUser 2. Define templates for different languages for ACCTDETAILS 3. Create a new patron, define an email address, userid and password. Also pick a different "preferred language" then the default value 4. You should receive the email with the correct, translated, email. Signed-off-by: Hugo Agud Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a200aafd3b181b736dc288e208730a50372fbfd8) Signed-off-by: Martin Renvoize (cherry picked from commit ddfa48bf7029216051da386d211bbd4327a7453b) Signed-off-by: Lucas Gass (cherry picked from commit 3d3a3bbe92926f61f3b93e6f0bd7e4f6742083fc) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jan 8 17:10:04 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Jan 2019 16:10:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-122-g986a52d 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 986a52d718d4219f32a79a045d5867a3d70092d5 (commit) via 814078ab401900a118558b828a9dc796c9a81c87 (commit) via 4c742b59f75cf56a844b0b8eed1b15a0313a7783 (commit) via 55f042762939755537a3b9a4b578d55ff9c517ba (commit) via a03eed982bdd28a49f688c742d9e28a780ef12a6 (commit) via 3607fdfe7966b4db8cb69331f097278d09363fd2 (commit) via b32756a5d7819e13290c2a145f3f0009280785c4 (commit) via f44e37b201d0a8b95b1eee0ac0766bed9c386fc2 (commit) via 70abd7698f02a7da791490607f43df9f781390d2 (commit) via 96adab7af8999da7f351169e1265d4be5e59742f (commit) via 482b323da1e18324941963359b9a1bd96f297c44 (commit) via c9c3fc4368ee9d37a45c48167d25d5cee511898b (commit) via 4d671103f420f1c0b80bcbf13be613b69e2aa4f9 (commit) via 3ef3ecfe99e219fda854ca57c652e3c52a7f47d7 (commit) from 224718b3adee28d33999379b0ebab1092ae88169 (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 986a52d718d4219f32a79a045d5867a3d70092d5 Author: Tomas Cohen Arazi Date: Thu Dec 27 11:40:12 2018 -0300 Bug 21786: (QA follow-up) library_id can be null Signed-off-by: Tomas Cohen Arazi Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit 814078ab401900a118558b828a9dc796c9a81c87 Author: Tomas Cohen Arazi Date: Fri Nov 9 16:29:43 2018 -0300 Bug 21786: Make balance and credits endpoints handle library_id This patch: - Adds the branchcode <-> library_id mapping in the controller - Adds 'library_id' to the credit and account_line definitions - Makes add_credit handle the library_id param, passing it to the underlying $account->add_credit method. To test: - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => FAIL: Tests fail, because library_id is not mapped (balance) and because it is not handled when adding a credit. - Apply this patch - Run: k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit 4c742b59f75cf56a844b0b8eed1b15a0313a7783 Author: Tomas Cohen Arazi Date: Fri Nov 9 16:29:15 2018 -0300 Bug 21786: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit 55f042762939755537a3b9a4b578d55ff9c517ba Author: Tomas Cohen Arazi Date: Fri Nov 9 16:35:31 2018 -0300 Bug 21786: Add library_id to the spec definitions Signed-off-by: Kyle M Hall Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit a03eed982bdd28a49f688c742d9e28a780ef12a6 Author: Nick Clemens Date: Tue Jan 8 14:27:55 2019 +0000 Bug 21813: Compiled CSS Signed-off-by: Nick Clemens commit 3607fdfe7966b4db8cb69331f097278d09363fd2 Author: Owen Leonard Date: Mon Nov 12 17:35:25 2018 +0000 Bug 21813: In-page JavaScript causes error on patron entry page This patch removes a block of JavaScript from memberentrygen.tt which was being included in the page before jQuery is loaded. This causes a JavaScript error. To test, apply the patch, regenerate CSS, and clear your browser cache if necessary. - In Administration -> Patron categories, confirm that you have two patron categories with different default messaging preferences defined. - Go to Patrons -> New patron - Create a new patron using one of the categories with messaging preferences. - Confirm that when you switch the category selection to the other patron category, the patron messaging preference checkboxes are changed to the default for that category. - A "Loading" indicator should appear above the checkboxes to show that an operation is in process. It should disappear when new default prefs are loaded. - Manually change one or more patron messaging preference checkboxes. - Switch the patron category again and confirm that you are prompted to confirm resetting the preferences to the default for that category. - Perform the same set of tests when editing a patron. - Defaults should not be loaded during the edit process. - Confirm that there are no other JavaScript errors in the console. - Test again with EnhancedMessagingPreferences disabled. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Lucas Gass Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b32756a5d7819e13290c2a145f3f0009280785c4 Author: Nick Clemens Date: Fri Dec 28 18:48:25 2018 +0000 Bug 22052: Refactor DeleteExpiredOpacReigstrations This patch changes the sub to use Koha::Objects and updates the tests. Previously the sub would die on borrowers with checkouts and would delete borrowers if they had fines To test: 1 - prove -v t/db_dependent/ 2 - Set your selfreg preferences: PatronSelfRegistration: Allow PatronSelfRegistrationDefaultCategory: SELFREG (or of your choice) PatronSelfRegistrationExpireTemporaryAccountsDelay: 30 3 - Register a patron into SELFREG or how you set above 4 - Set their date enrolled to two months ago 5 - Checkout an item to the patron 6 - Issue a fine to that patron 7 - perl misc/cronjobs/cleanup_database.pl --del-exp-selfreg -v 8 - The job should die with an error 9 - Check in the item 10 - run the corn again - patron is deleted, oops 11 - Apply patch 12 - Create another patron in the same way 13 - Checkout and fine the patron 14 - run the cron 15 - they are not deleted, and no error 16 - checkin the item 17 - run the cron 18 - they are not deleted and no error 19 - clear the fine 20 - run the cron 21 - patron is deleted, huzzah Signed-off-by: Charles Farmer Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit f44e37b201d0a8b95b1eee0ac0766bed9c386fc2 Author: Nick Clemens Date: Fri Dec 28 18:48:15 2018 +0000 Bug 22052: Unit tests Signed-off-by: Charles Farmer Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens commit 70abd7698f02a7da791490607f43df9f781390d2 Author: Nick Clemens Date: Tue Jan 8 14:01:45 2019 +0000 Bug 22030: DBRev 18.12.00.005 Signed-off-by: Nick Clemens commit 96adab7af8999da7f351169e1265d4be5e59742f Author: Nick Clemens Date: Wed Dec 19 17:53:08 2018 +0000 Bug 22030: Use preference to determine username sent to overdrive Overdrive configuration generally defaults to cardnumber, however, they have confirmed that some libraries use usernames. We need to allow for both scenarios. To test: 1 - Have an OverDrive account setup with SIP authentication Note: You can apply for a testing account at developer.overdrive.com and setup an environment 2 - Fill in all your OverDrive system preferences 3 - Test with a patron whose username is their cardnumber 4 - Confirm their overdrive account tab on opac loads 5 - Change the username to be another value like "borked_wont_work" 6 - Note the overdrive account tab won't load 7 - Apply patch, update database, not new system preference OverDriveUsername (default to 'cardnumber) 8 - Note the OD account loads successfully 9 - Change the system preference to 'user name' - the account load fails Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 482b323da1e18324941963359b9a1bd96f297c44 Author: Marcel de Rooy Date: Thu Dec 13 14:59:38 2018 +0100 Bug 21605: (follow-up) Simple ternary boolean to number conversion Imo it is much easier to do just "$a ? 1 : 0" than testing defined($a) etc. in the additional loop. Less code, more readable? Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit c9c3fc4368ee9d37a45c48167d25d5cee511898b Author: Colin Campbell Date: Fri Oct 26 10:42:13 2018 +0100 Bug 21605: Ensure EDI acct fields set to boolean val Validate the input to the fields indicating account functionality. The only valid values are 1 and 0 non-integer (or integers other than 0/1) are invalid Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 4d671103f420f1c0b80bcbf13be613b69e2aa4f9 Author: Tomas Cohen Arazi Date: Wed Jan 2 09:56:52 2019 -0300 Bug 22059: Fix exception params in Koha::Patron->set_password This simple patch fixes a wrong call to ->throw. Parameters shouldn't be enclosed in curly brackets. To test: - Apply the tests patch - Run: $ kshell k$ prove t/db_dependent/Koha/Patrons.t => FAIL: Tests fail because the throw call is wrong - Apply this patch - Run: k$ prove t/db_dependent/Koha/Patrons.t => SUCCESS: Tests pass! -Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3ef3ecfe99e219fda854ca57c652e3c52a7f47d7 Author: Tomas Cohen Arazi Date: Wed Jan 2 09:56:21 2019 -0300 Bug 22059: regression tests Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 40 ++++++++-------- Koha.pm | 2 +- Koha/Patron.pm | 2 +- Koha/REST/V1/Patrons/Account.pm | 6 ++- admin/edi_accounts.pl | 10 ++-- api/v1/swagger/definitions/account_line.json | 7 +++ .../swagger/definitions/patron_account_credit.json | 4 ++ installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 10 ++++ .../intranet-tmpl/prog/css/src/staff-global.scss | 9 ++++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../admin/preferences/enhanced_content.pref | 6 +++ .../prog/en/modules/members/memberentrygen.tt | 50 ++------------------ .../prog/js/messaging-preference-form.js | 48 +++++++++++++++++++ opac/svc/overdrive | 8 +++- t/db_dependent/Koha/Patrons.t | 6 ++- t/db_dependent/Members.t | 35 ++++++++++++-- t/db_dependent/api/v1/patrons_accounts.t | 18 +++++-- 18 files changed, 180 insertions(+), 84 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 9 00:46:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Jan 2019 23:46:00 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.07-23-g5f1ed5e 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 5f1ed5e86fb295941a49e39d7b7e5c728f9b3627 (commit) from 42c69b2ca66f8b963fd1eb23f8bc0bd02afc6c04 (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 5f1ed5e86fb295941a49e39d7b7e5c728f9b3627 Author: Jonathan Druart Date: Wed Dec 5 18:17:14 2018 -0300 Bug 21928: (bug 18789 follow-up) Fix CircAutoPrintQuickSlip=clear caused by commit 105b3e10e8b31b7de6d733e676c3e661a39b1280 bug 18789 To recreate: 1 - Set CircAutoPrintQuickSlip to 'clear' 2 - Bring up a patron in circulation 3 - Click in checkout box and hit enter to submit empty 4 - Patron is partially loaded 5 - Apply patch 6 - Restart all the things 7 - Test again 8 - Patron is cleared correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a440f6a4102f73073c76a31ad2d015be2af8ef48) Signed-off-by: Martin Renvoize (cherry picked from commit 25a22f2e639d368cff4813043130e29e53ab6940) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jan 9 02:28:46 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 09 Jan 2019 01:28:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-142-g4e6d64c 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 4e6d64c16361ec3c00813c291b56ecf5657eff1f (commit) via 277bd25b45e925f0af13f274ceb52a1af4e739cd (commit) via 1aa9625c5b983d5a7f10b7ed87db848b8c2a654c (commit) via aa71519660a43cebc734763e4821818dfc636775 (commit) via 28de85db4060604e7cca7dbb74e9da984e2e6451 (commit) via 7185a96ca601905c291ea5b164332486bb4a14af (commit) via 10f78fcb2efec81b3c2024c97dbb55b21a3c14a8 (commit) via 38530140176ddcb2f9d2ded7dea5382f4816e12f (commit) via 0693052bfcd0b4259eb620233550f81eab49eabd (commit) via 0c43fa326afa23ef9c98ae2e7b464f6a0e55d880 (commit) via 49c9e93292b2f694857edc66e913b9f65d081e8b (commit) via 6d42f6e72c20bad116454b81ee512024179b7387 (commit) via 551626ce1e82286414c4a77c83febdcfbc99741a (commit) via 0d5058b7b29d90cc7c8e533ee56388fbb5a96d52 (commit) via 613a0034e08af84af1e2198156bbfc6900ba6551 (commit) via 2067b8e3f8cb363370897ff179bcdbf5c97cbbbb (commit) via 8009a8f462b05c2885fa4126dcba2ef0185f54f2 (commit) via 4ef8bfee3f5da810738607498068ea719d533378 (commit) via 5c313bc554a857da29f124957d58459c0ed4c03b (commit) via 17a8eb187959625ef67eea9999588fe502443691 (commit) from 986a52d718d4219f32a79a045d5867a3d70092d5 (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 4e6d64c16361ec3c00813c291b56ecf5657eff1f Author: Nick Clemens Date: Fri Jan 4 03:08:14 2019 +0000 Bug 21753: DBRev 18.12.00.007 Signed-off-by: Nick Clemens commit 277bd25b45e925f0af13f274ceb52a1af4e739cd Author: Marcel de Rooy Date: Thu Nov 29 12:49:50 2018 +0100 Bug 21753: (QA follow-up) Remove fourth %s in sprintf Trivial. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 1aa9625c5b983d5a7f10b7ed87db848b8c2a654c Author: Martin Renvoize Date: Fri Nov 2 10:04:46 2018 +0000 Bug 21753: Update to remove the field from the database Signed-off-by: Aleisha Amohia Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit aa71519660a43cebc734763e4821818dfc636775 Author: Martin Renvoize Date: Fri Nov 2 09:42:53 2018 +0000 Bug 21753: Remove all reference of chargename from scripts Signed-off-by: Aleisha Amohia Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 28de85db4060604e7cca7dbb74e9da984e2e6451 Author: Martin Renvoize Date: Mon Dec 10 12:02:41 2018 +0000 Bug 21980: Add new exceptions for Koha::Account He add two new exceptions here; One to be thrown when negative 'amount' is passed into verious account methods that always expect positive decimals and another to be thrown when a bad 'type' is passed into an account method. Sponsored-by: PTFS Europe Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 7185a96ca601905c291ea5b164332486bb4a14af Author: Owen Leonard Date: Fri May 4 14:25:16 2018 +0000 Bug 21436: Update two-column templates with Bootstrap grid: Tools part 4 This patch modifies several tools templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from