From gitmaster at git.koha-community.org Mon Oct 2 00:41:01 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 01 Oct 2017 22:41:01 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-33-g96fa3f5 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, 16.11.x has been updated via 96fa3f51e142a6ef0538aa84e5134a56aa7af750 (commit) via 915f5d1ca18eafac9e0ba633e86e3bece8d12a5e (commit) via acf28ae38c885cb0e59013c743841ef92b662f83 (commit) via 0c30269d9eed47749b97275b35dfe3ba5dd2cbc2 (commit) via db9975db23c98d6a131a42f91e31796c8be179cf (commit) via c583929799f87e7092cad06a4e1cc1855630411a (commit) via df8a9f82a6cf8fba92cbee9c171410fe01d500de (commit) via b0d86d10443809f3762bdac75a59d704f1a3976b (commit) via 3e23ffe5845c44008cf462e8dfd8d4c78a755561 (commit) via ba61c6b8054b34c58dc5914088c200fac529c402 (commit) via 2ea0bac58bbe58f5fb53e66829e217ca87799928 (commit) via 1c0f36468749af352caac6e861a0ed514698adec (commit) via f3571db3365e7b6d3a25133e146992d73df38280 (commit) via 7042e2ce9d9db6f0704befe35c2289ac36fd35c4 (commit) via 091ef48f4240724877a0b492aa1d6e11aa51a502 (commit) via b6cc1f06b6cf0a277b20af882a485fb4fe4b3604 (commit) via 5e7897f21c844016a586fdef53885a56bbb0b678 (commit) via b6632784b4f4c2f2352e064bd9c38cb43973af47 (commit) via 936bcce4ba9c15d45f241cbce80e489a043687da (commit) via 3fcfb2c00326697955be7cd0d747e3d5feb4450c (commit) via aefcb510aee6452034f4f2a7f6c536e5cbb73e40 (commit) via 3b0827ef4f6da188d4c140834794d52614fc9c10 (commit) via a51fad02e41c354a0be1fcdca5dbd911d9b26b42 (commit) via a8ae524ffea9bc12de6196e1937155300faccb1e (commit) via cbf9b7d50aae0c78c52ae3822b05899607b6a690 (commit) via c3844b2ab5750c7708cfbec1e5f26ebc7e319f4f (commit) via 369216769b4dfd4a75f03792c3273eb8c9b5e280 (commit) via c1f29c5914e612212e43b0c1cbe441380cf50c67 (commit) via 57387aa4278f13b135036182bfe0cb721e3e8431 (commit) via bdda52d14b19898d40a03a96c774724bc964bdce (commit) via caeab6a7e55cca56325dd6fee062face9df998e3 (commit) via 7f27e04dace4922b5bc44fc6297a6700ea0b009a (commit) via e0f09538d0d241e9b132929bb491634ecdbc7544 (commit) from ed45b5f4e4f38c72d1e28ab19b94f1c37bc51d91 (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 96fa3f51e142a6ef0538aa84e5134a56aa7af750 Author: Aleisha Amohia Date: Wed Jun 28 00:40:00 2017 +0000 Bug 18871: Make patron list name a link to view contents of list The link is the same as the 'Add patrons' button in Actions dropdown, but requires one less click, and makes finding the contents of the list more obvious. To test: 1) Go to Tools -> Patron lists 2) Create a patron list if you haven't already 3) Confirm that clicking the name of the list takes you to the correct list and shows the expected content. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart (cherry picked from commit d51059807690797aa4d16b0c0dd2932235a3b683) Signed-off-by: Fridolin Somers (cherry picked from commit e570915729b6b8e02e22b0cfdff4440b75815d26) Signed-off-by: Katrin Fischer commit 915f5d1ca18eafac9e0ba633e86e3bece8d12a5e Author: Marc V?ron Date: Mon Jun 12 09:07:28 2017 +0200 Bug 18781: Translatability: Get rid of exposed tt directives in openlibrary-readapi.inc The file koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc exposes template directives to translation. The only string that should appear in .po from this file is "Open Library: " To test: - Apply patch - Verify that code changes make sense - Bonus test: create a new language 'aa-AA', verify in aa-AA-opac-bootstrap.po that there is only the following string for openlibrary-readapi.inc: msgid "Open Library: " msgstr "" NOTE: Followed a test plan similar to bug 18776 comment 3 Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 23cc8b39682fea7b0a9150933c65c34ef22d23dd) Signed-off-by: Fridolin Somers (cherry picked from commit 861fa8c8db8bd8bbd6281863d5029d55675f359c) Signed-off-by: Katrin Fischer commit acf28ae38c885cb0e59013c743841ef92b662f83 Author: Marc V?ron Date: Mon Jun 12 08:41:41 2017 +0200 Bug 18780: Translatability: Get rid of exposed tt directive in masthead-langmenu.inc The file opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc exposes following tt directive to translators: "[%% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && " "( languages_loop ) && ( OpacLangSelectorMode == 'both' || " "OpacLangSelectorMode == 'top') ) %%] " This patch fixes it. To test: - Apply patch - Verify that language selector in OPAC (top of the page) works as expected - Bonus test: create a new language 'aa-AA', verify that line above does not show up in aa-AA-opac-bootstrap.po NOTE: Followed a test plan similar to bug 18776 comment 3 Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 255cadeb772d63b06f77146c95b8d6e4b31d5836) Signed-off-by: Fridolin Somers (cherry picked from commit e0adbc10c09c25310f79fec55518fb5df50ad040) Signed-off-by: Katrin Fischer commit 0c30269d9eed47749b97275b35dfe3ba5dd2cbc2 Author: Marc V?ron Date: Mon Jun 12 08:20:56 2017 +0200 Bug 18779: Translatability: Get rid of exposed tt directives in authorities-search-results.inc (OPAC) The file opac-tmpl/bootstrap/en/includes/authorities-search-results.inc exposes template directives to translation where translators should not be confronted with. Example: "[%% PROCESS showreference heading=seeals.heading linkType='seealso' " "type=seeals.type authid=seeals.authid %%] " To test: - Apply patch - Verify that Authority search in OPAC works as before - Bonus test: create a new language 'aa-AA', verify that line above does not show up in aa-AA-opac-bootstrap.po Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart (cherry picked from commit 331320f93a5ef5293c3bcad80b9554ddea0196b0) Signed-off-by: Fridolin Somers (cherry picked from commit 4dc640244651c584347b01f35f2cb25b6369a638) Signed-off-by: Katrin Fischer commit db9975db23c98d6a131a42f91e31796c8be179cf Author: Marc V?ron Date: Sun Jun 11 20:16:46 2017 +0200 Bug 18777: Translatability: Get rid of exposed tt directives in opac-memberentry.tt The file opac-memberentry.tt exposes template directives to translation where translators should not be confronted with. Example from po file: "%s [%% UNLESS hidden.defined('B_address') && hidden.defined('B_address2') && " "hidden.defined('B_city') && hidden.defined('B_state') && hidden." "defined('B_zipcode') && hidden.defined('B_country') && hidden." "defined('B_phone') && hidden.defined('B_email') && hidden." "defined('contactnote') %%] " To test: - Apply patch - Verify that advanced search in OPAC the page 'your personal details' behaves as before - Verify that you can change values and submit an update request - Create a new translation for a 'language' aa-AA (perl translate create aa-AA) - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.p NOTE: Followed test plan similar to bug 18776 comment 3. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb) Signed-off-by: Fridolin Somers (cherry picked from commit b17412da1b14dca4d42ed534482abdeff1c2fd2f) Signed-off-by: Katrin Fischer commit c583929799f87e7092cad06a4e1cc1855630411a Author: Marc V?ron Date: Sun Jun 11 16:54:28 2017 +0200 Bug 18776: Translatability: Get rid of exposed tt directives in opac-advsearch.tt The file opac-advsearch.tt exposes template directives to translation where translators should not be confronted with. Example in po file: "[%% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype')." "size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and " "OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) " "%%] " To test: - Apply patch - Verify that advanced search in OPAC behaves as before - Create a new translation for a 'language' aa-AA (perl translate create aa-AA) - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit ae684fc9491102ba0b560ca6f414a325e763b31a) Signed-off-by: Fridolin Somers (cherry picked from commit b1bce06e515e22482ca555b85da19f965b475f5f) Signed-off-by: Katrin Fischer commit df8a9f82a6cf8fba92cbee9c171410fe01d500de Author: Marcel de Rooy Date: Fri Aug 4 16:44:51 2017 +0200 Bug 18754: [QA Follow-up] Tiny corrections Converted one INCLUDE directive to PROCESS; we are not changing variables here. (The PROCESS directive is slightly faster than INCLUDE because it avoids the need to localise (i.e. copy) the variable stash before processing the template.) Removed one vim inserted letter i. Error in [% IF ( XISBN.publicationyear ) _ ', ' _ XISBN.publicationyear %][% END %] The concatenation became part of the condition. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128) Signed-off-by: Fridolin Somers (cherry picked from commit 78e527129b0b547eff7311c3f25a4b1f679d2a97) Signed-off-by: Katrin Fischer commit b0d86d10443809f3762bdac75a59d704f1a3976b Author: Marc V?ron Date: Fri Jun 9 15:43:36 2017 +0200 Bug 18754: Translatability: Get rid of exposed tt directives in opac-detail.tt The file opac-detail.tt exposes a lot of template directives to translation where translators should not be confronted with. Some examples from po file are: $[% SUBFIELD.code %] [% SUBFIELD.value %] %s [%% INCLUDE \"openlibrary-readapi.inc\" bib = { normalized_isbn => " "normalized_isbn, lccn => lccn, normalized_oclc => normalized_oclc } %%] See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END " "%] To test: - Apply patch - Do a search in OPAC that has more than 1 results - Go to the detail page of one of the items found - Verify that the details display as before and that you can browse the results with Previous and Next - In staff client, change OPACXSLTDetailsDisplay from 'default' to empty for "no xslt" and repeat steps above - In staff client, set HTML5MediaEnabled to 'OPAC' or 'OPAC and staff client' - Verify that media catalogued in field 856 still work - Create a new translation for a 'language' aa-AA (perl translate create aa-AA) - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po Followed test plan which works as intended Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 752aef4593f1aa2d64700bf9738e7e03907eb1cd) Signed-off-by: Fridolin Somers (cherry picked from commit 65e09b28dbbe43772b9104ffcafa1f81441c4d70) Signed-off-by: Katrin Fischer commit 3e23ffe5845c44008cf462e8dfd8d4c78a755561 Author: Marc V?ron Date: Sun May 28 09:34:21 2017 +0200 Bug 18687: Translatability: abbr tag should not contain lang attribute In manage-marc-import.tt, we have an abbreviation: Diff In translations (e.g. German), the line appears as follows: Diff The lang attribute is wrong here, it is still "en". The text language is the same as defined at the top of the page - or with other words, the lang tag is superfluous. This patch removes it. To test: Verify that code change makes sense. Passes QA test and the change is logical Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart (cherry picked from commit 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb) Signed-off-by: Fridolin Somers (cherry picked from commit 9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153) Signed-off-by: Katrin Fischer commit ba61c6b8054b34c58dc5914088c200fac529c402 Author: Lee Jamison Date: Fri Aug 11 18:58:53 2017 +0000 Bug 19088: plugins-upload causes error log noise After uploading a plugin the error log indicates use of uninitialized value in $op. This patch silences the noise. To test: 1) Set to 1 (one) in koha-conf.xml. 2) Set the UseKohaPlugins system preference to 'Enable'. 3) Navigate to Administration -> Manage plugins. 4) Install the test plugin KPZ file attached to this bug. 5) Notice the uninitialized value noise in the error log. 6) Uninstall the plugin (plack restart may be required if plack is enabled). 7) Apply patch. 8) Install the plugin again. 9) Notice no noise in the error log. 10) Run qa tools. 11) Run prove t/db_dependent/Plugins.t Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 1076a0edf32b621da54c53ea71595885f7e14c38) Signed-off-by: Fridolin Somers (cherry picked from commit cdcc0458b796aff59a50e0f5d4c7b7140682eacf) Signed-off-by: Katrin Fischer commit 2ea0bac58bbe58f5fb53e66829e217ca87799928 Author: Amit Gupta Date: Tue Aug 15 22:21:37 2017 +0530 Bug 19118 - Due to wrong variable name passed vendor name is not coming in browser title bar Test 1. Hit the page /cgi-bin/koha/acqui/supplier.pl?booksellerid=xx xx is a booksellerid 2. Apply the patch and reload the page. 3. You can see vendor name in browser title bar. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit ea886885d0efa0200cfa166453a4495692afc4d4) Signed-off-by: Fridolin Somers (cherry picked from commit 3e9af632d97f412d44fe4a11e97edd990b0d3ad1) Signed-off-by: Katrin Fischer commit 1c0f36468749af352caac6e861a0ed514698adec Author: Marcel de Rooy Date: Wed Aug 16 13:15:19 2017 +0200 Bug 19126: Fix Members.t with IndependentBranches set If you enabled that pref, Members.t fails with: t/db_dependent/Members.t .. 63/63 # Looks like you failed 15 tests of 63. The first one is: t/db_dependent/Members.t .. 32/63 Failed test 'Staff patron not deleted from list' at t/db_dependent/Members.t line 304. Bottle neck is GetBorrowersToExpunge. The results of that sub depend on the state of this preference. Trivially fixing it here by disabling the pref before the first call. Test plan: [1] Do not apply this patch yet. Enable IndependentBranches. [2] Run Members.t and observe that it fails. [3] Apply this patch. And run Members.t again. It should pass now. Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart (cherry picked from commit 44a8fc5b9363eb27223f32e1150fb8fff6f55d08) Signed-off-by: Fridolin Somers (cherry picked from commit 916d564055502aac3d09e227d90a0f3f6d291cdd) Signed-off-by: Katrin Fischer commit f3571db3365e7b6d3a25133e146992d73df38280 Author: Tomas Cohen Arazi Date: Fri Aug 11 15:09:00 2017 -0300 Bug 9409: (QA followup) Add --dbhost help to koha-create man page Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 7efb871fa31869044045ccef0b37be438ba704ff) Signed-off-by: Fridolin Somers (cherry picked from commit 67462ae8704cd8a41a6939b5ee7c47010d9942e6) Signed-off-by: Katrin Fischer commit 7042e2ce9d9db6f0704befe35c2289ac36fd35c4 Author: Mark Tompsett Date: Fri Jun 23 01:46:50 2017 +0000 Bug 9409: Add --dbhost parameter and dbhost field This allows setting the remote db host correctly for request-db either with a command-line or passwd file. Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit e4573d709936bbd7f454a26f073e2131aa9c8df3) Signed-off-by: Fridolin Somers (cherry picked from commit e4995e5196621f8d9aa76301af68064e39fdac6a) Signed-off-by: Katrin Fischer commit 091ef48f4240724877a0b492aa1d6e11aa51a502 Author: Nick Clemens Date: Fri Jul 7 11:25:24 2017 +0000 Bug 18469: QA Follow-up Restore datepicker class Use Koha.Preference Copy changes to moremember Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9) Signed-off-by: Fridolin Somers (cherry picked from commit c26108afa776b9de93ebe7c334c0eeff8ea2ed98) Signed-off-by: Katrin Fischer commit b6cc1f06b6cf0a277b20af882a485fb4fe4b3604 Author: Nick Clemens Date: Fri Apr 21 10:08:27 2017 -0400 Bug 18469: Suspend all holds when specifying a date to resume hold does not keep date Name of field had 'datepicker' embedded, this caused variable issue To test: 1 - Place several holds for a patron 2 - Go to holds tab in circulation 3 - Select a date for suspend all holds until 4 - Suspend all holds 5 - Note date is not used, suspended indefinitely 6 - Apply patch 7 - Resume all suspended holds 8 - Select a date for suspend all holds until 9 - Suspend all holds 10 - Note date is used Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91) Signed-off-by: Fridolin Somers (cherry picked from commit fec723524cbd972b4788f34e105908697c43ea01) Signed-off-by: Katrin Fischer commit 5e7897f21c844016a586fdef53885a56bbb0b678 Author: Marc V?ron Date: Wed Aug 2 18:01:06 2017 +0200 Bug 19027 - Circulation rules: Better wording for standard rules for all libraries In Home > Administration > Circulation and fine rules, the standard value for "Select a library: All libraries" is confusing and leads to support cases. Change wording to "Standard rules for all libraries". To test: - Apply patch - Go to Home > Administration > Circulation and fine rules - Verfiy that text in drop down 'Select a library' makes sense. Followed test plan which works as intended. I agree with the wording it is significantly clearer than previously Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart (cherry picked from commit c140b9129124262db27c9ba17f47134ec3232ada) Signed-off-by: Fridolin Somers (cherry picked from commit 04c76ad707e83558fd619d6c73f4a0b9094b8e70) Signed-off-by: Katrin Fischer commit b6632784b4f4c2f2352e064bd9c38cb43973af47 Author: Nick Clemens Date: Fri Jul 14 11:25:42 2017 +0000 Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets To test: 1 - Create an active budget 2 - Create an inactive budget 3 - Ensure they each have a fund with the same code 4 - Set MarcFieldsToOrder to get the budget_code from a marc field 5 - Stage a file using the duplicated code 6 - Add to a basket from the staged file 7 - Add the items 8 - Note funds are encumbered from the inactive budget 9 - Apply patch 10 - Repeat 5-8 with a new basket 11 - Note the active budget is now used Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 0e2c823e8806c35673505d0e2a03081cac00190a) Signed-off-by: Fridolin Somers (cherry picked from commit 8818b604696512da7d094101036c8704ba315d96) Signed-off-by: Katrin Fischer commit 936bcce4ba9c15d45f241cbce80e489a043687da Author: Nick Clemens Date: Fri Jul 14 11:06:16 2017 +0000 Bug 18941 - Unit tests Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 22944fb61241239124b4db218d098b8510327276) Signed-off-by: Fridolin Somers (cherry picked from commit 69f0c2ece61abb2b512ba9189369b9fbec22941d) Signed-off-by: Katrin Fischer commit 3fcfb2c00326697955be7cd0d747e3d5feb4450c Author: Jonathan Druart Date: Thu Aug 10 15:52:35 2017 -0300 Bug 13012: Add more tests Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 28a979487f3d8c4a5887c484ae71c7c63e7ee03d) Signed-off-by: Fridolin Somers (cherry picked from commit 0b83a18907c8bcefeaa978d44a62736390e4bcf8) Signed-off-by: Katrin Fischer commit aefcb510aee6452034f4f2a7f6c536e5cbb73e40 Author: Kyle M Hall Date: Wed Jul 19 14:57:26 2017 -0400 Bug 13012 - suggestion.suggesteddate should be set to NOW if not defined Test Plan: 1) Apply this patch 2) prove t/db_dependent/Koha/Suggestions.t Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit b2a8e726fe32d4aae3f279f4142af240c60d7fe5) Signed-off-by: Fridolin Somers (cherry picked from commit e03ae320f7705cbf0a9e8ce872c5218ac901dab7) Signed-off-by: Katrin Fischer commit 3b0827ef4f6da188d4c140834794d52614fc9c10 Author: Marcel de Rooy Date: Thu Aug 10 09:24:08 2017 +0200 Bug 19071: Fix Members/IssueSlip.t Resolve: DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Members/IssueSlip.t line 44. We do not need to delete all branches here. Note: The test still needs attention for noisy userenv warns, but it should pass now. Test plan: Run t/db_dependent/Members/IssueSlip.t Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 8651016ce8e959b5b6ca19ccddbb3f5342b5d456) Signed-off-by: Fridolin Somers (cherry picked from commit 3cdea3aaf6194cc9e448a424e2646867e9c3ddd1) Signed-off-by: Katrin Fischer commit a51fad02e41c354a0be1fcdca5dbd911d9b26b42 Author: Marcel de Rooy Date: Thu Aug 10 09:13:44 2017 +0200 Bug 19071: Fix Circulation/issue.t Resolve: DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/issue.t line 65. Cause: See also bug 19070. We do not need to delete all branches here. Test plan: Run t/db_dependent/Circulation/issue.t Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit b80704aa1b763c7a29c3b95c162dfb12ded8faa2) Signed-off-by: Fridolin Somers (cherry picked from commit 9f8b896d707905043f75a3a86ab29c3ed2eaffa6) Signed-off-by: Katrin Fischer commit a8ae524ffea9bc12de6196e1937155300faccb1e Author: Jonathan Druart Date: Thu Aug 10 15:06:39 2017 -0300 Bug 19047: Fix AddBiblio call in ShelfBrowser.t Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit b4ce1feb1bc6b4f20cf71bd545e018917cf518db) Signed-off-by: Fridolin Somers (cherry picked from commit 2b903d74acbdefbfb1dd678f23dc57f655262940) Signed-off-by: Katrin Fischer commit cbf9b7d50aae0c78c52ae3822b05899607b6a690 Author: Marcel de Rooy Date: Mon Aug 7 08:44:43 2017 +0200 Bug 19047: Fix AddBiblio call in Reserves.t AddBiblio does not return a title; the biblioitemnumber is stored in the title variable. The variables for biblioitemnumber are not used and can be removed. Test plan: Run t/db_dependent/Reserves.t Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit c6f8cf69d3943599fa6a0c250ae0e8221ead44ff) Signed-off-by: Fridolin Somers (cherry picked from commit c22e87282095a3e97c1bdc8c9944464d5ae4d617) Signed-off-by: Katrin Fischer commit c3844b2ab5750c7708cfbec1e5f26ebc7e319f4f Author: Jonathan Druart Date: Thu Aug 10 15:02:23 2017 -0300 Bug 19042: Add mock IndependentBranches=0 for the other test These tests do not cover correctly getletter, but it is not the goal of this patch. Superlibrarian behaviour must be tested as well. Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit e3dafbfccd06af8fca45fada449e93e3d0616cd6) Signed-off-by: Fridolin Somers (cherry picked from commit d1b5a9f5bb4a28e86fbd2f3c0ca3127a98d2d4d9) Signed-off-by: Katrin Fischer commit 369216769b4dfd4a75f03792c3273eb8c9b5e280 Author: Mark Tompsett Date: Fri Aug 4 14:24:38 2017 -0400 Bug 19042: Silence warnings t/db_dependent/Letters.t TEST PLAN --------- prove t/db_dependent/Letters.t -- there will be a message: "C4::Context->userenv not defined!" apply this patch prove t/db_dependent/Letters.t -- there will no longer be that message. run qa test tools Signed-off-by: Lee Jamison Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit d01ce104a7711814152e4f8228064f79c8a7f68c) Signed-off-by: Fridolin Somers (cherry picked from commit 306614068eb20cc52dfb6b69227f72e0e37baf1e) Signed-off-by: Katrin Fischer commit c1f29c5914e612212e43b0c1cbe441380cf50c67 Author: Jonathan Druart Date: Tue Aug 1 11:44:29 2017 -0300 Bug 17699: Reset time simulation Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 0853c4e2b4366a235077a24a873fc81a754afecb) Signed-off-by: Fridolin Somers (cherry picked from commit d3e6a1a5fd9246811ef0036c6234c7a2cf11f7b3) Signed-off-by: Katrin Fischer commit 57387aa4278f13b135036182bfe0cb721e3e8431 Author: Jonathan Druart Date: Mon Jul 31 11:30:00 2017 -0300 Bug 17699: Add test descriptions Test plan: prove -v t/db_dependent/Koha/Patrons.t Subtest: renew_account 1..30 ok 1 - 2016-02-29T00:00:00 + 12 months must be 2017-02-28T00:00:00 ok 2 - 2016-02-29T00:00:00 + 12 months must be 2017-02-28T00:00:00 ok 3 - With BorrowerLogs, Koha::Patron->renew_account should have logged ok 4 - today + 12 months must be 2017-03-31T00:00:00 ok 5 - today + 12 months must be 2017-03-31T00:00:00 ok 6 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged ok 7 - today + 12 months must be 2017-03-31T00:00:00 ok 8 - today + 12 months must be 2017-03-31T00:00:00 ok 9 - 2016-04-30T00:00:00 + 12 months must be 2017-04-30T00:00:00 ok 10 - 2016-04-30T00:00:00 + 12 months must be 2017-04-30T00:00:00 ok 11 - 2016-10-30T00:00:00 + 12 months must be 2017-10-30T00:00:00 ok 12 - 2016-10-30T00:00:00 + 12 months must be 2017-10-30T00:00:00 ok 13 - With BorrowerLogs, Koha::Patron->renew_account should have logged ok 14 - today + 12 months must be 2017-11-30T00:00:00 ok 15 - today + 12 months must be 2017-11-30T00:00:00 ok 16 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged ok 17 - today + 12 months must be 2017-11-30T00:00:00 ok 18 - today + 12 months must be 2017-11-30T00:00:00 ok 19 - 2016-12-30T00:00:00 + 12 months must be 2017-12-30T00:00:00 ok 20 - 2016-12-30T00:00:00 + 12 months must be 2017-12-30T00:00:00 ok 21 - 2017-06-30T00:00:00 + 12 months must be 2018-06-30T00:00:00 ok 22 - 2017-06-30T00:00:00 + 12 months must be 2018-06-30T00:00:00 ok 23 - With BorrowerLogs, Koha::Patron->renew_account should have logged ok 24 - today + 12 months must be 2018-07-31T00:00:00 ok 25 - today + 12 months must be 2018-07-31T00:00:00 ok 26 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged ok 27 - today + 12 months must be 2018-07-31T00:00:00 ok 28 - today + 12 months must be 2018-07-31T00:00:00 ok 29 - 2017-08-31T00:00:00 + 12 months must be 2018-08-31T00:00:00 ok 30 - 2017-08-31T00:00:00 + 12 months must be 2018-08-31T00:00:00 Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ec9b691de934f82c50057c15fb7d3a1b32717b72) Signed-off-by: Fridolin Somers (cherry picked from commit af0cdbaa24033ff2494a3afc721fb0cf6711020c) Signed-off-by: Katrin Fischer commit bdda52d14b19898d40a03a96c774724bc964bdce Author: Jonathan Druart Date: Mon Jul 31 11:03:37 2017 -0300 Bug 17699: Use limit as end_of_month From DateTime::Duration pod: "" For positive durations, the "end_of_month" parameter defaults to wrap. For negative durations, the default is "limit". This should match how most people "intuitively" expect datetime math to work. """" We need end_of_month => limit for positive durations as well. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 24b4006ecbc0a258b09500bdd8f639c7018067c0) Signed-off-by: Fridolin Somers (cherry picked from commit cdfa1b0db7f98be3da503861075fecafeff9e600) Signed-off-by: Katrin Fischer commit caeab6a7e55cca56325dd6fee062face9df998e3 Author: Jonathan Druart Date: Mon Jul 31 11:02:42 2017 -0300 Bug 17699: Add more tests to highlight the problem Add problematic cases to highlight the problem. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 9512b015662f8ec56d8b8884b4e4bb14d5e563f1) Signed-off-by: Fridolin Somers (cherry picked from commit 1416b65e0949deca4a83b41c9ef1df1be5eb433e) Signed-off-by: Katrin Fischer commit 7f27e04dace4922b5bc44fc6297a6700ea0b009a Author: Tomas Cohen Arazi Date: Mon Aug 7 11:04:51 2017 -0300 Bug 19013: (QA followup) Set guarantorid to NULL patron sample data Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 0bcf6a79427297c332588317dde749e923c7bbdc) Signed-off-by: Fridolin Somers (cherry picked from commit 1f19154532f438319aa789d8b7cdabb14f53275a) Signed-off-by: Katrin Fischer commit e0f09538d0d241e9b132929bb491634ecdbc7544 Author: Jonathan Druart Date: Mon Jul 31 16:12:16 2017 -0300 Bug 19013: Fix borrowers.guarantorid in sammple_patrons.sql That breaks randomly tests on Jenkins (Koha/Patrons.t) It certainly affects data in other languages but I did not find a quick and easy way to modify this file (replace all guarantorid values with NULL) Signed-off-by: Tomas Cohen Arazi Easy fix Signed-off-by: Jonathan Druart (cherry picked from commit b7d291a1ee692d6de71503683a3e61c9311c33d8) Signed-off-by: Fridolin Somers (cherry picked from commit b59ce0c61785a317d06eac14fafd16070b21e479) Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Budgets.pm | 5 +- Koha/Patron/Category.pm | 2 +- Koha/Suggestion.pm | 18 ++ circ/circulation.pl | 2 - debian/docs/koha-create.xml | 10 +- debian/scripts/koha-create | 18 +- .../data/mysql/de-DE/optional/sample_patrons.sql | 24 +- .../data/mysql/en/optional/sample_patrons.sql | 24 +- .../data/mysql/es-ES/optional/sample_patrons.sql | 24 +- .../mysql/nb-NO/2-Valgfritt/sample_patrons.sql | 24 +- .../data/mysql/pl-PL/optional/sample_patrons.sql | 24 +- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 6 +- .../prog/en/modules/members/moremember.tt | 6 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../en/includes/authorities-search-results.inc | 28 +-- .../bootstrap/en/includes/masthead-langmenu.inc | 8 +- .../bootstrap/en/includes/openlibrary-readapi.inc | 10 +- .../bootstrap/en/modules/opac-advsearch.tt | 24 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 83 ++++--- .../bootstrap/en/modules/opac-memberentry.tt | 242 ++++++++------------ members/moremember.pl | 2 - plugins/plugins-upload.pl | 2 +- t/db_dependent/Budgets.t | 24 +- t/db_dependent/Circulation/issue.t | 1 - t/db_dependent/Koha/Patrons.t | 150 ++++++------ t/db_dependent/Koha/Suggestions.t | 23 +- t/db_dependent/Letters.t | 5 +- t/db_dependent/Members.t | 4 + t/db_dependent/Members/IssueSlip.t | 1 - t/db_dependent/Reserves.t | 5 +- t/db_dependent/ShelfBrowser.t | 2 +- 34 files changed, 411 insertions(+), 398 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 2 15:09:07 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Oct 2017 13:09:07 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-55-g6386377 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.05.x has been updated via 6386377f09bc55f059675c58855e01ad9925aeb9 (commit) via c1d4fa47c8daacee132afa40015944184ed62730 (commit) via a8ac2fa34ad22d2e22c58325873f82bf9a3da663 (commit) from e570915729b6b8e02e22b0cfdff4440b75815d26 (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 6386377f09bc55f059675c58855e01ad9925aeb9 Author: Fridolin Somers Date: Mon Oct 2 15:04:17 2017 +0200 Revert "Bug 18817 Correct Manual URL" This reverts commit ebd244dcab375fcaebe9ab3d1f7673a6638e2c0b. commit c1d4fa47c8daacee132afa40015944184ed62730 Author: Fridolin Somers Date: Mon Oct 2 15:04:15 2017 +0200 Revert "Bug 18817: Update links with anchor automatically" This reverts commit b1ec1ff0ecf0d54c00182f5fb44e700d664da039. commit a8ac2fa34ad22d2e22c58325873f82bf9a3da663 Author: Fridolin Somers Date: Mon Oct 2 15:04:12 2017 +0200 Revert "Bug 18817: Update links manually" This reverts commit b3e2933f5c36101784a1780444dd619655ee7ea2. ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/edifactmsgs.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../prog/en/modules/help/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/help/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt | 2 +- .../prog/en/modules/help/admin/auth_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/help/admin/authorised_values.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 4 ++-- .../prog/en/modules/help/admin/branch_transfer_limits.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/categorie.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/classsources.tt | 4 ++-- .../prog/en/modules/help/admin/columns_settings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/edi_accounts.tt | 4 ++-- .../prog/en/modules/help/admin/edi_ean_accounts.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt | 4 ++-- .../prog/en/modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/items_search_fields.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt | 4 ++-- .../prog/en/modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt | 2 +- .../prog/en/modules/help/admin/patron-attr-types.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/admin/preferences.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/systempreferences.tt | 2 +- .../prog/en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt | 2 +- .../prog/en/modules/help/authorities/authorities-home.tt | 2 +- .../prog/en/modules/help/authorities/authorities.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/authorities/detail.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/authorities/merge.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/catalogue/itemsearch.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt | 4 ++-- .../prog/en/modules/help/catalogue/search-history.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/catalogue/search.tt | 2 +- .../prog/en/modules/help/cataloguing/addbiblio.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt | 2 +- .../prog/en/modules/help/circ/circulation-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt | 4 ++-- .../prog/en/modules/help/circ/on-site_checkouts.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/renew.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt | 2 +- .../prog/en/modules/help/circ/selectbranchprinter.tt | 4 ++-- .../prog/en/modules/help/circ/transferstoreceive.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt | 4 ++-- .../prog/en/modules/help/course_reserves/add_items.tt | 2 +- .../prog/en/modules/help/course_reserves/course-details.tt | 2 +- .../prog/en/modules/help/course_reserves/course-reserves.tt | 2 +- .../prog/en/modules/help/course_reserves/course.tt | 2 +- .../prog/en/modules/help/labels/label-edit-batch.tt | 4 ++-- .../prog/en/modules/help/labels/label-edit-layout.tt | 4 ++-- .../prog/en/modules/help/labels/label-edit-profile.tt | 4 ++-- .../prog/en/modules/help/labels/label-edit-template.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/labels/label-home.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/labels/label-manage.tt | 8 ++++---- .../prog/en/modules/help/labels/spinelabel-home.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/boraccount.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/discharge.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/mancredit.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/maninvoice.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/member-flags.tt | 2 +- .../prog/en/modules/help/members/member-password.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/memberentry.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/members-home.tt | 4 ++-- .../prog/en/modules/help/members/members-update.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/moremember.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/notices.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/purchase-suggestions.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/members/readingrec.tt | 2 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/statistics.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/offline_circ/list.tt | 2 +- .../prog/en/modules/help/offline_circ/process_koc.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt | 4 ++-- .../prog/en/modules/help/patroncards/edit-batch.tt | 4 ++-- .../prog/en/modules/help/patroncards/edit-layout.tt | 4 ++-- .../prog/en/modules/help/patroncards/edit-profile.tt | 4 ++-- .../prog/en/modules/help/patroncards/edit-template.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/patroncards/home.tt | 4 ++-- .../prog/en/modules/help/patroncards/image-manage.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/patroncards/manage.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt | 4 ++-- .../prog/en/modules/help/plugins/plugins-upload.tt | 2 +- .../prog/en/modules/help/reports/acquisitions_stats.tt | 4 ++-- .../prog/en/modules/help/reports/bor_issues_top.tt | 4 ++-- .../prog/en/modules/help/reports/borrowers_out.tt | 4 ++-- .../prog/en/modules/help/reports/borrowers_stats.tt | 3 ++- .../prog/en/modules/help/reports/cat_issues_top.tt | 4 ++-- .../prog/en/modules/help/reports/catalogue_out.tt | 4 ++-- .../prog/en/modules/help/reports/catalogue_stats.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/reports/dictionary.tt | 4 ++-- .../prog/en/modules/help/reports/guided_reports.tt | 2 +- .../prog/en/modules/help/reports/issues_avg_stats.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/reports/itemslost.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/reports/manager.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/reports/reports-home.tt | 2 +- .../prog/en/modules/help/reports/reserves_stats.tt | 4 ++-- .../prog/en/modules/help/reports/serials_stats.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 4 ++-- .../modules/help/rotating_collections/rotatingCollections.tt | 4 ++-- .../prog/en/modules/help/serials/checkexpiration.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/serials/routing.tt | 4 ++-- .../prog/en/modules/help/serials/serials-collection.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/serials/serials-home.tt | 3 ++- .../prog/en/modules/help/serials/subscription-add.tt | 3 ++- .../prog/en/modules/help/serials/subscription-detail.tt | 4 ++-- .../prog/en/modules/help/serials/subscription-frequencies.tt | 4 ++-- .../en/modules/help/serials/subscription-numberpatterns.tt | 2 +- .../prog/en/modules/help/suggestion/suggestion.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt | 4 ++-- .../prog/en/modules/help/tools/batch_delete_records.tt | 2 +- .../prog/en/modules/help/tools/batch_record_modification.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt | 3 ++- .../prog/en/modules/help/tools/import_borrowers.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/inventory.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/koha-news.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt | 2 +- .../prog/en/modules/help/tools/manage-marc-import.tt | 3 ++- .../prog/en/modules/help/tools/marc_modification_templates.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/tools/overduerules.tt | 3 ++- .../intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/scheduler.tt | 2 +- .../prog/en/modules/help/tools/stage-marc-import.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/tools/tools-home.tt | 4 ++-- .../prog/en/modules/help/tools/upload-cover-image.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt | 4 ++-- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- 190 files changed, 282 insertions(+), 268 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 08:58:00 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 06:58:00 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-56-g90dffe1 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.05.x has been updated via 90dffe1c68b00244c010e95a00a002f913a3f02a (commit) from 6386377f09bc55f059675c58855e01ad9925aeb9 (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 90dffe1c68b00244c010e95a00a002f913a3f02a Author: Jonathan Druart Date: Fri Sep 29 16:16:56 2017 -0300 Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t Signed-off-by: Jonathan Druart (cherry picked from commit b6f8cf43698979914704dd08c45f11e6b8e406ee) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/authorised_values.tt | 4 +-- t/db_dependent/www/auth_values_input_www.t | 26 ++++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 09:56:30 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 07:56:30 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-58-gbdfec37 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.05.x has been updated via bdfec37ab66f9c72f86adc7d6045bc83b5a92d88 (commit) via 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c (commit) from 90dffe1c68b00244c010e95a00a002f913a3f02a (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 bdfec37ab66f9c72f86adc7d6045bc83b5a92d88 Author: Jonathan Druart Date: Mon Sep 18 14:23:54 2017 -0300 Bug 19335: Fix 00-merge-conflict-markers.t when dockerised This does not make sense, but fix a bug (why?) Without this patch, the tests failed on po files: [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests Test Summary Report ------------------- t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0) Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. Result: FAIL Note that this is not related to bug 19227. if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail As saw it failed on *-pref.po files misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 0d03f143e25f498de780d2ddd1972c3be7947519) Signed-off-by: Fridolin Somers commit 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c Author: Jonathan Druart Date: Thu Aug 31 11:47:11 2017 -0300 Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t The number of tests on jenkins is sometimes confusing: https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/ shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than the previous run. However 124 files have not been removed from the codebase! I suggest to count only 1 test for all files. Moreover files from blib and cover_db are counted, they should be excluded. Test plan: prove t/00-merge-conflict-markers.t must return green echo ">>>>>>>" >> mainpage.pl and run the test again It should now fail Signed-off-by: Magnus Enger Works as advertised. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: t/00-merge-conflict-markers.t | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 10:27:26 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 08:27:26 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-63-g4b360f1 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.05.x has been updated via 4b360f1371a56268458b62e5c8c68da853b4e52d (commit) via 319f5f67aaa056952ecc9a4500fa52627db4fdcc (commit) via 5a132e1c3fb19d232b51e7ae68e468ddf81c6d8b (commit) via 58d775dda10f5191301a80a2b5c0b4a135213e5a (commit) via 669b6839eab456f36ed7c65a7a97fa7b386ab4e6 (commit) from bdfec37ab66f9c72f86adc7d6045bc83b5a92d88 (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 4b360f1371a56268458b62e5c8c68da853b4e52d Author: Nick Clemens Date: Thu Jun 15 11:07:03 2017 -0400 Bug 18812 - SIP Patron status does not respect OverduesBlockCirc To test: 1 - Set 'OverduesBlockCirc' to block 2 - Find or create a patron with overdues 3 - Perform a SIP patron lookup on that patron misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron {userid or cardnumber} --password {pass} -m patron_information 4 - Note the first character of response is a ' ' 5 - Apply patch 6 - Restart memcached, apache, and plack 7 - Perform SIP patron lookup 8 - Note the first character of response is 'Y' 9 - prove t/db_dependent/SIP/Patron.t 10 - Test should return green Signed-off-by: Chris Kirby Works as advertised Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ff4f0858950c37eeede38b2f067841602b97d7ba) Signed-off-by: Fridolin Somers commit 319f5f67aaa056952ecc9a4500fa52627db4fdcc Author: Jonathan Druart Date: Mon Aug 7 17:25:15 2017 -0300 Bug 19055: Remove C4::Reserves::GetReservesToBranch This subroutine is no longer in used and can be removed Test plan: git grep GetReservesToBranch must not return any results Signed-off-by: Marc V?ron Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 9cc7268362219e39b22aebb03a83e013f467d93a) Signed-off-by: Fridolin Somers commit 5a132e1c3fb19d232b51e7ae68e468ddf81c6d8b Author: Kyle M Hall Date: Mon Jul 31 09:18:15 2017 -0400 Bug 19007 - Allow paypal payments via debit or credit card again A recent change in Paypal has removed the previous default option of paying via debit or credit card without an account. To bring this option back, we need to send an additional parameter to the PayPal API. Test Plan: 1) Enable paypal for your Koha instance 2) Ensure you are not logged in to PayPal 3) Attempt to pay a fine via PayPal 4) Not the the "Pay with Debit or Credit Card" option is missing 5) Apply this patch 6) Refresh opac-account.pl 7) Attempt to make a payment via PayPal again 8) Note the option "Pay with Debit or Credit Card" is now available Signed-off-by: Kyle M Hall Signed-off-by: George Williams Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 10311769d460a775aa8c8ee8a190836a8f2b1f1e) Signed-off-by: Fridolin Somers commit 58d775dda10f5191301a80a2b5c0b4a135213e5a Author: Marc V?ron Date: Sat Feb 18 18:35:39 2017 +0100 Bug 14353 - Show 'damaged' and other status on the 'place holds' page in staff This patch adds status 'Damaged' to 'Information' 'Status' in the items table on 'Place hold' page. To test: - Apply patch - In staff client, try to place an item level hold for items with 'Damaged' status. - Verify that the status 'Damaged' appears in the column 'Information'. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 8d08254b2202353517c16f34172cb92dcdd5befa) Signed-off-by: Fridolin Somers commit 669b6839eab456f36ed7c65a7a97fa7b386ab4e6 Author: Nick Clemens Date: Fri Feb 26 14:46:45 2016 +0000 Bug 15924 - Coce not enabled on lists To test: Enable Coce and disable other image services Load a list and not there are no covers Apply patch Load a list and note there are covers https://bugs.koha-community.org/show_bug.cgi?id=15924 Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 85b963d11fb5d8674ca6b0ec60821663f9d8cf19) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 28 ---------------- C4/SIP/ILS/Patron.pm | 3 +- .../prog/en/modules/reserve/request.tt | 4 ++- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 20 ++++++++++-- opac/opac-account-pay.pl | 1 + t/db_dependent/SIP/Patron.t | 34 +++++++++++++++++++- 6 files changed, 56 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 11:25:35 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 09:25:35 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-72-g0679425 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.05.x has been updated via 0679425b29b9bff8c16fff91b7351a2f9f89a045 (commit) via 68cd7787717a5831ed276fce65cc2845368a7c41 (commit) via 342786ec9acbebe2aa85481d9f0f273dea8219ad (commit) via 66c568941bba29efc739f83dc3fb2cfb172d02ea (commit) via 112116e45f4676aea3a63faa42b0e6a3e2456706 (commit) via 49d8426f5634aa6433f58ce5830d9f7729605364 (commit) via 60b6d736ee306198af83e1a1482ff89280a05e7b (commit) via be1be7d7ec4f0458746b24335e6392851cf53f7b (commit) via f62992e8120b8ddda5d1ac8cb1b3276617d4dd53 (commit) from 4b360f1371a56268458b62e5c8c68da853b4e52d (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 0679425b29b9bff8c16fff91b7351a2f9f89a045 Author: Colin Campbell Date: Wed Aug 2 17:12:44 2017 +0100 Bug 19024 Do not unset order cancelled status on basket close On closing a basket, status is updated to ordered for orders not completed. However the operation was resetting the status for cancelled as well as new orders. While display is correct from the basket view (it checks the cancellation date). The status in the acquisitions tab from the catalogue view reverts erroneously to ordered. This patch adds cancelled to the statuses not updated on basket close. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 2e9165001f69312255ad1b6706f040784460d5d1) Signed-off-by: Fridolin Somers commit 68cd7787717a5831ed276fce65cc2845368a7c41 Author: Colin Campbell Date: Tue Aug 15 11:44:12 2017 +0100 Bug 19024 Fix some infelicities of phrasing in test messages The test messages were awkwardly phrased, re phrase them to sound more natuaral. Patch is cosmetic (grammar) only Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 16c25a36988b47fb9fcbabd91fdace5f98f9caed) Signed-off-by: Fridolin Somers commit 342786ec9acbebe2aa85481d9f0f273dea8219ad Author: Jonathan Druart Date: Wed Aug 9 16:09:32 2017 -0300 Bug 19024: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 7db6067dc4cc55bee771fedb31e2454b72123ac0) Signed-off-by: Fridolin Somers commit 66c568941bba29efc739f83dc3fb2cfb172d02ea Author: Jonathan Druart Date: Fri Sep 1 16:20:18 2017 -0300 Bug 9857: Fix failing tests Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 49778103ce528ccfc7fcc8be26bcae3b4ae7815b) Signed-off-by: Fridolin Somers commit 112116e45f4676aea3a63faa42b0e6a3e2456706 Author: Katrin Fischer Date: Fri Aug 18 08:36:59 2017 +0000 Bug 9857 - Follow-up - Fix for searches with su= or su: When the initial search is su=.../su:... the links was not constructed correctly. With this change, it should be the case. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 786deba62beb5a52a543af5415610e14f7d0a8c5) Signed-off-by: Fridolin Somers commit 49d8426f5634aa6433f58ce5830d9f7729605364 Author: Katrin Fischer Date: Fri Dec 4 01:17:50 2015 +0100 Bug 9857: Did you mean? uses wrong punctuation in search links The link changes the search links generated by the plugins from an=authid to an:authid, as suggested by Jared on the bug report. - Turn on the AuthorityFile und ExplodedTerms plugins for the OPAC from the "Did you mean" section of the administration module - Search a term in your OPAC where one or several authorities exist. A last name or a place name might work well. - Verify that there are suggestions displayed on top of your result list. - Verify that the link created is something like: /cgi-bin/koha/opac-search.pl?q=an=14084 - Apply patch. - Verify the link has changed a little and still works correctly: /cgi-bin/koha/opac-search.pl?q=an:14084 Signed-off-by: Fr?d?ric Demians Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit d0e3891e251a6a11188d70a5480af0e44b8c1fb0) Signed-off-by: Fridolin Somers commit 60b6d736ee306198af83e1a1482ff89280a05e7b Author: Alex Buckley Date: Wed Jul 12 10:09:48 2017 +1200 Bug 18621: Added in value attribute to dateexpiry field Test plan: 1. Create a patron category with the dateexpiry value of 29/9/2017 2. Create a patron user from that patron category (which I'll refer to as patron A) with the date expiry value of 1/10/2017 and submit the form 3. Notice that the manual dateexpiry you have submitted is correctly displayed 4. Create a duplicate patron with the same firstname and surname and patron A, and set the date expiry value of 1/10/2017 and submit the form 5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now 6. Select the new member (not a duplicate member) option in the messagebox 7. The form successfully submits and notice that the date expiry value displayed is that of the patron category (i.e. it is 29/9/2017) not the dateexpiry value of 1/10/2017 that you manually set for this patron 8. Apply patch 9. Repeat step 4 10. The form displays a duplicate patron message. Notice the dateexpiry input box still contains the value you entered which is 1/10/2017. Select the new member (not a duplicate member) option in the messagebox 11. The form successfully submits and notice that the date expiry value displayed is 1/10/2017 that you manually set for this patron Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 515e62992893b72c54a34311088a9442a37d8138) Signed-off-by: Fridolin Somers commit be1be7d7ec4f0458746b24335e6392851cf53f7b Author: Katrin Fischer Date: Fri Aug 18 00:14:52 2017 +0200 Bug 19129 - Follow-up - Add changes to patron duplicate warning Adds logic from the previous fix to the brief patron summary shown when checking a possible patron duplicate. Bonus: Also fixes missing patron category description there. To Test: - Add 2 patrons - Add a patron with the same surname and firstname as an existing patron in order to trigger the duplicate message - Click "View existing patron" - Verify display is correct when existing patron is - an organisation - not an organisation - Verify that the patron category description shows Signed-off-by: Aleisha Amohia Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit a887aeb2dff4e52f35f1f64bfc267867987cbb53) Signed-off-by: Fridolin Somers commit f62992e8120b8ddda5d1ac8cb1b3276617d4dd53 Author: Katrin Fischer Date: Thu Aug 17 14:51:08 2017 +0000 Bug 19129 - Clean up Details tab for Organisation patrons Problem: A patron category "I" would cause display problems on the details in the intranet. This is because the templates confused patron category "I" with patron type "I" (organisation). Patch: - Cleans up variable confusion between categorycode and categorytype. - The template contained code to change the labels below the address to 'Organisational phone:" etc., I have removed this part as it does not match the edit form anymore. - Initials, date of birth and gender are still hidden for organisation - matching the edit form. Bonus: - The patron category description was missing on the right and left side of the details tab. Now it displays. - Fixes some html issues: - doubled up class attribute in a tag - doubled up To test: - Create 3 patrons - patron category code doesn't matter, but category type organisation - patron category code 'I', category type NOT organisation - patron category code NOT I, category type NOT organisaton - Check details tab in patron account in staff for all 3 - Verify patron category description shows correctly - Verify information added to the account displays correctly (phone numbers, emails, ...) Signed-off-by: Aleisha Amohia Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 82f183c5ea802e3231cb2442cf32474c92bd6ab4) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 +- Koha/SuggestionEngine/Plugin/AuthorityFile.pm | 5 +- Koha/SuggestionEngine/Plugin/ExplodedTerms.pm | 7 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 +- .../prog/en/includes/members-toolbar.inc | 4 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 28 +++----- .../prog/en/modules/members/moremember.tt | 74 +++++++++----------- members/moremember.pl | 6 +- t/SuggestionEngine_AuthorityFile.t | 2 +- t/db_dependent/Acquisition/close_reopen_basket.t | 15 +++- t/db_dependent/SuggestionEngine_ExplodedTerms.t | 4 +- 12 files changed, 75 insertions(+), 85 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 11:43:30 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 09:43:30 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-81-g3352a6e 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.05.x has been updated via 3352a6ee9e7526e228f66ea420fd99709a601f82 (commit) via 9f07f1493f9f44c7a7b691c79bf9215a76758670 (commit) via 936ee4a1cf9dda6a5d8c1753c40b73b9720ed0bb (commit) via 73f0c231bbd1c8a0b1d7c22d0a2fcb49a4811863 (commit) via c618b787bf98e6b9c8004694cfd066e936760191 (commit) via 667a907aa73ab210ee05bc9ef73f8ab3bedbe6bf (commit) via c5c174e834cad2110f45eec90b80441f2f4ec0f4 (commit) via 07695e8de40c55f2837ae81b5e35b8e11656f272 (commit) via 74752502b309ddec4311a4311a3481bf54061187 (commit) from 0679425b29b9bff8c16fff91b7351a2f9f89a045 (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 3352a6ee9e7526e228f66ea420fd99709a601f82 Author: Katrin Fischer Date: Sat Aug 19 10:22:44 2017 +0200 Bug 14316: Clarify meaning of record number in Batch record modification tool Same change as the first patch, but for the batch record modification tool. Signed-off-by: Marc V?ron Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 327495b5e0ec4de47d20bd27d6a1c5b88e0be191) Signed-off-by: Fridolin Somers commit 9f07f1493f9f44c7a7b691c79bf9215a76758670 Author: Katrin Fischer Date: Mon Jun 8 02:03:34 2015 +0200 Bug 14316: Clarify meaning of record number in Batch record deletion tool Changes the label from 'list of record numbers...' to 'List of biblionumbers or authority ids...' to make it more clear to the user which kind of input is expected. To test: - Go to Tools > Batch record deletion - Check the new description - Decide if it's more clear or not Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 4934ee4a1601bd268a7153b7189387bb073dd11f) Signed-off-by: Fridolin Somers commit 936ee4a1cf9dda6a5d8c1753c40b73b9720ed0bb Author: Kyle M Hall Date: Fri Sep 1 08:41:51 2017 -0400 Bug 18946 [QA Followup] - code cleanup Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit f1b0dae9a6055e8ba5e9a9638af32060c1e17e33) Signed-off-by: Fridolin Somers commit 73f0c231bbd1c8a0b1d7c22d0a2fcb49a4811863 Author: Karam Qubsi Date: Wed Jul 19 00:06:48 2017 +0800 Bug 18946 - Change language from external web fails How to reproduce: 1. Get a multiling?al Koha like http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=en http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=es-ES 2. Copy that urls to any web page in an other domain -it must be in some host - and try to link to the spanish or english version,it will keep you in the same position. 3. Apply this patch and try again , everything should work fine . Signed-off-by: Hugo Agud Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 48f54016a7accfc0cc43bf01cbac70a8482bc3f9) Signed-off-by: Fridolin Somers commit c618b787bf98e6b9c8004694cfd066e936760191 Author: Lari Taskula Date: Wed May 31 17:03:54 2017 +0300 Bug 18692 - intranet part Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intranet messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit bb31d99065c468fbec2443cd15894b03657a24d5) Signed-off-by: Fridolin Somers commit 667a907aa73ab210ee05bc9ef73f8ab3bedbe6bf Author: Fridolin Somers Date: Thu Jun 1 17:22:42 2017 +0200 Bug 18692 - same with syspref TalkingTechItivaPhone Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intra and OPAC messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. https://bugs.koha-community.org/show_bug.cgi?id=8692 Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 8fd0847c82adbcaf0af3285dd9cfc5e646ba6500) Signed-off-by: Fridolin Somers commit c5c174e834cad2110f45eec90b80441f2f4ec0f4 Author: Fridolin Somers Date: Mon May 29 16:32:18 2017 +0200 Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned Bug 6726 had corrected the fact that when SMS is enabled the messaging table is missing a column. Bug 6458 has broken this. The SMS column is missing an else case with cell containing only "-" like other columns. Test plan : - set SMSSendDriver preference empty - go to OPAC patron messaging - column SMS should not be visible - set SMSSendDriver preference not empty - go to OPAC patron messaging - column SMS appears with checkboxes Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit a932d05ace6500a3b67888aad1306e58cfa8014f) Signed-off-by: Fridolin Somers commit 07695e8de40c55f2837ae81b5e35b8e11656f272 Author: Marc V?ron Date: Wed Aug 9 09:46:02 2017 +0200 Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields This patch adds a note to the system preferences autonembernum and BorrowerMandatoryFields regarding a conflict if automembernum is on and BorrowerMandatoryFields contains cardnumber. To reproduce issue: See initial comment. To test: - Apply patch - Verify that in system preferences note appears with both prefs automembernum and BorrowerMandatoryFields Followed test plan, works as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 65bce82b1fb32d3d98fe4d4ef1e1738a97749632) Signed-off-by: Fridolin Somers commit 74752502b309ddec4311a4311a3481bf54061187 Author: Marc V?ron Date: Tue Jun 27 18:50:44 2017 +0200 Bug 16485: collection column in Item search is always empty This patch fills the column 'Collection' in item search from the item values. To test: - Go to item search - Reproduce issue from initial comment - Apply patch - Verify that the column 'Collection' is filled Still to do, but outside of my datatable skills: Filter by drop down in the column header does a substring search. Example: Filter for 'Fiction" returns both 'Fiction' and 'Non-fiction' items. Signed-off-by: Owen Leonard Signed-off-by: Laurence Rault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../en/includes/catalogue/itemsearch_item.json.inc | 3 ++- .../prog/en/includes/messaging-preference-form.inc | 20 ++++++++++++++++---- .../prog/en/modules/admin/preferences/patrons.pref | 2 ++ .../prog/en/modules/catalogue/itemsearch.tt | 4 ++-- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../bootstrap/en/modules/opac-messaging.tt | 10 ++++++++-- opac/opac-changelanguage.pl | 14 ++++++++++---- 8 files changed, 42 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 12:21:04 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 10:21:04 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-84-gad71886 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.05.x has been updated via ad718868553f149d0e9ea9ec7b7718677bac6c5e (commit) via fba32956691ec0b3295e75aa8554d1454cb29819 (commit) via 2fdd3ef94a424d956fd6032662e6a69ddb81e511 (commit) from 3352a6ee9e7526e228f66ea420fd99709a601f82 (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 ad718868553f149d0e9ea9ec7b7718677bac6c5e Author: Marcel de Rooy Date: Mon Aug 28 08:51:24 2017 +0200 Bug 19004: [QA Follow-up] No need to check item-level_itypes again As Jonathan pointed out, GetItem already called effective_itemtype. So we can just use $item->{itype} here. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 0e744d49b557e3401ae7b700b1410b022a4e851c) commit fba32956691ec0b3295e75aa8554d1454cb29819 Author: Marcel de Rooy Date: Wed Aug 9 16:30:03 2017 +0200 Bug 19004: Adjust AddReturn for retrieving item type In the regular situation, you can get itemtype via biblio and then biblioitem as well as via biblioitem (at least when item-level_itypes is set to biblio). But since Koha unfortunately defined two relations in item, one for biblioitemnumber (the good one) and one for biblionumber (redundant), TestBuilder (correctly) builds one biblioitem and two biblios. If you item-level_itypes to biblio record, this will result in failing tests when calling AddReturn (in this case Koha/Patrons.t). It will crash on: Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826. Cause: AddReturn goes via the biblionumber to biblio and than to biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder but a database design problem.) This patch makes a small change in AddReturn to retrieve the itemtype via biblioitem. It actually is a shorter road than items->biblio->biblioitems. Note: I do not test the Biblioitems->find call, since we already checked the GetItem call before and we have a foreign key constraint. I did not call $item->effective_itemtype since we still use GetItem; this could be done later. Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and we called AddBiblio before, we should link biblioitemnumber as well. Test plan: [1] Do not apply this patch yet. [2] Set item-level_itypes to biblio record. [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.) [4] Apply this patch. [5] Run t/db_dependent/Koha/Patrons.t again. [6] Run t/db_dependent/Circulation/Returns.t [7] Git grep on AddReturn and run a few other tests calling it. Note: Bugs 19070/19071 address three tests that call AddReturn too. [8] In the interface, check in a book. Signed-off-by: Marcel de Rooy Note: Bugs 19070 and 19071 are already pushed. The command in comment #4 has all the tests successful. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 0fc3f19605d3979333dc333237205b9bef6ab60b) commit 2fdd3ef94a424d956fd6032662e6a69ddb81e511 Author: Marcel de Rooy Date: Sun Jul 30 16:53:00 2017 +0200 Bug 19004: Patrons.t should create its own data for enrollment fees. If the patron categories J, K, YA would not exist, Patrons.t would fail. Test plan: [1] Remove one of these patron categories. [2] Run t/db_dependent/Koha/Patrons.t Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 57427f7a10c887964fa4d4397c6ec238af2bc694) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 6 ++---- t/db_dependent/Circulation/Returns.t | 4 +++- t/db_dependent/Koha/Patrons.t | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 16:04:34 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 14:04:34 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-85-g02d518b 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.05.x has been updated via 02d518b334596ed585596c614ab31c0656901634 (commit) from ad718868553f149d0e9ea9ec7b7718677bac6c5e (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 02d518b334596ed585596c614ab31c0656901634 Author: Jonathan Druart Date: Thu Sep 28 14:49:11 2017 -0300 Bug 19385: Fix random t/Calendar.t failure - clear the cache before The cache 'exception_holidays' may be populated when we run these tests, we need to clear it before the tests are run. Test plan: prove t/db_dependent/Circulation/CalcDateDue.t t/Calendar.t Without this patch, t/Calendar will fail with: # Failed test 'Exception holiday is not a closed day test' # at t/Calendar.t line 159. # got: '1' # expected: '0' # Looks like you failed 1 test of 38. Signed-off-by: Jonathan Druart (cherry picked from commit ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: t/Calendar.t | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 16:11:42 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 14:11:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-708-g9dca694 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 9dca694b04d0f5e5e0a307e0d5243ce61fb1ef79 (commit) from 7a60e52bd8e04f039f04e8418db42fc563222aa1 (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 9dca694b04d0f5e5e0a307e0d5243ce61fb1ef79 Author: Jonathan Druart Date: Tue Oct 3 11:03:43 2017 -0300 Bug 16726: Do not display "You searched for:" if not needed Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 17:05:32 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 15:05:32 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-90-g2b4d0cb 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.05.x has been updated via 2b4d0cb0b4e16b008ad9928a09259accfa1efc7a (commit) via faf651e514a1d2f5fa84df0c64556cc9962afc99 (commit) via 088e332760b55c6f7a44097d8ab5d84003d8f0e0 (commit) via a24ac206701bdde509baf47f005aa31bf42a1b6a (commit) via b6b6acf285f98a7da665eac6741cdfc87b089b57 (commit) from 02d518b334596ed585596c614ab31c0656901634 (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 2b4d0cb0b4e16b008ad9928a09259accfa1efc7a Author: Mark Tompsett Date: Mon Oct 2 22:00:57 2017 -0400 Bug 18897: Add skipping to t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ sudo apt-get remove libcatmandu-store-elasticsearch-perl $ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t -- nasty failure. $ git bz apply 18897 -- apply all the patches $ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t -- nicer skip message run the koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Fridolin Somers commit faf651e514a1d2f5fa84df0c64556cc9962afc99 Author: Mark Tompsett Date: Mon Oct 2 21:50:01 2017 -0400 Bug 18897: Skipping t/db_dependend/00-strict elastic search stuffs as needed Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ sudo apt-get remove libcatmandu-store-elasticsearch-perl $ prove t/db_dependent/00-strict.t -- nasty failure. $ git bz apply 18897 -- interactive apply just the four patchs $ prove t/db_dependent/00-strict.t -- nicer skip message run the koha qa test tools Signed-off-by: Tomas Cohen Arazi commit 088e332760b55c6f7a44097d8ab5d84003d8f0e0 Author: Mark Tompsett Date: Fri Sep 1 14:15:44 2017 -0400 Bug 18897: Use Module::Load::Conditional::can_load Rather than rely on eval(), Jonathan Druart recommended in comment #6 to use Use Module::Load::Conditional::can_load. This addresses that concern. TEST PLAN --------- $ git fetch $ git checkout -b bug_18897 origin/master $ git bz apply 18897 $ sudo apt-get remove libcatmandu-store-elasticsearch-perl ... $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the correct library is missing. $ sudo apt-get install libcatmandu-store-elasticsearch-perl -- Note it runs as expected. run the koha qa test tools Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi commit a24ac206701bdde509baf47f005aa31bf42a1b6a Author: Mark Tompsett Date: Fri Aug 25 07:38:06 2017 -0400 Bug 18897: Improve error message Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ git bz apply 18897 -- interactive apply just the first patch $ sudo apt-get remove libcatmandu-store-elasticsearch-perl ... $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the wrong library is missing. $ git bz apply 18897 -- interactive apply this patch $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the correct library is missing. run the koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi commit b6b6acf285f98a7da665eac6741cdfc87b089b57 Author: Lee Jamison Date: Fri Aug 25 07:18:15 2017 -0400 Bug 18897: Koha_Elasticsearch_Indexer.t doesn't skip when ES module(s) not installed If Catmandu::Importer::MARC is not installed, Koha_Elasticsearch_Indexer.t fails instead of skipping. It should skip as ES is not currently mandatory. Test Plan: 1. Run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t" as koha-shell 2. Note failure on test 1/5 indicating module not installed. 3. Apply patch. 4. Re-run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t" 5. Note test now skips. Signed-off-by: Mark Tompsett Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: t/db_dependent/00-strict.t | 21 +++++++++++++++++++- t/db_dependent/Koha_Elasticsearch_Indexer.t | 17 +++++++++++++++- .../Koha_SearchEngine_Elasticsearch_Search.t | 17 +++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 19:42:03 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 17:42:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-710-ga2cc68e 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 a2cc68e8b7a33dd7983c2125e32ba269777b8ace (commit) via 5c873a408f40fd1660d0b09c6de8c1ca2e252d11 (commit) from 9dca694b04d0f5e5e0a307e0d5243ce61fb1ef79 (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 a2cc68e8b7a33dd7983c2125e32ba269777b8ace Author: Jonathan Druart Date: Tue Oct 3 12:15:30 2017 -0300 Bug 19350: Add tests commit 5c873a408f40fd1660d0b09c6de8c1ca2e252d11 Author: Dobrica Pavlinusic Date: Wed Sep 20 16:01:16 2017 +0200 Bug 19350 - Holds without link in 773 trigger SQL::Abstract::puke Test: 1. find bibio without items which has something in field 773 (for us, it's article) but doesn't have 0 or 9 (host item entry) 2. click on hold in left menu 3. verify application error 4. apply patch and verify that it works Signed-off-by: Josef Moravec ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 5 +++++ t/db_dependent/Items.t | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 3 20:26:32 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 18:26:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-712-gcb26219 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 cb26219903c30ee6acce926d4a1bb6152f35668c (commit) via 0b0059afb42aca25a3d10dfb372c2b26adcd6e41 (commit) from a2cc68e8b7a33dd7983c2125e32ba269777b8ace (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 cb26219903c30ee6acce926d4a1bb6152f35668c Author: Jonathan Druart Date: Tue Oct 3 14:16:02 2017 -0300 Bug 19403: Prevent Circulation.t to fail randomly Due to the number of test cases handle by CanBookBeIssued, Circulation.t fails randomly. To prevent that it is better to set some values. For instance if the patron is a statistical patron (category_type=X), the subroutine will return a STATS flag. This patch also adds a subroutine to the test file to display the keys of $error, $question and $alert set by CanBookBeIssued. It will be easier to track other random failures. Signed-off-by: Jonathan Druart commit 0b0059afb42aca25a3d10dfb372c2b26adcd6e41 Author: Jonathan Druart Date: Tue Oct 3 14:15:47 2017 -0300 Bug 19403: Add some default values when building patrons for test To avoid some tests to fail randomly Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 96 ++++++++++++++++++++++-------------------- t/lib/TestBuilder.pm | 4 ++ 2 files changed, 55 insertions(+), 45 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 4 00:28:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Oct 2017 22:28:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-713-ga1bf319 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 a1bf319829c9d44991daa2fcf2593420f8445c5b (commit) from cb26219903c30ee6acce926d4a1bb6152f35668c (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 a1bf319829c9d44991daa2fcf2593420f8445c5b Author: Jonathan Druart Date: Tue Oct 3 19:20:18 2017 -0300 Bug 19405: Prevent api/v1/holds.t to fail randomly DBD::mysql::st execute failed: Duplicate entry 'cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvn' for key 'userid' [for Statement "INSERT INTO `borrowers` ( `branchcode`, `categorycode`, `flags`, `surname`, `userid`) VALUES ( ?, ?, ?, ?, ? )" with ParamValues: 0='N2ElsY9', 1='Kk8G', 2=80, 3='Test Surname', 4='cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvnnbgezJqmxqwz'] at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1832. DBIx::Class::Storage::DBI::_dbh_execute(): Duplicate entry 'cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvn' for key 'userid' at /kohadevbox/koha/Koha/Object.pm line 121 [18:52:19] t/db_dependent/api/v1/holds.t Reading the code I guess it happens if TestBuilder generates a userid with the size of borrowers.userid (75 chars). In that case the following lines are wrong: $borrower->userid($nopermission->{ userid }."z"); $borrower2->userid($nopermission->{ userid }."x"); $borrower3->userid($nopermission->{ userid }."y"); The 3 patrons will have the same userid. Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/api/v1/holds.t | 89 +++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 40 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 4 18:26:54 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 04 Oct 2017 16:26:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-714-g10b5e1e 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 10b5e1ee049605ae6a0614214a7dab76e20e0ca5 (commit) from a1bf319829c9d44991daa2fcf2593420f8445c5b (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 10b5e1ee049605ae6a0614214a7dab76e20e0ca5 Author: Jonathan Druart Date: Mon Oct 2 14:11:52 2017 -0300 Bug 19122: (bug 18098 follow-up) Fix IncludeSeeFromInSearches behaviour The IncludeSeeFromInSearches system preference is designed so that 'See from' headings from the authorities are included when you search in the catalog. That means that you could find an author not only by the name printed on the book, but for example also by their pseudonym or a different spelling of their name. It was added by bug 7417. This regression has been introduced by commit 5ef1b6710e7520b844e145e248da0deeee707fde Bug 18098: Add an index with the count of not onloan items - } elsif ($record_type eq 'biblio' && C4::Context->preference('IncludeSeeFromInSearches')) { - my $normalizer = Koha::RecordProcessor->new( { filters => 'EmbedSeeFromHeadings' } ); [...] + push @filters, 'IncludeSeeFromInSearches' + if C4::Context->preference('IncludeSeeFromInSearches'); Test plan: - Activate IncludeSeeFromInSearches - Catalog an authority for a person - main heading in 100 - see from headings in 400 - Catalog a bibliographic record and link it to the authority - Make sure the record is indexed - Verify that the record can be found searching for the main heading - Verify that the record can be found searching for the see from headings Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Yet another reason to get rid of all this functions from this script. Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: misc/migration_tools/rebuild_zebra.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 6 08:25:00 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Oct 2017 06:25:00 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-67-g319369c 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, 16.11.x has been updated via 319369ccc2b4c7e356cf2d24b9571b6365e4ccb8 (commit) via 762fdf3e3c2de3a71fcca9b514ad0f0dd9d59fed (commit) via d708f5726658367212e96cd5de542d7658c7eae9 (commit) via 82db13b7116a202a3bc9baf81f198ef9a227b85e (commit) via ecc6542c8c205228dd771388c72fac161c89fc2d (commit) via 0e5ae1af5de6423c99daa77b31bbe309159ccd62 (commit) via 3e38feb58a07e5e60fdde726fe90199958bbc653 (commit) via bd2602adacce6ff8caf448abc62947e4e25f3728 (commit) via 3435f41c3a3df02c000a888185ad384124c39e1d (commit) via d790db9032ca2db8600eeeca34900e13620e722d (commit) via 6042f0aa4d1dd567a3c65d58eb5b2dbd4d8225cb (commit) via 5fd46da8061a49f3f1da4a8582492cd3e4ec5ee3 (commit) via 5393b2455260b6e34602272d1ff7a1a17b5e6968 (commit) via b2b16f3820d9d2e4ef26a2b5c4dc4e551fbad576 (commit) via 12188c983477479372f8905bfc0372ca744092ca (commit) via 9355a1a00562659efeddae0b550cc24f06568bc5 (commit) via b8baced52c1f5bc7c8781f4ce96e7a3a2ab6b4c4 (commit) via 35bde143cf882728381e16c42ed572dc1bf29a5b (commit) via 6473754f54f401a29a8b2e5256cce2225065cb3f (commit) via 3f7c40b7eb5b62731a1e3b9a85bbdfcbe0ffc435 (commit) via c03a9a2d8c5715ffa24681d8dfb836f128a2b404 (commit) via e9a48b2ec7b5c3dda65f7eaa5182a46b0082e2b4 (commit) via 98d9ef0b65805e8455abe2353984439c9d5f8584 (commit) via 2b82ff17ee6273a9dabec230a1fb4ccec82734a2 (commit) via 255cf73ae9334698e226fd0ab392cd8a140fcc70 (commit) via 7d448f66848efbc342609399371ea522662e11d0 (commit) via 771f433b60965fed7eb9f1c3501f4b1308e059cc (commit) via 263f8ec935ce8dfa8cf5d1c915a037084c952b1d (commit) via 0c9717bcfca462d180f3309c7b743e167da7cd2b (commit) via 05a96c084f75a75544f817dc78a8d073b4244102 (commit) via 400f2ea196140e78202f714c8712f93f46452665 (commit) via 368dfc081576914927b202b1624d558f46dcc7e5 (commit) via eb638bdc977ebfe7f9b13e22593109388dcffa9c (commit) via b975b971b4609fa005e69fb11832f560b748156a (commit) from 96fa3f51e142a6ef0538aa84e5134a56aa7af750 (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 319369ccc2b4c7e356cf2d24b9571b6365e4ccb8 Author: Mark Tompsett Date: Mon Oct 2 22:00:57 2017 -0400 Bug 18897: Add skipping to t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ sudo apt-get remove libcatmandu-store-elasticsearch-perl $ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t -- nasty failure. $ git bz apply 18897 -- apply all the patches $ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t -- nicer skip message run the koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Fridolin Somers (cherry picked from commit 2b4d0cb0b4e16b008ad9928a09259accfa1efc7a) Signed-off-by: Katrin Fischer commit 762fdf3e3c2de3a71fcca9b514ad0f0dd9d59fed Author: Mark Tompsett Date: Mon Oct 2 21:50:01 2017 -0400 Bug 18897: Skipping t/db_dependend/00-strict elastic search stuffs as needed Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ sudo apt-get remove libcatmandu-store-elasticsearch-perl $ prove t/db_dependent/00-strict.t -- nasty failure. $ git bz apply 18897 -- interactive apply just the four patchs $ prove t/db_dependent/00-strict.t -- nicer skip message run the koha qa test tools Signed-off-by: Tomas Cohen Arazi (cherry picked from commit faf651e514a1d2f5fa84df0c64556cc9962afc99) Signed-off-by: Katrin Fischer commit d708f5726658367212e96cd5de542d7658c7eae9 Author: Mark Tompsett Date: Fri Sep 1 14:15:44 2017 -0400 Bug 18897: Use Module::Load::Conditional::can_load Rather than rely on eval(), Jonathan Druart recommended in comment #6 to use Use Module::Load::Conditional::can_load. This addresses that concern. TEST PLAN --------- $ git fetch $ git checkout -b bug_18897 origin/master $ git bz apply 18897 $ sudo apt-get remove libcatmandu-store-elasticsearch-perl ... $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the correct library is missing. $ sudo apt-get install libcatmandu-store-elasticsearch-perl -- Note it runs as expected. run the koha qa test tools Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 088e332760b55c6f7a44097d8ab5d84003d8f0e0) Signed-off-by: Katrin Fischer commit 82db13b7116a202a3bc9baf81f198ef9a227b85e Author: Mark Tompsett Date: Fri Aug 25 07:38:06 2017 -0400 Bug 18897: Improve error message Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ git bz apply 18897 -- interactive apply just the first patch $ sudo apt-get remove libcatmandu-store-elasticsearch-perl ... $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the wrong library is missing. $ git bz apply 18897 -- interactive apply this patch $ prove t/db_dependent/Koha_Elasticsearch_Indexer.t -- Note that the message says the correct library is missing. run the koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a24ac206701bdde509baf47f005aa31bf42a1b6a) Signed-off-by: Katrin Fischer commit ecc6542c8c205228dd771388c72fac161c89fc2d Author: Lee Jamison Date: Fri Aug 25 07:18:15 2017 -0400 Bug 18897: Koha_Elasticsearch_Indexer.t doesn't skip when ES module(s) not installed If Catmandu::Importer::MARC is not installed, Koha_Elasticsearch_Indexer.t fails instead of skipping. It should skip as ES is not currently mandatory. Test Plan: 1. Run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t" as koha-shell 2. Note failure on test 1/5 indicating module not installed. 3. Apply patch. 4. Re-run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t" 5. Note test now skips. Signed-off-by: Mark Tompsett Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b6b6acf285f98a7da665eac6741cdfc87b089b57) Signed-off-by: Katrin Fischer commit 0e5ae1af5de6423c99daa77b31bbe309159ccd62 Author: Jonathan Druart Date: Thu Sep 28 14:49:11 2017 -0300 Bug 19385: Fix random t/Calendar.t failure - clear the cache before The cache 'exception_holidays' may be populated when we run these tests, we need to clear it before the tests are run. Test plan: prove t/db_dependent/Circulation/CalcDateDue.t t/Calendar.t Without this patch, t/Calendar will fail with: # Failed test 'Exception holiday is not a closed day test' # at t/Calendar.t line 159. # got: '1' # expected: '0' # Looks like you failed 1 test of 38. Signed-off-by: Jonathan Druart (cherry picked from commit ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c) Signed-off-by: Fridolin Somers (cherry picked from commit 02d518b334596ed585596c614ab31c0656901634) Signed-off-by: Katrin Fischer commit 3e38feb58a07e5e60fdde726fe90199958bbc653 Author: Marcel de Rooy Date: Mon Aug 28 08:51:24 2017 +0200 Bug 19004: [QA Follow-up] No need to check item-level_itypes again As Jonathan pointed out, GetItem already called effective_itemtype. So we can just use $item->{itype} here. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 0e744d49b557e3401ae7b700b1410b022a4e851c) (cherry picked from commit ad718868553f149d0e9ea9ec7b7718677bac6c5e) Signed-off-by: Katrin Fischer commit bd2602adacce6ff8caf448abc62947e4e25f3728 Author: Marcel de Rooy Date: Wed Aug 9 16:30:03 2017 +0200 Bug 19004: Adjust AddReturn for retrieving item type In the regular situation, you can get itemtype via biblio and then biblioitem as well as via biblioitem (at least when item-level_itypes is set to biblio). But since Koha unfortunately defined two relations in item, one for biblioitemnumber (the good one) and one for biblionumber (redundant), TestBuilder (correctly) builds one biblioitem and two biblios. If you item-level_itypes to biblio record, this will result in failing tests when calling AddReturn (in this case Koha/Patrons.t). It will crash on: Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826. Cause: AddReturn goes via the biblionumber to biblio and than to biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder but a database design problem.) This patch makes a small change in AddReturn to retrieve the itemtype via biblioitem. It actually is a shorter road than items->biblio->biblioitems. Note: I do not test the Biblioitems->find call, since we already checked the GetItem call before and we have a foreign key constraint. I did not call $item->effective_itemtype since we still use GetItem; this could be done later. Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and we called AddBiblio before, we should link biblioitemnumber as well. Test plan: [1] Do not apply this patch yet. [2] Set item-level_itypes to biblio record. [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.) [4] Apply this patch. [5] Run t/db_dependent/Koha/Patrons.t again. [6] Run t/db_dependent/Circulation/Returns.t [7] Git grep on AddReturn and run a few other tests calling it. Note: Bugs 19070/19071 address three tests that call AddReturn too. [8] In the interface, check in a book. Signed-off-by: Marcel de Rooy Note: Bugs 19070 and 19071 are already pushed. The command in comment #4 has all the tests successful. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 0fc3f19605d3979333dc333237205b9bef6ab60b) (cherry picked from commit fba32956691ec0b3295e75aa8554d1454cb29819) Signed-off-by: Katrin Fischer commit 3435f41c3a3df02c000a888185ad384124c39e1d Author: Marcel de Rooy Date: Sun Jul 30 16:53:00 2017 +0200 Bug 19004: Patrons.t should create its own data for enrollment fees. If the patron categories J, K, YA would not exist, Patrons.t would fail. Test plan: [1] Remove one of these patron categories. [2] Run t/db_dependent/Koha/Patrons.t Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 57427f7a10c887964fa4d4397c6ec238af2bc694) Signed-off-by: Fridolin Somers (cherry picked from commit 2fdd3ef94a424d956fd6032662e6a69ddb81e511) Signed-off-by: Katrin Fischer commit d790db9032ca2db8600eeeca34900e13620e722d Author: Katrin Fischer Date: Sat Aug 19 10:22:44 2017 +0200 Bug 14316: Clarify meaning of record number in Batch record modification tool Same change as the first patch, but for the batch record modification tool. Signed-off-by: Marc V?ron Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 327495b5e0ec4de47d20bd27d6a1c5b88e0be191) Signed-off-by: Fridolin Somers (cherry picked from commit 3352a6ee9e7526e228f66ea420fd99709a601f82) Signed-off-by: Katrin Fischer commit 6042f0aa4d1dd567a3c65d58eb5b2dbd4d8225cb Author: Katrin Fischer Date: Mon Jun 8 02:03:34 2015 +0200 Bug 14316: Clarify meaning of record number in Batch record deletion tool Changes the label from 'list of record numbers...' to 'List of biblionumbers or authority ids...' to make it more clear to the user which kind of input is expected. To test: - Go to Tools > Batch record deletion - Check the new description - Decide if it's more clear or not Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 4934ee4a1601bd268a7153b7189387bb073dd11f) Signed-off-by: Fridolin Somers (cherry picked from commit 9f07f1493f9f44c7a7b691c79bf9215a76758670) Signed-off-by: Katrin Fischer commit 5fd46da8061a49f3f1da4a8582492cd3e4ec5ee3 Author: Kyle M Hall Date: Fri Sep 1 08:41:51 2017 -0400 Bug 18946 [QA Followup] - code cleanup Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit f1b0dae9a6055e8ba5e9a9638af32060c1e17e33) Signed-off-by: Fridolin Somers (cherry picked from commit 936ee4a1cf9dda6a5d8c1753c40b73b9720ed0bb) Signed-off-by: Katrin Fischer commit 5393b2455260b6e34602272d1ff7a1a17b5e6968 Author: Karam Qubsi Date: Wed Jul 19 00:06:48 2017 +0800 Bug 18946 - Change language from external web fails How to reproduce: 1. Get a multiling?al Koha like http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=en http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=es-ES 2. Copy that urls to any web page in an other domain -it must be in some host - and try to link to the spanish or english version,it will keep you in the same position. 3. Apply this patch and try again , everything should work fine . Signed-off-by: Hugo Agud Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 48f54016a7accfc0cc43bf01cbac70a8482bc3f9) Signed-off-by: Fridolin Somers (cherry picked from commit 73f0c231bbd1c8a0b1d7c22d0a2fcb49a4811863) Signed-off-by: Katrin Fischer commit b2b16f3820d9d2e4ef26a2b5c4dc4e551fbad576 Author: Lari Taskula Date: Wed May 31 17:03:54 2017 +0300 Bug 18692 - intranet part Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intranet messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit bb31d99065c468fbec2443cd15894b03657a24d5) Signed-off-by: Fridolin Somers (cherry picked from commit c618b787bf98e6b9c8004694cfd066e936760191) Signed-off-by: Katrin Fischer commit 12188c983477479372f8905bfc0372ca744092ca Author: Fridolin Somers Date: Thu Jun 1 17:22:42 2017 +0200 Bug 18692 - same with syspref TalkingTechItivaPhone Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intra and OPAC messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. https://bugs.koha-community.org/show_bug.cgi?id=8692 Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 8fd0847c82adbcaf0af3285dd9cfc5e646ba6500) Signed-off-by: Fridolin Somers (cherry picked from commit 667a907aa73ab210ee05bc9ef73f8ab3bedbe6bf) Signed-off-by: Katrin Fischer commit 9355a1a00562659efeddae0b550cc24f06568bc5 Author: Fridolin Somers Date: Mon May 29 16:32:18 2017 +0200 Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned Bug 6726 had corrected the fact that when SMS is enabled the messaging table is missing a column. Bug 6458 has broken this. The SMS column is missing an else case with cell containing only "-" like other columns. Test plan : - set SMSSendDriver preference empty - go to OPAC patron messaging - column SMS should not be visible - set SMSSendDriver preference not empty - go to OPAC patron messaging - column SMS appears with checkboxes Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit a932d05ace6500a3b67888aad1306e58cfa8014f) Signed-off-by: Fridolin Somers (cherry picked from commit c5c174e834cad2110f45eec90b80441f2f4ec0f4) Signed-off-by: Katrin Fischer commit b8baced52c1f5bc7c8781f4ce96e7a3a2ab6b4c4 Author: Marc V?ron Date: Wed Aug 9 09:46:02 2017 +0200 Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields This patch adds a note to the system preferences autonembernum and BorrowerMandatoryFields regarding a conflict if automembernum is on and BorrowerMandatoryFields contains cardnumber. To reproduce issue: See initial comment. To test: - Apply patch - Verify that in system preferences note appears with both prefs automembernum and BorrowerMandatoryFields Followed test plan, works as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 65bce82b1fb32d3d98fe4d4ef1e1738a97749632) Signed-off-by: Fridolin Somers (cherry picked from commit 07695e8de40c55f2837ae81b5e35b8e11656f272) Signed-off-by: Katrin Fischer commit 35bde143cf882728381e16c42ed572dc1bf29a5b Author: Marc V?ron Date: Tue Jun 27 18:50:44 2017 +0200 Bug 16485: collection column in Item search is always empty This patch fills the column 'Collection' in item search from the item values. To test: - Go to item search - Reproduce issue from initial comment - Apply patch - Verify that the column 'Collection' is filled Still to do, but outside of my datatable skills: Filter by drop down in the column header does a substring search. Example: Filter for 'Fiction" returns both 'Fiction' and 'Non-fiction' items. Signed-off-by: Owen Leonard Signed-off-by: Laurence Rault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5) Signed-off-by: Fridolin Somers (cherry picked from commit 74752502b309ddec4311a4311a3481bf54061187) Signed-off-by: Katrin Fischer commit 6473754f54f401a29a8b2e5256cce2225065cb3f Author: Colin Campbell Date: Wed Aug 2 17:12:44 2017 +0100 Bug 19024 Do not unset order cancelled status on basket close On closing a basket, status is updated to ordered for orders not completed. However the operation was resetting the status for cancelled as well as new orders. While display is correct from the basket view (it checks the cancellation date). The status in the acquisitions tab from the catalogue view reverts erroneously to ordered. This patch adds cancelled to the statuses not updated on basket close. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 2e9165001f69312255ad1b6706f040784460d5d1) Signed-off-by: Fridolin Somers (cherry picked from commit 0679425b29b9bff8c16fff91b7351a2f9f89a045) Signed-off-by: Katrin Fischer commit 3f7c40b7eb5b62731a1e3b9a85bbdfcbe0ffc435 Author: Colin Campbell Date: Tue Aug 15 11:44:12 2017 +0100 Bug 19024 Fix some infelicities of phrasing in test messages The test messages were awkwardly phrased, re phrase them to sound more natuaral. Patch is cosmetic (grammar) only Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 16c25a36988b47fb9fcbabd91fdace5f98f9caed) Signed-off-by: Fridolin Somers (cherry picked from commit 68cd7787717a5831ed276fce65cc2845368a7c41) Signed-off-by: Katrin Fischer commit c03a9a2d8c5715ffa24681d8dfb836f128a2b404 Author: Jonathan Druart Date: Wed Aug 9 16:09:32 2017 -0300 Bug 19024: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 7db6067dc4cc55bee771fedb31e2454b72123ac0) Signed-off-by: Fridolin Somers (cherry picked from commit 342786ec9acbebe2aa85481d9f0f273dea8219ad) Signed-off-by: Katrin Fischer commit e9a48b2ec7b5c3dda65f7eaa5182a46b0082e2b4 Author: Jonathan Druart Date: Fri Sep 1 16:20:18 2017 -0300 Bug 9857: Fix failing tests Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 49778103ce528ccfc7fcc8be26bcae3b4ae7815b) Signed-off-by: Fridolin Somers (cherry picked from commit 66c568941bba29efc739f83dc3fb2cfb172d02ea) Signed-off-by: Katrin Fischer commit 98d9ef0b65805e8455abe2353984439c9d5f8584 Author: Katrin Fischer Date: Fri Aug 18 08:36:59 2017 +0000 Bug 9857 - Follow-up - Fix for searches with su= or su: When the initial search is su=.../su:... the links was not constructed correctly. With this change, it should be the case. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 786deba62beb5a52a543af5415610e14f7d0a8c5) Signed-off-by: Fridolin Somers (cherry picked from commit 112116e45f4676aea3a63faa42b0e6a3e2456706) Signed-off-by: Katrin Fischer commit 2b82ff17ee6273a9dabec230a1fb4ccec82734a2 Author: Katrin Fischer Date: Fri Dec 4 01:17:50 2015 +0100 Bug 9857: Did you mean? uses wrong punctuation in search links The link changes the search links generated by the plugins from an=authid to an:authid, as suggested by Jared on the bug report. - Turn on the AuthorityFile und ExplodedTerms plugins for the OPAC from the "Did you mean" section of the administration module - Search a term in your OPAC where one or several authorities exist. A last name or a place name might work well. - Verify that there are suggestions displayed on top of your result list. - Verify that the link created is something like: /cgi-bin/koha/opac-search.pl?q=an=14084 - Apply patch. - Verify the link has changed a little and still works correctly: /cgi-bin/koha/opac-search.pl?q=an:14084 Signed-off-by: Fr?d?ric Demians Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit d0e3891e251a6a11188d70a5480af0e44b8c1fb0) Signed-off-by: Fridolin Somers (cherry picked from commit 49d8426f5634aa6433f58ce5830d9f7729605364) Signed-off-by: Katrin Fischer commit 255cf73ae9334698e226fd0ab392cd8a140fcc70 Author: Alex Buckley Date: Wed Jul 12 10:09:48 2017 +1200 Bug 18621: Added in value attribute to dateexpiry field Test plan: 1. Create a patron category with the dateexpiry value of 29/9/2017 2. Create a patron user from that patron category (which I'll refer to as patron A) with the date expiry value of 1/10/2017 and submit the form 3. Notice that the manual dateexpiry you have submitted is correctly displayed 4. Create a duplicate patron with the same firstname and surname and patron A, and set the date expiry value of 1/10/2017 and submit the form 5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now 6. Select the new member (not a duplicate member) option in the messagebox 7. The form successfully submits and notice that the date expiry value displayed is that of the patron category (i.e. it is 29/9/2017) not the dateexpiry value of 1/10/2017 that you manually set for this patron 8. Apply patch 9. Repeat step 4 10. The form displays a duplicate patron message. Notice the dateexpiry input box still contains the value you entered which is 1/10/2017. Select the new member (not a duplicate member) option in the messagebox 11. The form successfully submits and notice that the date expiry value displayed is 1/10/2017 that you manually set for this patron Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 515e62992893b72c54a34311088a9442a37d8138) Signed-off-by: Fridolin Somers (cherry picked from commit 60b6d736ee306198af83e1a1482ff89280a05e7b) Signed-off-by: Katrin Fischer commit 7d448f66848efbc342609399371ea522662e11d0 Author: Nick Clemens Date: Thu Jun 15 11:07:03 2017 -0400 Bug 18812 - SIP Patron status does not respect OverduesBlockCirc To test: 1 - Set 'OverduesBlockCirc' to block 2 - Find or create a patron with overdues 3 - Perform a SIP patron lookup on that patron misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron {userid or cardnumber} --password {pass} -m patron_information 4 - Note the first character of response is a ' ' 5 - Apply patch 6 - Restart memcached, apache, and plack 7 - Perform SIP patron lookup 8 - Note the first character of response is 'Y' 9 - prove t/db_dependent/SIP/Patron.t 10 - Test should return green Signed-off-by: Chris Kirby Works as advertised Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ff4f0858950c37eeede38b2f067841602b97d7ba) Signed-off-by: Fridolin Somers (cherry picked from commit 4b360f1371a56268458b62e5c8c68da853b4e52d) Signed-off-by: Katrin Fischer commit 771f433b60965fed7eb9f1c3501f4b1308e059cc Author: Jonathan Druart Date: Mon Aug 7 17:25:15 2017 -0300 Bug 19055: Remove C4::Reserves::GetReservesToBranch This subroutine is no longer in used and can be removed Test plan: git grep GetReservesToBranch must not return any results Signed-off-by: Marc V?ron Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 9cc7268362219e39b22aebb03a83e013f467d93a) Signed-off-by: Fridolin Somers (cherry picked from commit 319f5f67aaa056952ecc9a4500fa52627db4fdcc) Signed-off-by: Katrin Fischer commit 263f8ec935ce8dfa8cf5d1c915a037084c952b1d Author: Kyle M Hall Date: Mon Jul 31 09:18:15 2017 -0400 Bug 19007 - Allow paypal payments via debit or credit card again A recent change in Paypal has removed the previous default option of paying via debit or credit card without an account. To bring this option back, we need to send an additional parameter to the PayPal API. Test Plan: 1) Enable paypal for your Koha instance 2) Ensure you are not logged in to PayPal 3) Attempt to pay a fine via PayPal 4) Not the the "Pay with Debit or Credit Card" option is missing 5) Apply this patch 6) Refresh opac-account.pl 7) Attempt to make a payment via PayPal again 8) Note the option "Pay with Debit or Credit Card" is now available Signed-off-by: Kyle M Hall Signed-off-by: George Williams Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 10311769d460a775aa8c8ee8a190836a8f2b1f1e) Signed-off-by: Fridolin Somers (cherry picked from commit 5a132e1c3fb19d232b51e7ae68e468ddf81c6d8b) Signed-off-by: Katrin Fischer commit 0c9717bcfca462d180f3309c7b743e167da7cd2b Author: Marc V?ron Date: Sat Feb 18 18:35:39 2017 +0100 Bug 14353 - Show 'damaged' and other status on the 'place holds' page in staff This patch adds status 'Damaged' to 'Information' 'Status' in the items table on 'Place hold' page. To test: - Apply patch - In staff client, try to place an item level hold for items with 'Damaged' status. - Verify that the status 'Damaged' appears in the column 'Information'. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 8d08254b2202353517c16f34172cb92dcdd5befa) Signed-off-by: Fridolin Somers (cherry picked from commit 58d775dda10f5191301a80a2b5c0b4a135213e5a) Signed-off-by: Katrin Fischer commit 05a96c084f75a75544f817dc78a8d073b4244102 Author: Nick Clemens Date: Fri Feb 26 14:46:45 2016 +0000 Bug 15924 - Coce not enabled on lists To test: Enable Coce and disable other image services Load a list and not there are no covers Apply patch Load a list and note there are covers https://bugs.koha-community.org/show_bug.cgi?id=15924 Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 85b963d11fb5d8674ca6b0ec60821663f9d8cf19) Signed-off-by: Fridolin Somers (cherry picked from commit 669b6839eab456f36ed7c65a7a97fa7b386ab4e6) Signed-off-by: Katrin Fischer commit 400f2ea196140e78202f714c8712f93f46452665 Author: Jonathan Druart Date: Mon Sep 18 14:23:54 2017 -0300 Bug 19335: Fix 00-merge-conflict-markers.t when dockerised This does not make sense, but fix a bug (why?) Without this patch, the tests failed on po files: [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests Test Summary Report ------------------- t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0) Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. Result: FAIL Note that this is not related to bug 19227. if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail As saw it failed on *-pref.po files misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 0d03f143e25f498de780d2ddd1972c3be7947519) Signed-off-by: Fridolin Somers (cherry picked from commit bdfec37ab66f9c72f86adc7d6045bc83b5a92d88) Signed-off-by: Katrin Fischer commit 368dfc081576914927b202b1624d558f46dcc7e5 Author: Jonathan Druart Date: Thu Aug 31 11:47:11 2017 -0300 Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t The number of tests on jenkins is sometimes confusing: https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/ shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than the previous run. However 124 files have not been removed from the codebase! I suggest to count only 1 test for all files. Moreover files from blib and cover_db are counted, they should be excluded. Test plan: prove t/00-merge-conflict-markers.t must return green echo ">>>>>>>" >> mainpage.pl and run the test again It should now fail Signed-off-by: Magnus Enger Works as advertised. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8) Signed-off-by: Fridolin Somers (cherry picked from commit 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c) Signed-off-by: Katrin Fischer commit eb638bdc977ebfe7f9b13e22593109388dcffa9c Author: Jonathan Druart Date: Fri Sep 29 16:16:56 2017 -0300 Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t Signed-off-by: Jonathan Druart (cherry picked from commit b6f8cf43698979914704dd08c45f11e6b8e406ee) Signed-off-by: Fridolin Somers (cherry picked from commit 90dffe1c68b00244c010e95a00a002f913a3f02a) Signed-off-by: Katrin Fischer commit b975b971b4609fa005e69fb11832f560b748156a Author: Jonathan Druart Date: Thu Oct 5 17:42:21 2017 -0300 Bug 18794: Fix test ListMetadataFormats in OAI/Server.t This test may fail on slow servers, it compares the response date with 'now', but both can differ a bit. https://jenkins.koha-community.org/job/Koha_Master_D8/198/consoleFull Failed test 'ListMetadataFormats' at t/db_dependent/OAI/Server.t line 150. Structures begin differing at: $got->{responseDate} = '2017-06-12T14:31:51Z' $expected->{responseDate} = '2017-06-12T14:31:50Z' ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 ++-- C4/Circulation.pm | 6 ++-- C4/Reserves.pm | 28 ---------------- C4/SIP/ILS/Patron.pm | 3 +- Koha/SuggestionEngine/Plugin/AuthorityFile.pm | 5 ++- Koha/SuggestionEngine/Plugin/ExplodedTerms.pm | 7 ++-- .../en/includes/catalogue/itemsearch_item.json.inc | 3 +- .../prog/en/includes/messaging-preference-form.inc | 20 +++++++++--- .../prog/en/modules/admin/authorised_values.tt | 4 +-- .../prog/en/modules/admin/preferences/patrons.pref | 2 ++ .../prog/en/modules/catalogue/itemsearch.tt | 4 +-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/reserve/request.tt | 4 ++- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../bootstrap/en/modules/opac-messaging.tt | 10 ++++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 20 ++++++++++-- opac/opac-account-pay.pl | 1 + opac/opac-changelanguage.pl | 14 +++++--- t/00-merge-conflict-markers.t | 30 +++++++---------- t/Calendar.t | 9 ++++-- t/SuggestionEngine_AuthorityFile.t | 2 +- t/db_dependent/00-strict.t | 21 +++++++++++- t/db_dependent/Acquisition/close_reopen_basket.t | 15 +++++++-- t/db_dependent/Circulation/Returns.t | 4 ++- t/db_dependent/Koha/Patrons.t | 16 ++++----- t/db_dependent/Koha_Elasticsearch_Indexer.t | 23 ++++++++++++- .../Koha_SearchEngine_Elasticsearch_Search.t | 17 +++++++++- t/db_dependent/OAI/Server.t | 6 ++-- t/db_dependent/SIP/Patron.t | 34 +++++++++++++++++++- t/db_dependent/SuggestionEngine_ExplodedTerms.t | 4 +-- t/db_dependent/www/auth_values_input_www.t | 26 +++++++++------ 32 files changed, 233 insertions(+), 117 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 6 17:15:03 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Oct 2017 15:15:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-735-g0d124e1 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 0d124e1bc322e6823c192c51effa0f3eecb2ac1f (commit) via 5e63a3838102ee1fe8a1bc15640196ab611dbc89 (commit) via 078eb77451dacd6042b783edf6f89f5ab95732b5 (commit) via 5aa0280c6db66b8961ebfd644ebbdb80ca0081ba (commit) via c7c3fc0a63c50c2741a636201880c59c57287a51 (commit) via f92328332380c805f83ca7f4aed2e828bd112778 (commit) via 285d72a023daab65626a3ba0f90e20ccfad45c95 (commit) via 4edfc7900f6132c6771e4cfc820a5a3dc08d3e13 (commit) via 12a754a703bc8f4279bb23aab09c39c0514b0a75 (commit) via 6545cfe3f30789723b6f3c2e6e13af6e6c8e5fb9 (commit) via d805c1ce81b38a659c7504d6b7620ab3b10e4089 (commit) via 30b22c660f76f7a4c25a1239b020a7541a35b5d9 (commit) via 1b41e7799b0071e97e37c63da4fe9d685d3b3fc3 (commit) via c204171ff3cf4dedc64ea953c968447bcf7d9f65 (commit) via 7d3eefd8f1cc474346f8804197ac5fb28776191e (commit) via 07764f2b3114e5ccb72f7737e316d2cda3ad5068 (commit) via 46ff8df19544e3e7c16a4e3f21b3b14bc043dd88 (commit) via 3cf0caf05ca9577a26bb76d4910d8be8970aa06a (commit) via 49c879150de0bb0b8a5d384f8ff1fa51a80d8c10 (commit) via b91c20da903d1330bf7a997b794f83042bf86fb6 (commit) via ea9255c00439fbedccab14a4a50b47fcb1ba05ac (commit) from 10b5e1ee049605ae6a0614214a7dab76e20e0ca5 (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 0d124e1bc322e6823c192c51effa0f3eecb2ac1f Author: Nick Clemens Date: Mon Aug 28 16:27:41 2017 +0000 Bug 19193: When displaying the fines of the guarantee on the guarantor account, price is not in correct format 1 - Have a patron with guarantees 2 - Charge some fines to the guarantees 3 - View the patron 4 - Fines are displayed unformatted 5 - Apply patch 6 - Refresh 7 - Fines should now be formatted correctly Signed-off-by: Caroline Cyr La Rose Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5e63a3838102ee1fe8a1bc15640196ab611dbc89 Author: Mark Tompsett Date: Mon Nov 21 12:08:52 2016 -0500 Bug 17664: Silence non-zebra warnings in t/db_dependent/Search.t TEST PLAN --------- 0) back up database 1) drop database; create database 2) run web installer 3) prove t/db_dependent/Search.t -- the spammy warnings (other than zebra index warnings) may already be fixed, but the mocked value was not realistic. 4) apply patch 5) prove t/db_dependent/Search.t -- notice only zebra index warnings. 6) run qa test tools Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 078eb77451dacd6042b783edf6f89f5ab95732b5 Author: David Bourgault Date: Tue Sep 19 13:37:54 2017 -0400 Bug 19345: Add missing error flag to template Adds a missing error flag to the template->param { } call. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5aa0280c6db66b8961ebfd644ebbdb80ca0081ba Author: Marc V?ron Date: Thu Sep 7 14:48:48 2017 +0200 Bug 18550: [Follow-up] Add POD descriptions to subs This patch simply adds POD descriptions to subs affected by first patch. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit c7c3fc0a63c50c2741a636201880c59c57287a51 Author: Marc V?ron Date: Fri May 5 15:08:56 2017 +0200 Bug 18550: Patron card creator: Print output does not respect layout units To reproduce: Text, images and barcode positions are always layed out based on PostScript points, regardless of unit defined in card layout. To reproduce: - Test on top of Bug 18541 (introduces layout grid) - Create a card layout with a text field, an image and a barcode. Use points as layout unit - Activate layout grid - Create PDF output, save - Change layout unit to mm - Create PDF output, save - Compare PDFs. Verify that the positions are unchanged (still using points) To test: - Apply patch - Create again PDF - Verify that elements are positionad as expected (using unit, e.g. mm) - Bonus test: Repeat with other units Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f92328332380c805f83ca7f4aed2e828bd112778 Author: Marcel de Rooy Date: Fri Oct 6 08:21:23 2017 +0200 Bug 19315: [QA Follow-up] Trivial edits Replace $subs->{bibnum} by $biblionumber on a following line. The scalar in the boolean expression is not needed. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 285d72a023daab65626a3ba0f90e20ccfad45c95 Author: Nick Clemens Date: Thu Sep 14 12:23:09 2017 +0000 Bug 19315: Use bibnum instead of biblionumber in routing-preview.pl and add item check To test: 1 - Create a serial subscription attached to a record 2 - Receive some issues 3 - Edit the subscription 4 - Go to serails collection 5 - Try to print a routing list 6 - You may or may not get the right serial 7 - Additionally create a subscription attached to a bib with no items 8 - Try to print a routing list for this serial 9 - You will get 'Internal server error' 10 - Apply patch 11 - Print routing list for first serial 12 - You will always get the correct bib 13 - Print routing list for second serial 14 - You should no longer get an error Signed-off-by: Caroline Cyr La Rose Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 4edfc7900f6132c6771e4cfc820a5a3dc08d3e13 Author: Jonathan Druart Date: Mon Oct 2 14:22:27 2017 -0300 Bug 19398: Format date of birth in circ patron search When searching for a patron from the circulation tab, the results table shows the date of birth unformatted. Test plan: Apply this patch, search for patrons in the circ tab and confirm that the date of birth are correctly formatted according to the dateformat syspref Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 12a754a703bc8f4279bb23aab09c39c0514b0a75 Author: Marcel de Rooy Date: Fri Oct 6 11:39:42 2017 +0200 Bug 19386: [QA Follow-up] Remove some default values In the meantime bug 19403 added default nulls for gonenoaddress, lost and debarred. So these lines can be removed safely. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 6545cfe3f30789723b6f3c2e6e13af6e6c8e5fb9 Author: Jonathan Druart Date: Thu Sep 28 17:31:04 2017 -0300 Bug 19386: Prevent t/db_dependent/SIP/Patron.t to fail randomly Depending on the values used by TestBuilder, some tests from t/db_dependent/SIP/Patron.t can fail # Failed test 'Not blocked without overdues when set to 'Don't block'' # at t/db_dependent/SIP/Patron.t line 55. # got: '0' # expected: '1' # Failed test 'Not blocked without overdues when set to 'confirmation'' # at t/db_dependent/SIP/Patron.t line 61. # got: '0' # expected: '1' # Failed test 'Not blocked without overdues when set to 'Block'' # at t/db_dependent/SIP/Patron.t line 67. # got: '0' # expected: '1' Caused by this check in C4::SIP::ILS::Patron->new 110 for (qw(EXPIRED CHARGES CREDITS GNA LOST DBARRED NOTES)) { 111 ($flags->{$_}) or next; [...] 115 if ($flags->{$_}->{noissues}) { 116 foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) { 117 $ilspatron{$toggle} = 0; # if we get noissues, disable everything 118 } 119 } 120 } Test plan: Execute several times (50x?) these tests. Without this patch they may fail With this patch they must never fail Signed-off-by: David Bourgault Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit d805c1ce81b38a659c7504d6b7620ab3b10e4089 Author: Jonathan Druart Date: Fri Oct 6 11:58:42 2017 -0300 Bug 19198: Prevent the test to fail randomly If categorycode is 'X', the test will fail Signed-off-by: Jonathan Druart commit 30b22c660f76f7a4c25a1239b020a7541a35b5d9 Author: Jonathan Druart Date: Fri Oct 6 11:49:38 2017 -0300 Bug 19198: do not autovivify Signed-off-by: Jonathan Druart commit 1b41e7799b0071e97e37c63da4fe9d685d3b3fc3 Author: Nick Clemens Date: Wed Sep 13 11:59:19 2017 +0000 Bug 19198: (QA followup) Fix typo in conditions '&' should be '&&' Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit c204171ff3cf4dedc64ea953c968447bcf7d9f65 Author: Nick Clemens Date: Tue Aug 29 14:25:20 2017 +0000 Bug 19198: Renewal as issue causes too many error This patch moves some code and prevents checking for too many checkouts when performing a renewal via checkout To test: 1 - Set a rule to limit checkouts to a single issue, allowing renewal 2 - Issue an item to a patron 3 - Issue the same item 4 - In staff client you get a confirm to renew and a notice of Too Many checkouts, don't confirm 5 - VIA Sip - you get a renewal response, but in logs the renewal fails as a 'too 6 - Apply patch 7 - Via staff client you shoudl get renewal confirm with no too many error 8 - SIP checkout should renew Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 7d3eefd8f1cc474346f8804197ac5fb28776191e Author: Nick Clemens Date: Tue Aug 29 14:10:54 2017 +0000 Bug 19198: Unit tests Signed-off-by: Lee Jamison Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 07764f2b3114e5ccb72f7737e316d2cda3ad5068 Author: Lari Taskula Date: Wed Sep 27 17:59:55 2017 +0300 Bug 19374: CircSidebar overlapping transferred items table When CircSidebar is activated, "Transferred items" table at Circulation -> Transfers goes under the sidebar. This patch fixes the issue. To test: 1. Enable CircSidebar system preference 2. Go to cgi-bin/koha/circ/branchtransfers.pl 3. Enter a barcode and click submit 4. Observe transferred items table under the circulation side bar 5. Apply patch 6. Enter a barcode and click submit 7. Observe transferred items is now correctly displayed 8. Also test with CircSidebar system preference deactivated Signed-off-by: Jonathan Druart Bug 19374: (follow-up) Remove stray closing div tag To test: 1. Apply first patch and validate the document e.g. here https://validator.w3.org/#validate_by_input 2. Observe "Stray end tag div." error 3. Apply this patch and validate again 4. Observe no errors 5. Go through test plan from first patch to make sure things still look nice Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 46ff8df19544e3e7c16a4e3f21b3b14bc043dd88 Author: Kyle M Hall Date: Thu Jul 20 14:28:20 2017 -0400 Bug 19135: Restore AllowHoldsOnPatronsPossessions behaviour Bug caused by commit bc39f0392bbebaad4c083f81308f652a325be042 Bug 14695 - Add ability to place multiple item holds on a given record per patron Test Plan: 1) Set AllowHoldsOnPatronsPossessions to "Don't" 2) Check out an item to a patron 3) Place a hold on that item for the same patron 4) Note you are allowed to with no alert 5) Delete the hold 6) Apply this patch 7) Place a hold on that item for the same patron 8) Note you recieve an alert now Signed-off-by: Owen Leonard Signed-off-by: Christopher Brannon Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 3cf0caf05ca9577a26bb76d4910d8be8970aa06a Author: Marcel de Rooy Date: Fri Oct 6 11:05:49 2017 +0200 Bug 19260: [QA Follow-up] Remove obsolete $dbh The variable is no longer used. Removed a few empty lines on the way. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 49c879150de0bb0b8a5d384f8ff1fa51a80d8c10 Author: Josef Moravec Date: Thu Oct 5 20:37:25 2017 +0000 Bug 19260: Holds marked as problems being seen as expired ones and deleted wrongly Test plan: 0) Apply just the first patch - the one with test 1) Run t/db_dependent/Reserves.t - test for CancelExpiredReserves should fail 2) Apply the second patch 3) t/db_dependent/Reserves.t should pass now Followed test plan, patch worked as described. Passes QA test tool Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit b91c20da903d1330bf7a997b794f83042bf86fb6 Author: Josef Moravec Date: Thu Oct 5 20:36:31 2017 +0000 Bug 19260: Add test for CancelExpiredReserves Passes QA test tool Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit ea9255c00439fbedccab14a4a50b47fcb1ba05ac Author: Jonathan Druart Date: Fri Sep 29 11:49:30 2017 -0300 Bug 19388: FIX display item status if item is checked out In course reserves, if an item which was added to a course is checked out, it is not possible to show details for that course on OPAC. The error says: "Template process failed: undef error - The method onsite_checkout is not covered by tests! at /home/koha/src/C4/Templates.pm line 121." onsite_checkout is an attribute of Koha::Checkout, not Koha::Item Test plan: Create a course with 2 items that are checked out (standard and on-site) At the OPAC, add them to your cart and confirm the status of these 2 items is correct Confirm that on the detail page of the bib record as well as the detail of the course. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 102 ++++++++++---------- C4/Patroncards/Patroncard.pm | 43 ++++++--- C4/Reserves.pm | 14 +-- Koha/QueryParser/Driver/PQF/query_plan/node.pm | 2 +- .../en/includes/circ-patron-search-results.inc | 3 +- .../prog/en/modules/circ/branchtransfers.tt | 4 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../bootstrap/en/includes/item-status.inc | 10 +- opac/opac-password-recovery.pl | 1 + reserve/request.pl | 3 +- serials/routing-preview.pl | 6 +- t/db_dependent/Circulation.t | 60 +++++++++++- t/db_dependent/Reserves.t | 63 +++++++++++- t/db_dependent/SIP/Patron.t | 18 +++- t/db_dependent/Search.t | 2 +- 15 files changed, 239 insertions(+), 94 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 6 17:37:28 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Oct 2017 15:37:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-736-g090b450 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 090b450a502340e3d03b5ee6a075cc92e647aada (commit) from 0d124e1bc322e6823c192c51effa0f3eecb2ac1f (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 090b450a502340e3d03b5ee6a075cc92e647aada Author: Jonathan Druart Date: Fri Oct 6 12:30:18 2017 -0300 Bug 19423: Prevent DecreaseLoanHighHolds.t to fail randomly CanBookBeIssued returns STATS if categorycode is X Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/DecreaseLoanHighHolds.t | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 6 21:51:38 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Oct 2017 19:51:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-737-g725a302 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 725a3022c9ca025755a2d86a36ed84039deab232 (commit) from 090b450a502340e3d03b5ee6a075cc92e647aada (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 725a3022c9ca025755a2d86a36ed84039deab232 Author: Josef Moravec Date: Fri Oct 6 16:41:28 2017 +0000 Bug 19260: (followup) Fix CancelReserves.t test Test plan: Run t/db_dependent/Holds/CancelReserves.t Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Holds/CancelReserves.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 9 21:21:04 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 09 Oct 2017 19:21:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-778-gfed86d5 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 fed86d50420dcb3fb468c5743a1e370d075bc5e0 (commit) via e90874241808354777cc1c27ad3ad106ffdc7cd4 (commit) via 5ac69e3a19bb3a30554d41f862516bb92a70508a (commit) via 7c82c9793062b93c463798db0fd606fbd2905d56 (commit) via c84cab61b73574ae451fe93a09057252bcb830e4 (commit) via 26f3ca8d88486e5948c400f0d19d8c5bdf392d2e (commit) via b811dbbd8d8cdbe226bf123bc52daff426eac72f (commit) via 0b0cc8584f223fff54cd729043f448be028ad792 (commit) via 00b871e880ec93910671ee7294171c7d76a4794d (commit) via 77a28050a6e4c68c25576ccbd576402a2e9590aa (commit) via 09a16fc493c5082a47f0bc677972c4dc9ee18abf (commit) via 972d6c946a193d070b56efafe0f4e3251e0dbd84 (commit) via 3f46ec652b7f88acfba73db0ab66dcc69d2d05b3 (commit) via 38526ca13aa63bf6dee90e8a408a8dfa93316b58 (commit) via 359907e9a225235c299d736c26462b8cf3735828 (commit) via 4553aa704038a7c797c10b39f3acc59b190b4021 (commit) via 69ee06a490a64985dfccd01cf689ae77eea1d2d5 (commit) via 5fc0a1f5b1ad58b4fa0a538cef5d2106fd39c71a (commit) via 1a157575d360d663aed2c3c56f70aeeef64ca762 (commit) via b97de5af12d54d2cce197e7ad755ac27df3a9604 (commit) via 1fc0b652548510ef00a7e072cdf923357d5610aa (commit) via b3b86caaa5473ea51dc7223146e4c7cf0db431dc (commit) via a18b12ea7f52d5d017cb0f74723cbb50b6d04749 (commit) via ecc5daaceb3c2bb4ea9be2860b839c1686eee2d8 (commit) via 7f6f98e00c319e60e9296b96913c8321366a7d12 (commit) via 2c07f63ae84dc16099999e3f7c38e1a49b758af8 (commit) via b583e806c73cb79b35ee727a18f6b30ee32197f8 (commit) via 799293c40fc4419b9df9ea941836778c2e359684 (commit) via 0152e95c979ff38ed53887f5b1140fdd5e148812 (commit) via c367705d9d154b195b29bf7c229046928a5f4718 (commit) via 347ade5c1089813ccecbbd1bb0c91e828a914265 (commit) via f59484df2246c0ee11c5d44f2dca762908864fe8 (commit) via 36821be142b49a4c42ff740c33bda882d39bb885 (commit) via 3822105060bf266a1064caaf14f9af270b9f1e11 (commit) via faf1bd1e6e7478aec724e4dc33707d89d7820812 (commit) via 87448e82d27921b867bc6982a279f8bdd2b85cb7 (commit) via 3bdee4a05f782376e7851e1025c9909426f78c57 (commit) via 639d7f308f6581880bc2f03cd722af6c76ecd7c5 (commit) via e1a5c9e8c9e75bbb82184c732803ae8623b50bfd (commit) via 511b3253576262878c953e7a3fe4a2941686ab1e (commit) via 56500e8e676782155c5717e8db9786af394252d8 (commit) from 725a3022c9ca025755a2d86a36ed84039deab232 (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 fed86d50420dcb3fb468c5743a1e370d075bc5e0 Author: Jonathan Druart Date: Mon Oct 9 15:57:46 2017 -0300 Bug 19440: Existing calls need to be done in scalar context Signed-off-by: Jonathan Druart commit e90874241808354777cc1c27ad3ad106ffdc7cd4 Author: Tomas Cohen Arazi Date: Mon Oct 9 15:36:41 2017 -0300 Bug 19440: Identify overlimit problems in XISBN tests This patch makes C4::XISBN::get_xisbns() return an errors hashref including information of the failing fetches from xisbn services. It tackles the situation of XISBN, which in some cases returns 'overlimit' errors. The patch makes the relevant functions check if the response->{stat} string is 'ok' and returns the string in $errors otherwise. This only happens when in list context. This allows to fix the randomly failing tests while keeping the current behaviour. All this code should be rewritten. It does the job bug doesn't have problems handling or reoprting. This is just a band aid. To test: - Make sure k$ prove t/db_dependent/XISBN.t => SUCCESS :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 5ac69e3a19bb3a30554d41f862516bb92a70508a Author: Marc V?ron Date: Wed May 3 16:23:22 2017 +0200 Bug 18528: Patron card creator template: switch form fields for card height and card width This patch changes the sequnce of form fields for card height and card width. To test: - Apply patch - Edit or create a patron card template - Verify that the fields display in sequence Page height - Page width -Card height - Card width Followed test plan, worked as intended Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7c82c9793062b93c463798db0fd606fbd2905d56 Author: Tomas Cohen Arazi Date: Mon Sep 25 15:01:51 2017 -0300 Bug 19196: Rename page and per_page This patch just renames 'page' and 'per_page' params, for '_page' and '_per_page' respectively. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Lari Taskula Signed-off-by: Jonathan Druart commit c84cab61b73574ae451fe93a09057252bcb830e4 Author: Tomas Cohen Arazi Date: Tue Aug 29 17:02:13 2017 -0300 Bug 19196: Make plugin available to endpoints This patch just initializes the plugin on the main controller class so it is available for all endpoints to use. As it is not used, in order to test just restart plack and make sure the endpoints work (run the t/db_dependent/api/v1 tests). Signed-off-by: Kyle M Hall Signed-off-by: Lari Taskula Signed-off-by: Jonathan Druart commit 26f3ca8d88486e5948c400f0d19d8c5bdf392d2e Author: Tomas Cohen Arazi Date: Tue Aug 29 16:52:48 2017 -0300 Bug 19196: Add Koha::REST::Plugin::Pagination This patch introduces a Mojolicious plugin to be used on the REST api. It adds a helper method: add_pagination_headers ====================== When used, it adds a _Link_ header to the reponse with the calculated values for pagination, and X-Total-Count containing the total results like this: my $params = $c->validation->output; my $patrons = Koha::Patrons->search; my $count = $patrons->count; $c->add_pagination_headers({ total => $count, params => $params )}; To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Pagination.t => SUCCESS: Tests pass! - Sign off :-D Sponsored-by: ByWater solutions Sponsored-by: Camden County Edit: I fixed a mistake on the POD (tcohen) Signed-off-by: Kyle M Hall Signed-off-by: Lari Taskula Signed-off-by: Jonathan Druart commit b811dbbd8d8cdbe226bf123bc52daff426eac72f Author: Tomas Cohen Arazi Date: Tue Aug 29 17:00:50 2017 -0300 Bug 19196: Unit tests This patch adds unit tests for the new pagination Mojo plugin. Sponsored-by: ByWater Solutions Sponsored-by: Camden County Signed-off-by: Kyle M Hall Signed-off-by: Lari Taskula Signed-off-by: Jonathan Druart commit 0b0cc8584f223fff54cd729043f448be028ad792 Author: Marcel de Rooy Date: Mon Oct 2 14:33:02 2017 +0200 Bug 19397: Release team for 17.11 This patch adds the release team for 17.11 to about template. Test plan: Check the changes with the wiki pages for 17.05 and 17.11. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 00b871e880ec93910671ee7294171c7d76a4794d Author: Nick Clemens Date: Sat Oct 7 00:07:31 2017 +0000 Bug 19255: QA Followup - Fix tabs for spaces Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 77a28050a6e4c68c25576ccbd576402a2e9590aa Author: Marcel de Rooy Date: Wed Sep 6 13:01:17 2017 +0200 Bug 19255: [Follow-up] Typo "will accessible" This patch speaks for itself. Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 09a16fc493c5082a47f0bc677972c4dc9ee18abf Author: Marcel de Rooy Date: Tue Sep 5 15:10:53 2017 +0200 Bug 19255: Correct explanation about list types on shelves.pl in staff The explanation on list categories on the shelves form is removed. The online help text is actualized. Test plan: Go to Lists in staff. Edit a list. The remarks about private and public lists on the right side are gone. Click Help. Read the adjusted text. Does it make sense? Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 972d6c946a193d070b56efafe0f4e3251e0dbd84 Author: Julian Maurice Date: Wed Aug 9 11:30:00 2017 +0200 Bug 18785: Force scalar context in Koha::Subscription::biblio Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 3f46ec652b7f88acfba73db0ab66dcc69d2d05b3 Author: Julian Maurice Date: Mon Jun 12 13:01:14 2017 +0200 Bug 18785: Add the Koha::Subscription->biblio method Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 38526ca13aa63bf6dee90e8a408a8dfa93316b58 Author: Jonathan Druart Date: Wed Aug 9 16:45:31 2017 -0300 Bug 14039: Add the title to all places There are other scripts where the borrower variable is not defined and the fields are passed one by one. To have a consistent behaviour we should add the title at the different places. Note that this script also add the use of the include file for statistics.tt and remove the pass of parameters to the template, already done later: 99 $template->param(%$borrower); Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 359907e9a225235c299d736c26462b8cf3735828 Author: David Roberts Date: Wed Jun 7 00:01:17 2017 +0100 Bug 14039: Add patron salutation to checkout screen Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 4553aa704038a7c797c10b39f3acc59b190b4021 Author: Aleisha Amohia Date: Mon Jul 10 00:14:10 2017 +0000 Bug 18916: Add pagination to top of search results in staff client To look the same as OPAC. To test: 1) Do a catalogue search in staff client that results in more than one page 2) Notice pagination is only at the bottom 3) Apply patch and refresh page 4) Notice pagination is at top also Sponsored-by: Catalyst IT Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 69ee06a490a64985dfccd01cf689ae77eea1d2d5 Author: Aleisha Amohia Date: Mon Jul 10 00:07:38 2017 +0000 Bug 13205: [FOLLOW-UP] Fixing math and variable names Have changed my $last_page = $pages * ( $results_per_page - 1 ); to my $last_page = ( $pages - 1) * $results_per_page; which seems to fix the 'last' button offset! (Comment 10) Will add the box to jump to a page in a separate patch. Adding the pagination to the top on the staff client will be dealt with in Bug 18916 as it is slightly out of the scope of this bug. Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 5fc0a1f5b1ad58b4fa0a538cef5d2106fd39c71a Author: Aleisha Amohia Date: Tue Jun 27 04:36:56 2017 +0000 Bug 13205: [FOLLOW-UP] Some extra logic See Comment 8. Test: When on first page of results, confirm that the 'First' and 'Previous' buttons do not show. Confirm they come back on the second page and every page after. When on last page of results, confirm that the 'Last' and 'Next' buttons do not show. Confirm they come back on all previous pages. Check on both staff side and OPAC. Sponsored-by: Catalyst IT Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 1a157575d360d663aed2c3c56f70aeeef64ca762 Author: Aleisha Amohia Date: Thu Feb 16 02:28:13 2017 +0000 Bug 13205: Last/first page options for result list paging for OPAC Same fix but on OPAC side. Same test plan Sponsored-by: Catalyst IT Signed-off-by: Dilan Johnpulle Signed-off-by: Your Full Name Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b97de5af12d54d2cce197e7ad755ac27df3a9604 Author: Aleisha Amohia Date: Wed Feb 15 02:42:10 2017 +0000 Bug 13205: Last/first page options for result list paging This patch adds first and last page buttons to the pagination at the bottom of a page of catalog search results. To test: 1) Apply patch 2) Do a number of searches 3) For each search, ensure that the first and last page buttons work as expected Sponsored-by: Catalyst IT Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 1fc0b652548510ef00a7e072cdf923357d5610aa Author: Marcel de Rooy Date: Mon Aug 28 12:13:26 2017 +0200 Bug 19190: [Follow-up] Do not rely on the return of ModItem touch_all_items looks at the return of ModItem to determine if the operation was successful. But ModItem does not return a meaningful value. This patch puts the ModItem call in an eval and looks at $@. Test plan: Run touch_all_items with a where condition and verbose option. Put print 1/0; at the end of ModItem. Run touch_all_items again. You should see: ERROR WITH ITEM xxx !!!! Signed-off-by: Marcel de Rooy Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b3b86caaa5473ea51dc7223146e4c7cf0db431dc Author: Marcel de Rooy Date: Mon Aug 28 11:59:19 2017 +0200 Bug 19190: Silly calculation of average time in touch_all scripts When you want to calculate average time, do not divide count by time :) Test plan: Run the script with a where condition and verbose option and see that the average time is meaningful. Signed-off-by: Marcel de Rooy Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit a18b12ea7f52d5d017cb0f74723cbb50b6d04749 Author: Jonathan Druart Date: Mon Oct 9 14:29:41 2017 -0300 Bug 19043: DBRev 17.06.00.012 Signed-off-by: Jonathan Druart commit ecc5daaceb3c2bb4ea9be2860b839c1686eee2d8 Author: Marcel de Rooy Date: Mon Oct 9 12:51:34 2017 +0200 Bug 19043: (QA follow-up) Add update DB entry and print warning This follow-up takes care of the requested warning at upgrade time. At the same time it removes the obsolete Columbia record when host and port are equal to the formerly used values. Note that the new host for on-campus use has been changed. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7f6f98e00c319e60e9296b96913c8321366a7d12 Author: Josef Moravec Date: Tue Aug 8 15:03:19 2017 +0200 Bug 19043: Z39.50 target clio-db.cc.columbia.edu:7090 is no longer publicly available Test plan: 0) Apply the patch 1) Install all affected languages: de-DE, es-ES, fr-CA and pl-PL 2) Remove and recreate Koha database 3) Go through web installer in English and don't forgot to load sample Z39.50 servers 4) Go to Administration -> Z39.50/SRU Servers and confirm the sample servers are here, but columbia.edu is not here 5) Repeat 2-4 for other languages: de-DE, es-ES, fr-CA and pl-PL Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 2c07f63ae84dc16099999e3f7c38e1a49b758af8 Author: Jonathan Druart Date: Wed Sep 27 16:04:04 2017 -0300 Bug 18449: Rename misleading button when renewing If you hit the renewal limit on the renewal tab, the message gives you a message like: "Windows 8 / ( 50610018249545 ) has been renewed the maximum number of times by Johnny Test ( 12345678 )" And has a button that reads: "Ignore and continue" This button is misleading, as it may be interpreted as "ignore the limit and continue to renew the item". Signed-off-by: Dominic Pichette Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b583e806c73cb79b35ee727a18f6b30ee32197f8 Author: Alex Buckley Date: Wed Sep 27 07:20:34 2017 +0000 Bug 19371: Changed table column text to 'Cancel?' on the patron circulation page Test plan: 1. Place a hold on an item 2. Search for the patron who the hold is associated with 3. View the Hold(s) tab of the Checkouts page and notice there is a column with the text 'Delete?' and a button below the table with the text 'Cancel marked holds' 4. Apply patch 5. Notice that the column text described in step 3 now has the text 'Cancel?' and the button text is the same as it was in step 3 Sponsored-By: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 799293c40fc4419b9df9ea941836778c2e359684 Author: Jonathan Druart Date: Mon Oct 9 14:24:31 2017 -0300 Bug 13766: DBRev 17.06.00.011 Signed-off-by: Jonathan Druart commit 0152e95c979ff38ed53887f5b1140fdd5e148812 Author: Katrin Fischer Date: Mon Sep 4 20:36:38 2017 +0000 Bug 13766: Follow-up - use index_exists() Changes check for existing index to use index_exists. Also checks deletedbiblioitems for an existing ean index and drops it if one is found. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit c367705d9d154b195b29bf7c229046928a5f4718 Author: Katrin Fischer Date: Thu Aug 17 13:54:36 2017 +0200 Bug 13766: Change *bibioitems.ean to mediumtext and add indexes - biblioitems.ean and deleteditems.ean are changed to mediumtext to match issn and isbn. - An index is added for ean on both tables. Patch cleans up inconsistencies caused by bug 5337 that causes some older databases to have an existing index on biblioitems.ean. Signed-off-by: Colin Campbell Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 347ade5c1089813ccecbbd1bb0c91e828a914265 Author: David Cook Date: Tue Sep 26 11:45:25 2017 +1000 Bug 19367: $biblio variable redefined in same scope in ISBDdetail The following warning is generated by ISBDdetail.pl: my" variable $biblio masks earlier declaration in same scope at ./catalogue/ISBDdetail.pl line 171. This patch removes this unnecessary declaration, which removes the warning. _TEST PLAN_ After applying patch: 1) Check code compilation with "KOHA_CONF=/path/to/koha-conf.xml perl -c catalogue/ISBDdetail.pl" 2) Note the only message is "./catalogue/ISBDdetail.pl syntax OK" 2) On /cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=1, view the source of the page and verify that the Javascript contains a holdcount e.g. "var holdcount = 0". Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f59484df2246c0ee11c5d44f2dca762908864fe8 Author: Colin Campbell Date: Tue Sep 19 12:58:12 2017 +0100 Bug 19340: Read basket details of transfer partner Details of the basket an order is tranferred to or from are displayed in the basket display. Unfortunately these details were not being read so the display incorrectly showed the details of the current owning basket. Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 36821be142b49a4c42ff740c33bda882d39bb885 Author: Jonathan Druart Date: Mon Oct 9 14:12:24 2017 -0300 Bug 13208: Display complete breadcrumbs on successful deletion Signed-off-by: Jonathan Druart commit 3822105060bf266a1064caaf14f9af270b9f1e11 Author: Aleisha Amohia Date: Tue Sep 5 03:31:54 2017 +0000 Bug 13208: [FOLLOW-UP] Tests for Koha::Acquisition::Baskets To test: prove -v t/db_dependent/Koha/Acquisition/Baskets.t Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit faf1bd1e6e7478aec724e4dc33707d89d7820812 Author: Nick Clemens Date: Fri Sep 1 13:18:21 2017 +0000 Bug 13208: (QA follow-up) Remove blank breadcrumbs on successful deletion After order is deleted we don't have a vendor or basket so we get blank breadcrumbs, this removes them Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 87448e82d27921b867bc6982a279f8bdd2b85cb7 Author: Aleisha Amohia Date: Fri Aug 18 03:23:55 2017 +0000 Bug 13208: [FOLLOW-UP] Perl documentation for modules Signed-off-by: Katrin Fischer Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 3bdee4a05f782376e7851e1025c9909426f78c57 Author: Aleisha Amohia Date: Thu Jul 27 01:54:35 2017 +0000 Bug 13208: [FOLLOW-UP] Creating and implementing new Koha::Acquisition::Basket[s] modules Test plan remains the same. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 639d7f308f6581880bc2f03cd722af6c76ecd7c5 Author: Aleisha Amohia Date: Wed Jun 28 01:24:00 2017 +0000 Bug 13208: Improving breadcrumbs for when cancelling an order To test: 1) Go to Acquisitions -> Find a vendor -> View a basket with orders in it (or make a new basket and add an order) 2) Click Cancel order 3) Notice incomplete breadcrumbs, and 'Acquisition' typo 4) Apply patch and refresh page 5) Breadcrumbs should be fixed. Confirm links to vendor and basket work as expected Sponsored-by: Catalyst IT Signed-off-by: severine.queune Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: David Bourgault Signed-off-by: Jonathan Druart commit e1a5c9e8c9e75bbb82184c732803ae8623b50bfd Author: Josef Moravec Date: Mon Oct 9 08:43:32 2017 +0000 Bug 19437: (followup) Rearrange CancelExpiredReserves tests - fix typos Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 511b3253576262878c953e7a3fe4a2941686ab1e Author: Marcel de Rooy Date: Fri Oct 6 10:41:29 2017 +0200 Bug 19437: Rearranging tests for CancelExpiredReserves This patch originates from a QA Follow-up on bug 19260. The first 19260 patch adds CancelExpiredReserves tests to Reserves.t. But note that we already have some tests in Holds/CancelReserves.t. This patch does: Renames Holds/CancelReserves.t to Reserves/CancelExpiredReserves.t. Rearranges modules there. Moves its existing tests into a first subtest. Moves the new subtest from Reserves.t to CancelExpiredReserves.t. Replaces $dbh->do('DELETE FROM reserves'). Adds some TestBuilder statements for missing data (by the move): adding biblio, item, borrower (removing slow AddMember call). Test plan: Run Reserves.t and Reserves/CancelExpiredReserves.t. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 56500e8e676782155c5717e8db9786af394252d8 Author: Marcel de Rooy Date: Thu Oct 5 10:41:33 2017 +0200 Bug 19415: FindDuplicateAuthority is searching on biblioserver since 16.05 Commit b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 [Bug 12478: make things using SimpleSearch use the new version] changed sub FindDuplicateAuthority and replaced this call (from 3.22.x) in 16.05 (pushed April 2016): my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] ); The new call does unfortunately not include the authorityserver: my ($error, $results, $total_hits) = $searcher->simple_search_compat( $query, 0, 1 ); Simple_search_compat redirects to C4/Search/SimpleSearch and SimpleSearch assumes a biblioserver if no server is passed. This effectively makes FindDuplicateAuthority useless since we will no longer find duplicates and we could see an error like this in the log: 16:51:42-04/10 zebrasrv(51) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @and @attr 1=authtype PERSO_NAME @attr 1=Heading Moerenhout The fix is obviously trivial. Test plan: [1] Go to Authorities. [2] Add a new authority PERSO_NAME with 100a Moerenhout. [3] Repeat step 2. Verify that you get the duplicate authority warning. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 2 +- C4/XISBN.pm | 11 +- Koha.pm | 2 +- Koha/{Biblios.pm => Acquisition/Basket.pm} | 31 ++-- Koha/{Biblios.pm => Acquisition/Baskets.pm} | 20 ++- Koha/REST/Plugin/Pagination.pm | 143 +++++++++++++++++ Koha/REST/V1.pm | 1 + Koha/Subscription.pm | 13 ++ acqui/basket.pl | 1 + acqui/cancelorder.pl | 4 + catalogue/ISBDdetail.pl | 1 - catalogue/detail.pl | 2 +- catalogue/search.pl | 2 + .../mysql/de-DE/optional/sample_z3950_servers.sql | 3 +- .../mysql/en/optional/sample_z3950_servers.sql | 3 +- .../mysql/es-ES/optional/sample_z3950_servers.sql | 3 +- .../fr-CA/facultatif/sample_z3950_servers.sql | 1 - installer/data/mysql/kohastructure.sql | 6 +- .../mysql/pl-PL/optional/sample_z3950_servers.sql | 3 +- installer/data/mysql/updatedatabase.pl | 36 +++++ .../prog/en/includes/page-numbers.inc | 19 ++- .../prog/en/includes/patron-title.inc | 8 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 52 +++--- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +- .../prog/en/modules/acqui/cancelorder.tt | 9 +- .../prog/en/modules/catalogue/results.tt | 3 + .../prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 27 ++-- .../prog/en/modules/members/statistics.tt | 4 +- .../prog/en/modules/patroncards/edit-template.tt | 9 +- .../prog/en/modules/virtualshelves/shelves.tt | 7 - .../bootstrap/en/includes/page-numbers.inc | 26 +-- members/statistics.pl | 3 - misc/maintenance/touch_all_biblios.pl | 2 +- misc/maintenance/touch_all_items.pl | 5 +- opac/opac-detail.pl | 2 +- opac/opac-search.pl | 2 + t/Koha/REST/Plugin/Pagination.t | 110 +++++++++++++ t/db_dependent/Holds/CancelReserves.t | 100 ------------ t/db_dependent/Koha/Acquisition/Baskets.t | 65 ++++++++ .../Koha/Subscription.t} | 32 ++-- t/db_dependent/Reserves.t | 63 +------- t/db_dependent/Reserves/CancelExpiredReserves.t | 166 ++++++++++++++++++++ t/db_dependent/XISBN.t | 8 +- 45 files changed, 716 insertions(+), 302 deletions(-) copy Koha/{Biblios.pm => Acquisition/Basket.pm} (65%) copy Koha/{Biblios.pm => Acquisition/Baskets.pm} (73%) create mode 100644 Koha/REST/Plugin/Pagination.pm create mode 100644 t/Koha/REST/Plugin/Pagination.t delete mode 100644 t/db_dependent/Holds/CancelReserves.t create mode 100644 t/db_dependent/Koha/Acquisition/Baskets.t copy t/{OpenLibrarySearch.t => db_dependent/Koha/Subscription.t} (55%) create mode 100644 t/db_dependent/Reserves/CancelExpiredReserves.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 09:12:34 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 07:12:34 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-93-g2a0dc0f 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.05.x has been updated via 2a0dc0f1d28ad03dd48326caff120dfe3b3daacd (commit) via b3cd8c2def10285e2efb85bf88a47f315d80a8a5 (commit) via bc3bfeab37abf9e83b26ae4635595aa5fc5b93ea (commit) from 2b4d0cb0b4e16b008ad9928a09259accfa1efc7a (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 2a0dc0f1d28ad03dd48326caff120dfe3b3daacd Author: Josef Moravec Date: Tue Aug 22 08:58:11 2017 +0000 Bug 19116: Hold not set to waiting after transfer Test plan: 0) Do not apply the patch 1) Place hold on item from another branch 2) Switch to that branch 3) Check them in at the other branch to set them into transport status (T) 4) Switch back to your homebranch 5) Check items in again, use the different confirm buttons and compare: Only "confirm and print" will be set to waiting, "confirm" remains in transport. 6) Apply the patch 7) Repeat 1-5 - now should work as expected - the hold is marked waiting on "confirm" button too 8) Check the hold from the same branch, to make sure this doesn't add regression Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 80fd5cd0dbfe8c5612325ca65251d36a97fcfc1c) Signed-off-by: Fridolin Somers commit b3cd8c2def10285e2efb85bf88a47f315d80a8a5 Author: Josef Moravec Date: Fri Sep 22 08:40:56 2017 +0000 Bug 19116: (followup) Add tests to highlight the problem in CheckReserves Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit a0c73b7bdafd21e19e0c1ba6a7ea222216d70500) Signed-off-by: Fridolin Somers commit bc3bfeab37abf9e83b26ae4635595aa5fc5b93ea Author: Jonathan Druart Date: Mon Sep 4 14:14:31 2017 -0300 Bug 19116: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 021d1d3714602be64609b9db82fd92e8bb1b42c0) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 6 ++++- t/db_dependent/Circulation.t | 54 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 10:36:18 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 08:36:18 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-95-ge175dda 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.05.x has been updated via e175dda2cad4160b2a51d7d49370374b74c7d829 (commit) via 3f41baec47dce01cc72bbb61e7c36b5736400996 (commit) from 2a0dc0f1d28ad03dd48326caff120dfe3b3daacd (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 e175dda2cad4160b2a51d7d49370374b74c7d829 Author: Marcel de Rooy Date: Tue Oct 3 16:01:15 2017 +0200 Bug 19343: [17.05.X] Remove private lists with edit permission from search results If the list is not shared, it should not be listed. We only need to remove the allow_add line. Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers commit 3f41baec47dce01cc72bbb61e7c36b5736400996 Author: Jonathan Druart Date: Tue Oct 3 11:45:45 2017 -0300 Bug 19343: [17.05.X] Add tests Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/Virtualshelves.pm | 1 - t/db_dependent/Virtualshelves.t | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 11:21:04 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 09:21:04 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-99-gf41157c 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.05.x has been updated via f41157c406219a0709d2ab18148a4f7a881663be (commit) via 112820ccdc847a0eca15432f070e0bbbaf5a3ed3 (commit) via fb0472875711a8eb638e7b55b2dc412acbf51dea (commit) via 53c84ea289e73fa2f56711dd8dd8e7ebac591ae7 (commit) from e175dda2cad4160b2a51d7d49370374b74c7d829 (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 f41157c406219a0709d2ab18148a4f7a881663be Author: Nick Clemens Date: Fri Aug 11 15:39:53 2017 +0000 Bug 19076 - followup - delete fines from additional renewal Signed-off-by: Christopher Brannon Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 185927f20981f36757c97fd33cc4c8ccd0ad5a3a) Signed-off-by: Fridolin Somers commit 112820ccdc847a0eca15432f070e0bbbaf5a3ed3 Author: Nick Clemens Date: Thu Aug 10 15:20:58 2017 +0000 Bug 19076 - Move issue logging in AddIssue into condtional clause Currently AddIssue tests if renewal, but logs an issue even if so. This patch moves the logging into the conditional so a log entry is only added if we aren't renewing (as renewals are logged separately) To test: 1 - prove t/db_dependent/Circulation.t - one test should fail 2 - Enable both issue and renewal logs 3 - Checkout an item to a patron 4 - View the logs - the issue is captured 5 - Checkout the item to the patron again and confirm renewal 6 - Both an issue and a renewal are logged 7 - Apply patch 8 Repeat 1-6, tests should pass and only renewal should be logged Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit b66b86402cd84026f7dabaa2e567a1956b9bbe86) Signed-off-by: Fridolin Somers commit fb0472875711a8eb638e7b55b2dc412acbf51dea Author: Nick Clemens Date: Thu Aug 10 15:20:19 2017 +0000 Bug 19076 - unit tests Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 8901f5702a7c6755c1f84cde01d75765687bb060) Signed-off-by: Fridolin Somers commit 53c84ea289e73fa2f56711dd8dd8e7ebac591ae7 Author: Jonathan Druart Date: Mon Aug 28 14:00:28 2017 -0300 Bug 19081: Do not list plugins that have been uninstalled Under plack, can_load should not check if a package is in cache, but reload it. Otherwise plugins that have been uninstalled will still get listed. The error raised by can_load must only be displayed if the plugin has been removed. Test plan: 1/ Upload a plugin 2/ Note the plugin is listed as installed 3/ Modify the package of the plugin to add a compilation error (use 'Foo' for instance) 4/ Reload the page 5/ The plugin is not listed and a warning appear in the logs 6/ Remove the compilation error and uninstall the plugin 7/ The plugin is no longer listed and no warning appear in the logs Signed-off-by: Lee Jamison Signed-off-by: Kyle M Hall Bug 19081: Remove useless $plugin_file variable Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit d928038a523b7ef44257ddfe97c405173c9b3b2e) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 11 +++++------ Koha/Plugins.pm | 6 ++++-- t/db_dependent/Circulation.t | 17 +++++++++++++++-- 3 files changed, 24 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 12:35:13 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 10:35:13 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-109-g2a9dc2e 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.05.x has been updated via 2a9dc2e595d916e4fb94948871f665df06b7088b (commit) via b17f7ec7c1c838a2aad84012ae4ee3de5e1b34ed (commit) via e05e8762ad34cf4cc5b6aa1754f99dc6cf3468bf (commit) via e1905b08362472ed94dac09d6f9ff2163b5ddf7a (commit) via 9aa24de287b78f98ee22af54e55803e414423964 (commit) via f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5 (commit) via 870f562e58c8327565b52d3b10f5a8ed2a000706 (commit) via ae405f61c8d4c04361267b500347a496a2ce7d58 (commit) via 11b73c1fa06c870a62640ffa8fd8f8610df5df18 (commit) via e25bb0548d4ee69b9d79567a626fe91487386b71 (commit) from f41157c406219a0709d2ab18148a4f7a881663be (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 2a9dc2e595d916e4fb94948871f665df06b7088b Author: Aleisha Amohia Date: Thu Mar 30 04:15:54 2017 +0000 Bug 18351: Able to delete budget with funds To test: 1) Create a budget, add a fund 2) Delete budget. Notice this is successful and triggers no warning message etc. 3) Go to Funds. Notice the funds appear as if they are not there 4) Go into mysql and view the aqbudgetperiods table - notice the funds are still there and are now inaccessible. 5) Apply patch 6) Create a budget, add a fund 7) Attempt to delete budget. Notice you can't click Delete button. Confirm number of funds in hover message is correct. 8) Delete fund 9) Confirm you can now delete budget. Sponsored-by: Catalyst IT Signed-off-by: Felix Hemme Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Some code fixes See Comment 5. Ready to test. Signed-off-by: Lee Jamison Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Code fix See comment 10. Ready for testing. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL This patch adds a check in the script for existing funds so that the budget cannot be deleted when forcing the URL and has other small fixes. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete Followed test plan and patch works as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 0ed469525fe16e36663c1f5266568beb5e27672d) Signed-off-by: Fridolin Somers commit b17f7ec7c1c838a2aad84012ae4ee3de5e1b34ed Author: Aleisha Amohia Date: Tue Sep 5 22:42:14 2017 +0000 Bug 19258: Prevent warn when reversing a payment The following warn is triggered when I click the Reverse button next to an individual payment on the Account tab: CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_members_boraccount_2epl line 63, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436. To test: 1) Go to a members detail page in staff side, create a manual invoice, pay it 2) Go to the Account tab, click Reverse next to the payment you just made 3) Notice warns 4) Apply patch and repeat steps 1 & 2 5) Warns should be gone Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit b56c19528e332381384639ed347d11508086c547) Signed-off-by: Fridolin Somers commit e05e8762ad34cf4cc5b6aa1754f99dc6cf3468bf Author: Aleisha Amohia Date: Tue Sep 5 22:38:12 2017 +0000 Bug 19258: Preventing warns when paying a fine or charge from Pay selected button The following warns are triggered when I click the Pay selected button: CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 267, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at usr/share/perl5/CGI.pm line 436. CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 273, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436. To test: 1) Go to a members detail page in staff side and create a manual invoice 2) Go to the pay fines tab, select the fine you just created and click Pay selected 3) Notice warns 4) Apply patch and repeat steps 1 & 2 5) Warns should be gone Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit ddf494b18f6c422d3654b0a78a63be86f5356065) Signed-off-by: Fridolin Somers commit e1905b08362472ed94dac09d6f9ff2163b5ddf7a Author: Aleisha Amohia Date: Tue Sep 5 22:34:18 2017 +0000 Bug 19258: Prevent warns when writing off an individual fine The following warns are triggered when I click the Write Off button next to an individual fine or charge: CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 171, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436. (this shows many times) Use of uninitialized value in subroutine entry at /usr/share/perl5/URI/Escape.pm line 184. To test: 1) Go to a members detail page in staff side and create a manual invoice 2) Go to the pay fines tab, click the Write off button next to the invoice you just created 3) Notice warns 4) Apply patch and repeat steps 1 & 2 5) Warns should be gone Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 693cc1122b2b96ef2fc176b07371a4608104eaaf) Signed-off-by: Fridolin Somers commit 9aa24de287b78f98ee22af54e55803e414423964 Author: Aleisha Amohia Date: Tue Sep 5 22:05:36 2017 +0000 Bug 19258: Prevent warn when paying a fine or charge To test: 1) Go to a members detail page in staff client 2) Select the Fines tab in the left pane 3) Select the Create manual invoice tab below the button menu bar 4) Create a fine and click save (e.g. Type: Fine, Amount: 5.00) 5) Select the Pay fines tab below the button menu bar 6) Click Pay on the item 7) Blank the staff error log 8) click confirm -- staff error log has message 9) apply this first patch 10) repeat steps 3-8 -- staff error log is blank 11) run koha qa test tools Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 9ffda7a7bc9f627165954b8272f1bb71c1b2beff) Signed-off-by: Fridolin Somers commit f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5 Author: Aleisha Amohia Date: Tue Sep 5 21:16:05 2017 +0000 Bug 19257: Prevent warn when reopening a basket To test: 1) Go to Acquisitions, find a vendor and a basket (create if you don't have either) 2) Close the basket 3) View the basket and reopen it 4) Notice the warn 5) Apply the patch and repeat steps 1-3 6) Notice the warn no longer shows and the basket is reopened as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 6ed1513e5fe91772c1720963006bf8f04452416d) Signed-off-by: Fridolin Somers commit 870f562e58c8327565b52d3b10f5a8ed2a000706 Author: Aleisha Amohia Date: Thu Aug 31 21:18:24 2017 +0000 Bug 19228: Trigger confirm delete when removing item from course To test: 1) Enable UseCourseReserves syspref 2) Go to Course Reserves 3) Add a new course if you don't already have one 4) Add an item to the course 5) Click 'remove' to delete the item from the course 6) Notice the item deletes straight away with no confirmation prompt 7) Apply the patch 8) Repeat steps 4 and 5 9) Confirm the confirmation box pops up and works as expected Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07) Signed-off-by: Fridolin Somers commit ae405f61c8d4c04361267b500347a496a2ce7d58 Author: Aleisha Amohia Date: Thu Aug 31 21:25:28 2017 +0000 Bug 19229: Return to course when cancelling out of edit form To test: 1) Ensure UseCourseReserves is enabled 2) Go to Course Reserves, create a course 3) Edit course 4) Click Cancel 5) Notice you are returned to the courses home page rather than returned to the course 6) Apply patch 7) Go to edit course and click cancel again 8) Confirm you are returned to the course and that this feels like the natural expectation. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit f55af2fc078a7d6a05238232bc276e6924307179) Signed-off-by: Fridolin Somers commit 11b73c1fa06c870a62640ffa8fd8f8610df5df18 Author: Jonathan Druart Date: Wed Sep 6 13:14:56 2017 -0300 Bug 17834: Make translation easier Signed-off-by: Jonathan Druart (cherry picked from commit 0c6538f033f43cde33d186561a93a197467bd9a1) Signed-off-by: Fridolin Somers commit e25bb0548d4ee69b9d79567a626fe91487386b71 Author: Aleisha Amohia Date: Thu Apr 20 03:12:14 2017 +0000 Bug 17834: Change library news text for single-branch libraries To test: 1) Log into OPAC, go to home page 2) Confirm that the text shows as 'RSS feed for (branchname) library news' if single-branch library 3) Confirm text shows as normal for libraries with more than one branch Sponsored-by: Catalyst IT Signed-off-by: maricris Signed-off-by: anafe Signed-off-by: iflora Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 1417f83e8b8a57e70e9120244a36204cf4acb3c2) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/basket.pl | 2 +- admin/aqbudgetperiods.pl | 30 +++++++++++---- .../prog/en/modules/admin/aqbudgetperiods.tt | 40 +++++++++++++------- .../en/modules/course_reserves/course-details.tt | 10 ++--- .../prog/en/modules/course_reserves/course.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 14 ++++++- members/boraccount.pl | 2 +- members/pay.pl | 11 ++++-- members/paycollect.pl | 2 +- 9 files changed, 78 insertions(+), 35 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 15:25:04 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 13:25:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-780-g9c208a4 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 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b (commit) via 83e82028fa9d0492cbc3567b9a200b67f9355ab0 (commit) from fed86d50420dcb3fb468c5743a1e370d075bc5e0 (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 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b Author: Alex Arnaud Date: Fri Oct 6 07:19:15 2017 +0000 Bug 19418: (bug 12833 follow-up) Add missing use statement Patron search fail on calling svc/members/search. This script return a 500 error and the search stay on "Processing..." Test plan: - Enable ExtendedPatronAttributes system preference, - make a standard search (search fields), - check the search works and it doesn't stick on "Processing..." Signed-off-by: Jonathan Druart I do not recreate the issue, but the change make sense and the issue has been raised by several people commit 83e82028fa9d0492cbc3567b9a200b67f9355ab0 Author: Jonathan Druart Date: Tue Oct 10 10:14:41 2017 -0300 Bug 14039: Fix patron search The JSON was malformed Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Utils/DataTables/Members.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 10 19:29:25 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Oct 2017 17:29:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-781-gc887167 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 c88716730118c83c482be5fe7095a504c3e45b28 (commit) from 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b (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 c88716730118c83c482be5fe7095a504c3e45b28 Author: Jonathan Druart Date: Tue Oct 10 14:23:39 2017 -0300 Bug 13766: DBIC Schema changes Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/Biblioitem.pm | 9 ++++----- Koha/Schema/Result/Deletedbiblioitem.pm | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 11 18:57:31 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Oct 2017 16:57:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-807-g1dba61e 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 1dba61e93307e5772faaa60b5141788d0f1763bb (commit) via ce0c12e7762df5bf6330c3236b2ec7ac2ad48e3c (commit) via da6824d6e24393caa891908cf9ce487dbd6fbc1e (commit) via 3a8d910b4ef1436f5b1bd73db348940967723d0d (commit) via 34032504e60a1a9e93157256e775521db69b7e92 (commit) via 04aea91de0f2fe1103e4021f880d135da1fd11a9 (commit) via aceb98983267f6ef0ac735ec334ffd6674275936 (commit) via 87ccf546b2073e9b65a824a9c508d3cdc270c366 (commit) via 7041f4798ddb7be51ee08822c8a45fb6e9a08644 (commit) via f18af55a39e132c57e25774b94acec8cbc0f280e (commit) via 520afc589076b15dd796aacaee0c6699730bfc11 (commit) via 5f511378c7d07fec934123cd5438a7538c7a53da (commit) via bb57b47e0cd363701b09a7685cf361aeecc33cc5 (commit) via 7135a4cbd3f5c0338292acac5cc3a4f1b034d379 (commit) via b29493265b3ae9f660eee2d4b911da036d100b0d (commit) via 4869f1b6ec88eaea1fed5af2a9c697a58559cc63 (commit) via 7b9140e8eff89fdad149023aa292f62462e07fae (commit) via f279be86040da34cbc6a3936d4b483a2e70a4377 (commit) via 0c32d41107bd514a6c28a4014a0900216450b79e (commit) via 4e872cec54d4f648335cf7e2566d2e38d9f71a3a (commit) via 95acb17c58e7c8adb6fd154fe099568e27c7f18f (commit) via 3d1794123e902132671fbc5f9278c05bf5c4eb15 (commit) via 36c3d454262d814c2174483bec2a6a181c3fd3b0 (commit) via 7211fd22bad5b3a3939cca6fe766ee65a7c62b13 (commit) via 75994dc94a2f5d1a500a7789ed113575c49f8b51 (commit) via 8c83fa0bc67690f388f5e968095b6d55ef18a70f (commit) from c88716730118c83c482be5fe7095a504c3e45b28 (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 1dba61e93307e5772faaa60b5141788d0f1763bb Author: Jonathan Druart Date: Wed Oct 11 13:10:32 2017 -0300 Bug 15685: DBRev 17.06.00.014 Signed-off-by: Jonathan Druart commit ce0c12e7762df5bf6330c3236b2ec7ac2ad48e3c Author: Jonathan Druart Date: Tue Oct 10 18:15:01 2017 -0300 Bug 15685: Send the basket to _cancel_items_receipt Signed-off-by: Jonathan Druart commit da6824d6e24393caa891908cf9ce487dbd6fbc1e Author: Jonathan Druart Date: Tue Oct 10 18:06:55 2017 -0300 Bug 15685: Avoid "Use of uninitialized value" warning in logs Signed-off-by: Jonathan Druart commit 3a8d910b4ef1436f5b1bd73db348940967723d0d Author: Jonathan Druart Date: Tue Oct 10 17:32:49 2017 -0300 Bug 15685: DBIC Schema changes Signed-off-by: Jonathan Druart commit 34032504e60a1a9e93157256e775521db69b7e92 Author: Jonathan Druart Date: Tue Oct 10 17:01:25 2017 -0300 Bug 15685: Fix DB columns order Signed-off-by: Jonathan Druart commit 04aea91de0f2fe1103e4021f880d135da1fd11a9 Author: Nick Clemens Date: Tue Oct 10 12:11:14 2017 +0000 Bug 15685: (QA follow-up) Address QA issues Signed-off-by: Jonathan Druart commit aceb98983267f6ef0ac735ec334ffd6674275936 Author: Tomas Cohen Arazi Date: Thu Oct 5 12:17:33 2017 -0300 Bug 15685: Add tests for Koha::Acquisition::Order->basket Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 87ccf546b2073e9b65a824a9c508d3cdc270c366 Author: Tomas Cohen Arazi Date: Thu Oct 5 11:38:52 2017 -0300 Bug 15685: POD Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 7041f4798ddb7be51ee08822c8a45fb6e9a08644 Author: Tomas Cohen Arazi Date: Thu Oct 5 11:12:57 2017 -0300 Bug 15685: (QA follow-up) Tidy tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f18af55a39e132c57e25774b94acec8cbc0f280e Author: Tomas Cohen Arazi Date: Thu Oct 5 11:12:35 2017 -0300 Bug 15685: (follow-up) K:A:O->find and ->fetch are no longer used Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 520afc589076b15dd796aacaee0c6699730bfc11 Author: Nick Clemens Date: Fri Aug 11 11:59:21 2017 +0000 Bug 15685: (QA follow-up) Fix typo Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 5f511378c7d07fec934123cd5438a7538c7a53da Author: Nick Clemens Date: Fri Jul 7 14:54:11 2017 +0000 Bug 15685: (QA follow-up) Improve Update DB entry + Add tests DB revision fixes Unit tests Edit: fixed the update step description (tcohen) Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bb57b47e0cd363701b09a7685cf361aeecc33cc5 Author: Kyle M Hall Date: Thu Nov 10 14:07:18 2016 +0000 Bug 15685: (QA follow-up) Fix qa script errors Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 7135a4cbd3f5c0338292acac5cc3a4f1b034d379 Author: Kyle M Hall Date: Thu Nov 10 14:01:37 2016 +0000 Bug 15685: Implement needed changes in Koha::Edifact::Order Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit b29493265b3ae9f660eee2d4b911da036d100b0d Author: Jesse Weaver Date: Thu Jan 28 15:01:24 2016 -0700 Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket This adds a new basket attribute (create_items) that can optionally be set to override AcqCreateItem. The following have been modified to reflect this (with the value of create_items that causes them to behave differently in parentheses): * Cancelling receipt of an order (receiving) * Creating an order by hand or from MARC (ordering) * Receiving an order (receiving) * Showing orders with uncertain price (ordering) * Showing orders (receiving) * Showing acquisition details in the OPAC (ordering) Test plan: 1) Create baskets with "Create items when:" set to ordering, receiving, cataloging and unset. 2) Test each of the above for each of these baskets, verifying that the basket-specific attribute overrides AcqCreateItem if set and falls back to the syspref otherwise. NOTE: A check of AcqCreateItem in opac-detail.tt was removed because it was redundant; the code path in question cannot be triggered unless create_items/AcqCreateItems is set to the correct value anyway. Signed-off-by: Kyle M Hall Signed-off-by: Barbara Fondren Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 4869f1b6ec88eaea1fed5af2a9c697a58559cc63 Author: Alex Arnaud Date: Wed Oct 11 10:16:36 2017 +0000 Bug 18399: (follow-up) Escape reason input Signed-off-by: Jonathan Druart commit 7b9140e8eff89fdad149023aa292f62462e07fae Author: Alex Arnaud Date: Wed Oct 4 15:04:15 2017 +0000 Bug 18399: Add reasons in edit suggestion page Test plan: - Fill the authorised values's category 'SUGGEST' with reason - Edit a pending suggestion. Set the status to rejected and select a reason - Check the reason has been saved (i.e in the suggestions table of rejected tab) - Check in the corresponding message_queue that the reason is here - Re-edit the same suggestion - Check that the correct reason is selected by defaut - Edit an other pending suggetion. Set the status to rejected, select other reason and fill the input text - Re-edit the previews suggestion and make sure the input "other" is displayed by default with the correct value Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f279be86040da34cbc6a3936d4b483a2e70a4377 Author: Jonathan Druart Date: Tue Oct 10 09:49:46 2017 -0300 Bug 19085: Remove empty files patron_attributes.* in installer These files has been added and emptied in the same patch set (bug 5670). It does not make sense to keep them. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0c32d41107bd514a6c28a4014a0900216450b79e Author: Your Full Name Date: Thu Oct 5 05:54:55 2017 +0000 Bug 19414: Move the location of the 'Import this batch into the catalog' button Moves the location of the button in question to be below the framework selector Test plan: 1. Go to Tools -> Stage MARC records for import 2. Upload a .mrc file and stage it for import 3. Click Manage staged records 4. Note that the import button appears above the framework selector 5. Apply patch 6. Refresh the window 7. Notice that the button has now moved to below the framework selector Sponsored-By: CALYX information essentials Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 4e872cec54d4f648335cf7e2566d2e38d9f71a3a Author: Jonathan Druart Date: Wed Oct 11 12:56:24 2017 -0300 Bug 16401: DBRev 17.06.00.013 Signed-off-by: Jonathan Druart commit 95acb17c58e7c8adb6fd154fe099568e27c7f18f Author: Jonathan Druart Date: Wed Oct 11 12:50:26 2017 -0300 Bug 16401: Add a warning if letter.content matches staffClientBaseURL Signed-off-by: Jonathan Druart commit 3d1794123e902132671fbc5f9278c05bf5c4eb15 Author: Katrin Fischer Date: Wed Sep 20 23:28:49 2017 +0200 Bug 16401: (follow-up) Avoid changing empty staffClientBaseURL preference Adds a condition to check that the staffClientBaseUrl is not empty before updating it with 'http://'. Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 36c3d454262d814c2174483bec2a6a181c3fd3b0 Author: Josef Moravec Date: Tue Aug 15 17:23:00 2017 +0200 Bug 16401: System preference staffClientBaseURL hardcoded to 'http://' Test plan: 1) Insert some value to staffBaseURL preference, without starting http:// 2) Apply the patch 3) Update database 4) Go to system preferences adminsitration, find the staffBaseURL preference, the inserted value should be prepended with 'http://' and the comment should be "This should be a complete URL, starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)" 5) prove t/db_dependent/Auth_with_cas.t 6) prove t/db_dependent/selenium/basic_workflow.t 7) prove t/db_dependent/check_sysprefs.t Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 7211fd22bad5b3a3939cca6fe766ee65a7c62b13 Author: Marc V?ron Date: Sun Sep 17 11:53:34 2017 +0200 Bug 19328: Internal server error because of missing currency This patch fixes internal server errors because of missing active currency in files aqbudgetperiods.pl, aqbudgets.pl and aqplan.pl. To reproduce: - Make sure that no active currency is defined. You can undefine the active currency in Administration->Currencies and exchange rates - Try to go to Administration->Budgets and Admistration->Funds Result: Internal server error To test: - Apply patch - Restart plack - Try to reproduce issue, it should no longer occur. There should be a yellow message box "No active currency is defined" - From Administration-> Budgets administration try to edit a fund and go to "Planning". Verify that the message box appears here as well. Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 75994dc94a2f5d1a500a7789ed113575c49f8b51 Author: Tomas Cohen Arazi Date: Tue Jun 27 11:55:45 2017 -0300 Bug 18709: Make koha-foreach use koha-shell internally This patch simplifies the koha-foreach script, making it use koha-shell to gain instance privileges and have all environment variables set. To test: - Apply the patch - Have one or more instances created (kohadev already exists in kohadevbox, add another onewith $ sudo koha-create --create-db test) - Run: $ sudo kohaclone/debian/scripts/koha-foreach echo "This is instance __instancename__" => SUCCESS: The script runs gracefuly, and outputs something like: This is instance kohadev This is instance test Note: this means the command was executed for each instance and the current behaviour of replacing the placeholder __instancename__ for the actual instance name still works as expected. - You can try the different filter switches, but the logic has not been touched. only the command call. - Sign off :-D Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 8c83fa0bc67690f388f5e968095b6d55ef18a70f Author: Jonathan Druart Date: Wed Sep 27 13:07:59 2017 -0300 Bug 19259: Enforce type of the delay value when editing overdue rules - template side only Overdue rules do not save when a delay that is not an integer > 0, without any warnings. This patch forces the user to select a number > 0. Test plan: Without this patch applied, enter non-integer value or negative or 0 => The rule will not be inserted without any warnings. With this patch applied you will get an message from the browser and the form will not save Signed-off-by: David Bourgault Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 30 ++++---- Koha.pm | 2 +- Koha/Acquisition/Basket.pm | 17 ++++- Koha/Acquisition/Baskets.pm | 6 +- Koha/Acquisition/Order.pm | 19 ++++- Koha/EDI.pm | 4 +- Koha/Edifact/Order.pm | 24 +++++- Koha/Schema/Result/Aqbasket.pm | 16 +++- acqui/addorder.pl | 9 +-- acqui/addorderiso2709.pl | 8 +- acqui/basketheader.pl | 2 + acqui/finishreceive.pl | 7 +- acqui/neworderempty.pl | 5 +- acqui/orderreceive.pl | 4 +- acqui/parcel.pl | 2 + acqui/uncertainprice.pl | 3 + admin/aqbudgetperiods.pl | 8 +- admin/aqbudgets.pl | 8 +- admin/aqplan.pl | 8 +- circ/reserveratios.pl | 15 +++- debian/scripts/koha-foreach | 18 ++--- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 28 +++++++ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 ++- .../prog/en/modules/acqui/basketheader.tt | 16 ++++ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../en/modules/admin/preferences/acquisitions.pref | 1 + .../en/modules/admin/preferences/staff_client.pref | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 41 ++++++++++ .../prog/en/modules/tools/manage-marc-import.tt | 4 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +- opac/opac-detail.pl | 8 +- suggestion/suggestion.pl | 17 ++++- svc/import_bib | 2 +- t/db_dependent/Acquisition/CancelReceipt.t | 2 +- t/db_dependent/Auth_with_cas.t | 2 +- t/db_dependent/Koha/Acquisition/Basket.t | 80 ++++++++++++++++++++ t/db_dependent/Koha/Acquisition/Order.t | 57 ++++++++++++++ t/db_dependent/selenium/basic_workflow.t | 6 +- 42 files changed, 416 insertions(+), 91 deletions(-) delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.sql delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.txt create mode 100644 t/db_dependent/Koha/Acquisition/Basket.t create mode 100644 t/db_dependent/Koha/Acquisition/Order.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Oct 12 14:29:26 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 12 Oct 2017 12:29:26 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-113-gb7c7c33 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.05.x has been updated via b7c7c331424536c055c83cfb47eba3903a9b39c8 (commit) via 745aee7c8f74208bda07742935df52c24c1c99ae (commit) via 8347df159ba7c5157e95c5c94b7a13c8abf85882 (commit) via 412aa08e61ce5fbac02852b0cc08557e7e45157d (commit) from 2a9dc2e595d916e4fb94948871f665df06b7088b (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 b7c7c331424536c055c83cfb47eba3903a9b39c8 Author: Josef Moravec Date: Fri Oct 6 16:41:28 2017 +0000 Bug 19260: (followup) Fix CancelReserves.t test Test plan: Run t/db_dependent/Holds/CancelReserves.t Signed-off-by: Fridolin Somers commit 745aee7c8f74208bda07742935df52c24c1c99ae Author: Marcel de Rooy Date: Fri Oct 6 11:05:49 2017 +0200 Bug 19260: [QA Follow-up] Remove obsolete $dbh The variable is no longer used. Removed a few empty lines on the way. Signed-off-by: Marcel de Rooy Signed-off-by: Fridolin Somers commit 8347df159ba7c5157e95c5c94b7a13c8abf85882 Author: Josef Moravec Date: Thu Oct 5 20:37:25 2017 +0000 Bug 19260: Holds marked as problems being seen as expired ones and deleted wrongly Test plan: 0) Apply just the first patch - the one with test 1) Run t/db_dependent/Reserves.t - test for CancelExpiredReserves should fail 2) Apply the second patch 3) t/db_dependent/Reserves.t should pass now Followed test plan, patch worked as described. Passes QA test tool Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Fridolin Somers commit 412aa08e61ce5fbac02852b0cc08557e7e45157d Author: Josef Moravec Date: Thu Oct 5 20:36:31 2017 +0000 Bug 19260: Add test for CancelExpiredReserves Passes QA test tool Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 21 ++++++----- t/db_dependent/Holds/CancelReserves.t | 2 ++ t/db_dependent/Reserves.t | 63 ++++++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Oct 12 16:26:38 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 12 Oct 2017 14:26:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-808-g307e55a 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 307e55a7debdf5e1c960cbfea443b6b160c0ce9a (commit) from 1dba61e93307e5772faaa60b5141788d0f1763bb (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 307e55a7debdf5e1c960cbfea443b6b160c0ce9a Author: Jonathan Druart Date: Thu Oct 12 11:19:40 2017 -0300 Bug 19455: Prevent SwitchOnSiteCheckouts.t to fail randomly If categorycode is 'X', the test will fail Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 13 09:54:14 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Oct 2017 07:54:14 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-115-gc94e660 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.05.x has been updated via c94e6606525ce9da003a99800ba46fe6e1967d47 (commit) via 2516945bf5f74359b62df8f6d07053a9761bda54 (commit) from b7c7c331424536c055c83cfb47eba3903a9b39c8 (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 c94e6606525ce9da003a99800ba46fe6e1967d47 Author: Josef Moravec Date: Mon Oct 9 08:43:32 2017 +0000 Bug 19437: (followup) Rearrange CancelExpiredReserves tests - fix typos Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit e1a5c9e8c9e75bbb82184c732803ae8623b50bfd) Signed-off-by: Fridolin Somers commit 2516945bf5f74359b62df8f6d07053a9761bda54 Author: Marcel de Rooy Date: Fri Oct 6 10:41:29 2017 +0200 Bug 19437: Rearranging tests for CancelExpiredReserves This patch originates from a QA Follow-up on bug 19260. The first 19260 patch adds CancelExpiredReserves tests to Reserves.t. But note that we already have some tests in Holds/CancelReserves.t. This patch does: Renames Holds/CancelReserves.t to Reserves/CancelExpiredReserves.t. Rearranges modules there. Moves its existing tests into a first subtest. Moves the new subtest from Reserves.t to CancelExpiredReserves.t. Replaces $dbh->do('DELETE FROM reserves'). Adds some TestBuilder statements for missing data (by the move): adding biblio, item, borrower (removing slow AddMember call). Test plan: Run Reserves.t and Reserves/CancelExpiredReserves.t. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart (cherry picked from commit 511b3253576262878c953e7a3fe4a2941686ab1e) ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Holds/CancelReserves.t | 100 -------------- t/db_dependent/Reserves.t | 63 +-------- t/db_dependent/Reserves/CancelExpiredReserves.t | 166 +++++++++++++++++++++++ 3 files changed, 167 insertions(+), 162 deletions(-) delete mode 100644 t/db_dependent/Holds/CancelReserves.t create mode 100644 t/db_dependent/Reserves/CancelExpiredReserves.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 13 19:03:37 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Oct 2017 17:03:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-829-ga82d54d 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 a82d54d4b4f5eb7aa7d45afc13dac0a80c86f9ce (commit) via e078ae12be45e91f12be8333962bde8c72b0de18 (commit) via f5ea2cf3dd60ba55311e851eec025c55c118c5e3 (commit) via 3df96634267b40de3b5d2996ac4ed73e236c0373 (commit) via 47c77c0193db428c34f2410a94b44634d3c34579 (commit) via ebffcdf4b938cd5a75ccf02a23341e6af3919ee8 (commit) via 5fc8c03b59aa72ef27a0de8ced55b4fafd7d9580 (commit) via 84bc17a894fb5023ca69836b4f584392ecfd8373 (commit) via 2386e33dbba4c561f3ce465cf1a0970d52b8efd5 (commit) via 5c45b2d69bcb17fbadc5e9794e70c5ccc4cfcc0a (commit) via 2aba85d811c6c4e89d0b2e1e560549898f098fd9 (commit) via b830349f45007629f141a9835e05b95f90ee4b92 (commit) via a16510a04af5c00b5857e7722cc8c69fb0d0b860 (commit) via 0dc722c5183bdd162eba6992a4d38a1a9d28f285 (commit) via c991ac6b6184e299108b5f69d3e0e50dcfc6548d (commit) via 6426a82014aacd738dd94ca2ff1c9056af893d45 (commit) via d099dc13bb4b9aa991caa0feaf24bed59c3c4844 (commit) via e54065197515ec265d4bab6ceead35d4456ef0e5 (commit) via cfa1aac9554ea9cba09aec30a4b1f85c09cb5f63 (commit) via 4c4d982ae45a3763fd70faedf1bbac225213de19 (commit) via 8b3d53db08a5d27a22df338ea4c3c2426992c12a (commit) from 307e55a7debdf5e1c960cbfea443b6b160c0ce9a (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 a82d54d4b4f5eb7aa7d45afc13dac0a80c86f9ce Author: Marcel de Rooy Date: Mon Jul 10 14:54:56 2017 +0200 Bug 18923: Warning in Biblio::GetCOinSBiblio Use of uninitialized value in concatenation (.) or string at C4/Biblio.pm line 1456. Note: In current master this is now line 1370 (Oct 9, 2017). Test plan: Enable COinSinOPACResults. Select a record with leader pos6==a and pos7==a. This triggers genre to be journalArticle and titletype to be a. Without this patch, do an opac search that includes this record. Check the log. You should see the warning. Apply this patch, search again and check the log. The warning should not be repeated again. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit e078ae12be45e91f12be8333962bde8c72b0de18 Author: Jonathan Druart Date: Fri Oct 13 13:54:43 2017 -0300 Bug 19186: DBRev 17.06.00.015 Signed-off-by: Jonathan Druart commit f5ea2cf3dd60ba55311e851eec025c55c118c5e3 Author: Julian Maurice Date: Fri Oct 13 13:29:53 2017 +0000 Bug 19186: (QA follow-up) Insert syspref SelfCheckoutByLogin if missing Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 3df96634267b40de3b5d2996ac4ed73e236c0373 Author: Jonathan Druart Date: Wed Sep 27 14:13:05 2017 -0300 Bug 19186: Change pref choice for SelfCheckoutByLogin - barcode vs cardnumber The SelfCheckoutByLogin lists 'Barcode' as an option, but this should be Cardnumber. Especially since more and more libraries are using chip cards instead of barcodes. Signed-off-by: David Bourgault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 47c77c0193db428c34f2410a94b44634d3c34579 Author: Alex Buckley Date: Wed Oct 11 12:43:45 2017 +0000 Bug 19413: (follow-up) Changed fieldset id value Followed test plan again and patch still applies and works as expected. Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit ebffcdf4b938cd5a75ccf02a23341e6af3919ee8 Author: Alex Buckley Date: Thu Oct 5 15:18:01 2017 +1300 Bug 19413: Moving the OK and Cancel inputs to the top of the 008 builder Followed test plan and patch applies and functions as described Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5fc8c03b59aa72ef27a0de8ced55b4fafd7d9580 Author: Josef Moravec Date: Mon Oct 9 08:07:29 2017 +0000 Bug 19438: Fix sorting by date due in overdues.pl Test plan: 0) Do not apply the patch 1) Have some overdued checkouts in your database 2) Go to circulation -> overdues (overdues.pl) 3) Try to sort the overdues table by due date and notice it is sorted alphabetically, not by date 4) Apply the patch 5) Try again and confirm, it is sorted by date Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 84bc17a894fb5023ca69836b4f584392ecfd8373 Author: Jonathan Druart Date: Fri Oct 13 13:41:11 2017 -0300 Bug 19422: Make sure it will never happen again Signed-off-by: Jonathan Druart commit 2386e33dbba4c561f3ce465cf1a0970d52b8efd5 Author: David Bourgault Date: Fri Oct 6 08:42:32 2017 -0400 Bug 19422: Missing DROP TABLES in kohastructure.sql Adds DROP TABLE statements to the following tables - article_requests - biblio_metadata - deletedbiblio_metadata Test plan : Clean your database by running 'mysql < kohastructure.sql'. Without patch you'll get error messages. With patch everything will work fine, no warnings. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5c45b2d69bcb17fbadc5e9794e70c5ccc4cfcc0a Author: Kyle M Hall Date: Fri Sep 8 11:52:02 2017 -0400 Bug 19275: clubs table broken at the opac if public enrollment is not allowed Test Plan: 1. Create a template club and disable public enrollment 2. Create a club and add it a patron 3. login at the opac with this patron 4. Note the borked clubs table 5. Apply this patch 6. Refresh the page 7. Table is fixed! Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 2aba85d811c6c4e89d0b2e1e560549898f098fd9 Author: Jonathan Druart Date: Tue Oct 10 10:58:24 2017 -0300 Bug 19083: Fix 'show all details' link on closed basket detail 'Show all details' add columns on the basket summary page. This link is broken if the basket is closed. Indeed there is a JS error raised by $('#toolbar').fixFloat(); The toolbar is not displayed if the basket is closed. This is caused by bug 12333, which added the floating toolbar. Test plan: Create 2 baskets with orders Close 1 basket Click on the 'show all details' links and confirm it works as expected Also confirm that the toolbar works correctly Signed-off-by: Owen Leonard Signed-off-by: Jon Knight Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit b830349f45007629f141a9835e05b95f90ee4b92 Author: David Gustafsson Date: Thu Oct 12 13:57:48 2017 +0200 Bug 19453: Incorrect jQuery selector for fund drop down validation Steps to reproduce: 1. Create a new basket 2. Choose "Add to masket" 3. Choose "From a staged file" 4. Select a file 5. Save without selecting a fund Expected results: A validation error should be shown, and form submit halted. Actual results: No validation error is shown and form submits. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit a16510a04af5c00b5857e7722cc8c69fb0d0b860 Author: Marcel de Rooy Date: Fri Oct 13 09:16:29 2017 +0200 Bug 19425: (QA follow-up) Resolve 'push on reference experimental' warn QA tools reported for acqui/addorderiso2709.pl FAIL valid: push on reference is experimental Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0dc722c5183bdd162eba6992a4d38a1a9d28f285 Author: Kyle M Hall Date: Fri Oct 6 09:47:26 2017 -0400 Bug 19425: Adding orders from order file with multiple budgets per record triggers error If you import an order file ( using MarcItemFieldsToOrder ) that has a different budget for each item to be ordered, you will get an error and a partially created basket. This is because Koha attempts to add the item to each order *for each budget*. This is clearly incorrect. Instead, we should be grouping items by budget and for each budget only adding those items that have a matching budget. Test plan: 1) Do not apply this patch 2) Download the provided MARC record 3) Add the branchcode 'ALD' to your server 4) Add the ccode 'ACOL' to your server 5) Add the budget codes 'adultay' and 'branchay' to your server 6) Stage the order file 7) Create a basket, import the order file 8) No we have 3 records, 2 of them have 2 items each with different budget codes 9) Attempt to import, note the error 10) Apply this patch 11) Repeat steps 6-8, note the order completes and results in 5 order lines being added to the basket! Signed-off-by: Kyle M Hall Signed-off-by: Christopher Kellermeyer Signed-off-by: Marcel de Rooy First step of test plan amended (not apply instead of apply). Signed-off-by: Jonathan Druart commit c991ac6b6184e299108b5f69d3e0e50dcfc6548d Author: Julian Maurice Date: Fri Oct 13 10:05:08 2017 +0000 Bug 18374: (QA follow-up) Fix auto truncation for field:"value" Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 6426a82014aacd738dd94ca2ff1c9056af893d45 Author: Julian Maurice Date: Fri Oct 13 09:53:04 2017 +0000 Bug 18374: (QA follow-up) Simplify _truncate_terms By using a different split regex, we can simplify a bit the process of appending '*' to every word of the query Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit d099dc13bb4b9aa991caa0feaf24bed59c3c4844 Author: Nick Clemens Date: Fri Oct 6 15:37:38 2017 +0000 Bug 18374: (follow-up) Add support and tests for quoted strings To test: 1 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t 2 - do some searches in staff client and test results Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit e54065197515ec265d4bab6ceead35d4456ef0e5 Author: Julian Maurice Date: Fri Sep 29 16:12:23 2017 +0200 Bug 18374: (QA follow-up) Tidy up code Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit cfa1aac9554ea9cba09aec30a4b1f85c09cb5f63 Author: Tomas Cohen Arazi Date: Tue Sep 12 12:15:07 2017 -0300 Bug 18374: (QA follow-up) Remove warning in Elasticsearch/Search.pm Signed-off-by: Tomas Cohen Arazi Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 4c4d982ae45a3763fd70faedf1bbac225213de19 Author: Nick Clemens Date: Mon Apr 3 14:30:44 2017 -0400 Bug 18374: Respect QueryAutoTruncate syspref in Elasticsearch This patchset adds a subroutine '_truncate_terms' to the ES QueryParser. If QueryAutoTruncate is enabled this function will be called for any search to add wildcard '*' to all terms To test: 1 - Enable Elasticsearch and have some records indexed 2 - Search for partial terms 3 - Note they fail unless '*' is appended 4 - Apply patch, leave QueryAutoTruncate disabled 5 - Note partial term searches still fail 6 - Enable QueryAutoTruncate 7 - Note partial term searches succeed 8 - Do some regular and advanced searches to make sure results are as expected Signed-off-by: Tomas Cohen Arazi Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 8b3d53db08a5d27a22df338ea4c3c2426992c12a Author: Nick Clemens Date: Thu Apr 6 14:27:50 2017 -0400 Bug 18374: QueryAutoTruncate unit tests To test: 1 - Apply just this patch - should fail 2 - Apply the other patch - should pass Signed-off-by: Tomas Cohen Arazi Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 4 +- Koha.pm | 2 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 32 ++++++++ Koha/SearchEngine/Elasticsearch/Search.pm | 4 +- acqui/addorderiso2709.pl | 4 +- circ/overdue.pl | 3 +- installer/data/mysql/kohastructure.sql | 3 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 11 +++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 9 +++ .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../en/modules/admin/preferences/circulation.pref | 2 +- .../cataloguing/value_builder/marc21_field_008.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 10 ++- .../bootstrap/en/modules/clubs/clubs-tab.tt | 8 +- t/{Makefile.t => check_kohastructure.t} | 44 +++++------ .../Koha_SearchEngine_Elasticsearch_Search.t | 79 +++++++++++++++++++- 18 files changed, 178 insertions(+), 44 deletions(-) copy t/{Makefile.t => check_kohastructure.t} (54%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Oct 14 14:55:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 14 Oct 2017 12:55:52 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-81-g61cfb6e 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, 16.11.x has been updated via 61cfb6e24172804e48edc01e9dde2081cffcbaec (commit) via b49ec7a57dcec8f01fda13a8453c958964ef7810 (commit) via 0363a97768a5ff3c54a5824f018cb827a2192869 (commit) via a05377d49ef3637be9f9b01ff6686fc317cd9bf5 (commit) via d4360a18fcc298664933ecbdb067f6e6bc4bc288 (commit) via 6290543d62eebcb4a40e8c65d5fecb180faf89c3 (commit) via a1e8e8542aaf14489b5eae7e08ba685fd5c81b55 (commit) via e9a507aa3ceea8ff4306fdf72616223f187154c5 (commit) via 34ab316b1c7c8cd6d4272d1094350366095d7810 (commit) via ac8ba913ba42dc932929b5714684a8ec971b30d5 (commit) via a5ea0b2d8d7dfe4f2c644e5407617af0f9b08a3c (commit) via 5199bb74dcdef65b78a8e740a93ddd3c3ea9766a (commit) via dda4bca35d479df1d4039a7b892fe9af4328bc79 (commit) via 9fef1265b770dd7df2688b19b5d853470c0fa948 (commit) from 319369ccc2b4c7e356cf2d24b9571b6365e4ccb8 (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 61cfb6e24172804e48edc01e9dde2081cffcbaec Author: Christophe Croullebois Date: Wed Aug 23 07:57:30 2017 +0000 Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices Signed-off-by: Your Name commit b49ec7a57dcec8f01fda13a8453c958964ef7810 Author: Tomas Cohen Arazi Date: Mon Oct 9 16:20:49 2017 -0300 Bug 18996: (followup) Fix tests count [16.11.x] This patch fixes a wrong tests count introduced on merging. Signed-off-by: Tomas Cohen Arazi commit 0363a97768a5ff3c54a5824f018cb827a2192869 Author: Aleisha Amohia Date: Thu Mar 30 04:15:54 2017 +0000 Bug 18351: Able to delete budget with funds To test: 1) Create a budget, add a fund 2) Delete budget. Notice this is successful and triggers no warning message etc. 3) Go to Funds. Notice the funds appear as if they are not there 4) Go into mysql and view the aqbudgetperiods table - notice the funds are still there and are now inaccessible. 5) Apply patch 6) Create a budget, add a fund 7) Attempt to delete budget. Notice you can't click Delete button. Confirm number of funds in hover message is correct. 8) Delete fund 9) Confirm you can now delete budget. Sponsored-by: Catalyst IT Signed-off-by: Felix Hemme Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Some code fixes See Comment 5. Ready to test. Signed-off-by: Lee Jamison Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Code fix See comment 10. Ready for testing. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL This patch adds a check in the script for existing funds so that the budget cannot be deleted when forcing the URL and has other small fixes. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete Followed test plan and patch works as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 0ed469525fe16e36663c1f5266568beb5e27672d) Signed-off-by: Fridolin Somers (cherry picked from commit 2a9dc2e595d916e4fb94948871f665df06b7088b) Signed-off-by: Katrin Fischer commit a05377d49ef3637be9f9b01ff6686fc317cd9bf5 Author: Aleisha Amohia Date: Tue Sep 5 21:16:05 2017 +0000 Bug 19257: Prevent warn when reopening a basket To test: 1) Go to Acquisitions, find a vendor and a basket (create if you don't have either) 2) Close the basket 3) View the basket and reopen it 4) Notice the warn 5) Apply the patch and repeat steps 1-3 6) Notice the warn no longer shows and the basket is reopened as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 6ed1513e5fe91772c1720963006bf8f04452416d) Signed-off-by: Fridolin Somers (cherry picked from commit f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5) Signed-off-by: Katrin Fischer commit d4360a18fcc298664933ecbdb067f6e6bc4bc288 Author: Aleisha Amohia Date: Thu Aug 31 21:18:24 2017 +0000 Bug 19228: Trigger confirm delete when removing item from course To test: 1) Enable UseCourseReserves syspref 2) Go to Course Reserves 3) Add a new course if you don't already have one 4) Add an item to the course 5) Click 'remove' to delete the item from the course 6) Notice the item deletes straight away with no confirmation prompt 7) Apply the patch 8) Repeat steps 4 and 5 9) Confirm the confirmation box pops up and works as expected Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07) Signed-off-by: Fridolin Somers (cherry picked from commit 870f562e58c8327565b52d3b10f5a8ed2a000706) Signed-off-by: Katrin Fischer commit 6290543d62eebcb4a40e8c65d5fecb180faf89c3 Author: Aleisha Amohia Date: Thu Aug 31 21:25:28 2017 +0000 Bug 19229: Return to course when cancelling out of edit form To test: 1) Ensure UseCourseReserves is enabled 2) Go to Course Reserves, create a course 3) Edit course 4) Click Cancel 5) Notice you are returned to the courses home page rather than returned to the course 6) Apply patch 7) Go to edit course and click cancel again 8) Confirm you are returned to the course and that this feels like the natural expectation. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit f55af2fc078a7d6a05238232bc276e6924307179) Signed-off-by: Fridolin Somers (cherry picked from commit ae405f61c8d4c04361267b500347a496a2ce7d58) Signed-off-by: Katrin Fischer commit a1e8e8542aaf14489b5eae7e08ba685fd5c81b55 Author: Jonathan Druart Date: Wed Sep 6 13:14:56 2017 -0300 Bug 17834: Make translation easier Signed-off-by: Jonathan Druart (cherry picked from commit 0c6538f033f43cde33d186561a93a197467bd9a1) Signed-off-by: Fridolin Somers (cherry picked from commit 11b73c1fa06c870a62640ffa8fd8f8610df5df18) Signed-off-by: Katrin Fischer commit e9a507aa3ceea8ff4306fdf72616223f187154c5 Author: Aleisha Amohia Date: Thu Apr 20 03:12:14 2017 +0000 Bug 17834: Change library news text for single-branch libraries To test: 1) Log into OPAC, go to home page 2) Confirm that the text shows as 'RSS feed for (branchname) library news' if single-branch library 3) Confirm text shows as normal for libraries with more than one branch Sponsored-by: Catalyst IT Signed-off-by: maricris Signed-off-by: anafe Signed-off-by: iflora Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 1417f83e8b8a57e70e9120244a36204cf4acb3c2) Signed-off-by: Fridolin Somers (cherry picked from commit e25bb0548d4ee69b9d79567a626fe91487386b71) Signed-off-by: Katrin Fischer commit 34ab316b1c7c8cd6d4272d1094350366095d7810 Author: Jonathan Druart Date: Mon Aug 28 14:00:28 2017 -0300 Bug 19081: Do not list plugins that have been uninstalled Under plack, can_load should not check if a package is in cache, but reload it. Otherwise plugins that have been uninstalled will still get listed. The error raised by can_load must only be displayed if the plugin has been removed. Test plan: 1/ Upload a plugin 2/ Note the plugin is listed as installed 3/ Modify the package of the plugin to add a compilation error (use 'Foo' for instance) 4/ Reload the page 5/ The plugin is not listed and a warning appear in the logs 6/ Remove the compilation error and uninstall the plugin 7/ The plugin is no longer listed and no warning appear in the logs Signed-off-by: Lee Jamison Signed-off-by: Kyle M Hall Bug 19081: Remove useless $plugin_file variable Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit d928038a523b7ef44257ddfe97c405173c9b3b2e) Signed-off-by: Fridolin Somers (cherry picked from commit 53c84ea289e73fa2f56711dd8dd8e7ebac591ae7) Signed-off-by: Katrin Fischer commit ac8ba913ba42dc932929b5714684a8ec971b30d5 Author: Marcel de Rooy Date: Tue Oct 3 16:01:15 2017 +0200 Bug 19343: [16.11.X] Remove private lists with edit permission from search results If the list is not shared, it should not be listed. We only need to remove the allow_add line. Signed-off-by: Jonathan Druart commit a5ea0b2d8d7dfe4f2c644e5407617af0f9b08a3c Author: Jonathan Druart Date: Tue Oct 3 11:45:45 2017 -0300 Bug 19343: [16.11.X] Add tests commit 5199bb74dcdef65b78a8e740a93ddd3c3ea9766a Author: Josef Moravec Date: Tue Aug 22 08:58:11 2017 +0000 Bug 19116: Hold not set to waiting after transfer Test plan: 0) Do not apply the patch 1) Place hold on item from another branch 2) Switch to that branch 3) Check them in at the other branch to set them into transport status (T) 4) Switch back to your homebranch 5) Check items in again, use the different confirm buttons and compare: Only "confirm and print" will be set to waiting, "confirm" remains in transport. 6) Apply the patch 7) Repeat 1-5 - now should work as expected - the hold is marked waiting on "confirm" button too 8) Check the hold from the same branch, to make sure this doesn't add regression Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 80fd5cd0dbfe8c5612325ca65251d36a97fcfc1c) Signed-off-by: Fridolin Somers (cherry picked from commit 2a0dc0f1d28ad03dd48326caff120dfe3b3daacd) Signed-off-by: Katrin Fischer commit dda4bca35d479df1d4039a7b892fe9af4328bc79 Author: Josef Moravec Date: Fri Sep 22 08:40:56 2017 +0000 Bug 19116: (followup) Add tests to highlight the problem in CheckReserves Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit a0c73b7bdafd21e19e0c1ba6a7ea222216d70500) Signed-off-by: Fridolin Somers (cherry picked from commit b3cd8c2def10285e2efb85bf88a47f315d80a8a5) Signed-off-by: Katrin Fischer commit 9fef1265b770dd7df2688b19b5d853470c0fa948 Author: Jonathan Druart Date: Mon Sep 4 14:14:31 2017 -0300 Bug 19116: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 021d1d3714602be64609b9db82fd92e8bb1b42c0) Signed-off-by: Fridolin Somers (cherry picked from commit bc3bfeab37abf9e83b26ae4635595aa5fc5b93ea) Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 6 ++- Koha/Plugins.pm | 6 ++- Koha/Virtualshelves.pm | 1 - acqui/addorderiso2709.pl | 1 + acqui/basket.pl | 2 +- admin/aqbudgetperiods.pl | 30 ++++++++--- .../prog/en/modules/admin/aqbudgetperiods.tt | 40 ++++++++++----- .../en/modules/course_reserves/course-details.tt | 10 ++-- .../prog/en/modules/course_reserves/course.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 14 ++++- t/db_dependent/Circulation.t | 54 +++++++++++++++++++- t/db_dependent/SIP/Message.t | 2 +- t/db_dependent/Virtualshelves.t | 1 + 13 files changed, 134 insertions(+), 35 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 16 15:05:28 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 16 Oct 2017 13:05:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-839-g9416fdc 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 9416fdca36f98860fca285dcb77835a0d702f401 (commit) via 9136c3dbf89aa824dcc7e848dcf2c7aeb41235f8 (commit) via 3f9da34683d7f87570e73b5c401a1a0e4a8604ac (commit) via f2a1b215dd27c6cb9ed1b45a0613886843c6ba7d (commit) via ec4e666bc52b20089f3720d2e2d523fbdcfcf2eb (commit) via ac50959dcf99739007907e8549ca22cdd0b97532 (commit) via 7cc65af6ffdabbabe7ae3463f51096de375216ad (commit) via 558a809144560198c7febac4998f49c56c45c844 (commit) via a93fef4c71d405fb7548e7d2601320ed0512d27c (commit) via e7a805691fdae884e6782c29e096ba2d476ef688 (commit) from a82d54d4b4f5eb7aa7d45afc13dac0a80c86f9ce (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 9416fdca36f98860fca285dcb77835a0d702f401 Author: Jonathan Druart Date: Mon Oct 16 09:57:26 2017 -0300 Bug 18298: DBRev 17.06.00.016 Signed-off-by: Jonathan Druart commit 9136c3dbf89aa824dcc7e848dcf2c7aeb41235f8 Author: Tomas Cohen Arazi Date: Fri Oct 13 16:42:03 2017 -0300 Bug 18298: (QA followup) Use Koha.Preference on the template Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 3f9da34683d7f87570e73b5c401a1a0e4a8604ac Author: Jonathan Druart Date: Thu Mar 16 23:03:20 2017 -0300 Bug 18298: Add server-side checks and refactor stuffs Now that we have a check client-side, nothing prevents us from a smart guy to bypass it and force an invalid password. This patch adds two new subroutines to Koha::AuthUtils to check the validity of passwords and generate a password server-side. It is used only once (self-registration) but could be useful later. Moreover the 3 different cases of password rejection (too leak, too short, contains leading or trailing whitespaces) were not tested everywhere. Now they are! This patch makes things consistent everywhere and clean up some code. Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f2a1b215dd27c6cb9ed1b45a0613886843c6ba7d Author: Jonathan Druart Date: Thu Mar 16 23:02:13 2017 -0300 Bug 18298: minPasswordLength should not be used as the default password length The length of the passwords generated for a patron should not be as long as the value of minPasswordLength. It is the minimum required size of a password, not the maximum! So let's fix it to 8 if the minPasswordLength if < 8, that sounds reasonable and less risky for patrons. Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ec4e666bc52b20089f3720d2e2d523fbdcfcf2eb Author: Jonathan Druart Date: Thu Mar 16 23:01:34 2017 -0300 Bug 18298: minPaswordLength should not be < 3 Indeed if RequireStrongPassword is set we need at least 3 characters to match 1 upper, 1 lower and 1 digit. We could make things more complicated to allow minPasswordLength < 3 but, really, 3 is already too low... Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ac50959dcf99739007907e8549ca22cdd0b97532 Author: Jonathan Druart Date: Thu Mar 16 23:00:28 2017 -0300 Bug 18298: Move password generation to template side This patch removes a really ugly way to generate a password: the whole template was sent and parsed to retrieve the "#defaultnewpassfield" node. To avoid the password to be sent plain text it is certainly better to generate it client-side. The same kind of passwords will be generated: 0-9a-zA-Z The while loop prevents to get an invalid generated password. Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 7cc65af6ffdabbabe7ae3463f51096de375216ad Author: Jonathan Druart Date: Thu Mar 16 22:59:51 2017 -0300 Bug 18298: Use the validate jQuery plugin To validate password fields we need to use the validate jQuery plugin. To make things reusable this patch adds a new include file 'password_check.inc' at the intranet and opac sides, it creates 3 new validation methods: - password_strong => make sure the passwords are strong enough according to the values of the RequireStrongPassword and minPasswordLength prefs - password_no_spaces => prevent passwords to be entered with leading or trailing spaces - password_match => make sure both password fields match Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 558a809144560198c7febac4998f49c56c45c844 Author: Jonathan Druart Date: Tue Mar 14 20:01:27 2017 -0300 Bug 18298: Enforce password complexity This patchset prevents users to enter too leak password, controlled by a new syspref RequireStrongPassword. If set the staff and patrons will have to enter a strong password. The strongness cannot be modified, it has been arbitrarily set (by the author of this enhancement) to at least 1 lowercase, 1 uppercase and 1 digit. This can be inforce by increasing the value of the existing minPasswordLength pref. I decided to turn this feature on, it cannot hurt! For existing installs it will have to be turned on manually. Writing these patches I found a lot of inconsistencies all around the password checks and decided to refactor everything to make things consistent and more robust. Now the password validity is check at only one place (subroutine covered by tests). Test plan: We have several places where a password can be change/created: a. Editing a patron (members/memberentry.pl) b. Changing the password of a patron (members/member-password.pl) c. Changing your own password at the opac (opac/opac-passwd.pl). OpacPasswordChange needs to be set d. Reseting your own password at the opac (opac/opac-password-recovery.pl). OpacResetPassword needs to be set, see "Forgot your password?" link when you are not logged in e. Self registration feature, PatronSelfRegistration needs to be set. You will also need to add 'password' to PatronSelfRegistrationBorrowerMandatoryField. Note that '****' is considered by Koha internally that the password is not changed (existing behavior). To fully test this patch you will need to test the different combinations of RequireStrongPassword and minPasswordLength. Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit a93fef4c71d405fb7548e7d2601320ed0512d27c Author: Jonathan Druart Date: Wed Sep 27 13:55:30 2017 -0300 Bug 19373: CAS logout - Redirect to the previous page (Intranet) Signed-off-by: Matthias Meusburger Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit e7a805691fdae884e6782c29e096ba2d476ef688 Author: Jonathan Druart Date: Wed Oct 11 12:15:01 2017 -0300 Bug 19373: Update tests Signed-off-by: Matthias Meusburger Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 3 + C4/Auth_with_cas.pm | 8 +- Koha.pm | 2 +- Koha/AuthUtils.pm | 48 +++++++++ installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 11 +++ .../prog/en/includes/password_check.inc | 25 +++++ .../prog/en/modules/admin/preferences/patrons.pref | 7 ++ .../prog/en/modules/members/member-password.tt | 104 ++++++++++++-------- .../prog/en/modules/members/memberentrygen.tt | 39 ++++++-- koha-tmpl/intranet-tmpl/prog/js/members.js | 14 --- .../bootstrap/en/includes/password_check.inc | 25 +++++ .../bootstrap/en/modules/opac-memberentry.tt | 45 ++++++--- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 42 ++++++-- .../bootstrap/en/modules/opac-password-recovery.tt | 11 ++- members/member-password.pl | 26 ++--- members/memberentry.pl | 16 ++- opac/opac-memberentry.pl | 17 ++-- opac/opac-passwd.pl | 59 ++++++----- opac/opac-password-recovery.pl | 58 +++++------ t/AuthUtils.t | 49 ++++++++- t/db_dependent/Auth_with_cas.t | 3 +- 22 files changed, 428 insertions(+), 185 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 16 17:07:08 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 16 Oct 2017 15:07:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-845-g6bf390f 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 6bf390f38c7a0a1ae0be91f72baf7aa284ee0edb (commit) via a539e62689946d314b4b7afba0aa8f39fa46613a (commit) via 430527ffb813b11e8950b91cd8766b259ae59084 (commit) via 4a3159a01730ad5424b686cad58b5b4be461d01c (commit) via d51b93572660d5c45f0e76c9bf04ff2f45b86d32 (commit) via 93354ff3f1fdad170ad5d89fed0fa019c746027a (commit) from 9416fdca36f98860fca285dcb77835a0d702f401 (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 6bf390f38c7a0a1ae0be91f72baf7aa284ee0edb Author: Jonathan Druart Date: Mon Oct 16 11:54:50 2017 -0300 Bug 19472: Update SYNOPSIS with the correct script name Signed-off-by: Jonathan Druart commit a539e62689946d314b4b7afba0aa8f39fa46613a Author: Marcel de Rooy Date: Wed Oct 11 16:11:33 2017 +0200 Bug 19472: Add perl extension to script borrowers-force-messaging-defaults There is no reason to keep this perl script without the regular extension. Please see other scripts in the same folder too. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 430527ffb813b11e8950b91cd8766b259ae59084 Author: Jonathan Druart Date: Mon Oct 16 11:59:10 2017 -0300 Bug 13572: Patrons are still active if their expiry date is today Signed-off-by: Jonathan Druart commit 4a3159a01730ad5424b686cad58b5b4be461d01c Author: Jonathan Druart Date: Mon Oct 16 11:37:39 2017 -0300 Bug 13572: Rename option with "--not-expired" Signed-off-by: Jonathan Druart commit d51b93572660d5c45f0e76c9bf04ff2f45b86d32 Author: Marcel de Rooy Date: Wed Oct 11 16:09:19 2017 +0200 Bug 13572: (follow-up) Print since on a separate line Very trivial change. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 93354ff3f1fdad170ad5d89fed0fa019c746027a Author: charles Date: Thu Dec 15 10:58:23 2016 -0500 Bug 13572: Add --actives parameter to force_borrower_messaging_defaults script 1) Apply the patch 2) Create a new patron with random values, except for it expiration date, make it expired (Patrons > New Patron > Student) 3) Enable the system preference called ?EnhancedMessagingPreferences? 4) In ?Administration" > "Patron categories" > Student, modify the "days in advance", then click "Save" 5) run the script "./misc/maintenance/borrowers-force-messaging-defaults --doit --actives" 6) Validate that the student created in step 2 hasn't changed (Patrons > search) 7) Validate that any other student that isn't expired has changed. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: ...aults => borrowers-force-messaging-defaults.pl} | 41 ++++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) rename misc/maintenance/{borrowers-force-messaging-defaults => borrowers-force-messaging-defaults.pl} (72%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 09:12:46 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 07:12:46 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-117-gc4112a7 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.05.x has been updated via c4112a744f38f2ae78db1828c20d98d512d6efb9 (commit) via aaf0d3dc474def89ffbb69548ebaf830109143b0 (commit) from c94e6606525ce9da003a99800ba46fe6e1967d47 (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 c4112a744f38f2ae78db1828c20d98d512d6efb9 Author: Jonathan Druart Date: Mon Oct 9 15:57:46 2017 -0300 Bug 19440: Existing calls need to be done in scalar context Signed-off-by: Jonathan Druart (cherry picked from commit fed86d50420dcb3fb468c5743a1e370d075bc5e0) Signed-off-by: Fridolin Somers commit aaf0d3dc474def89ffbb69548ebaf830109143b0 Author: Tomas Cohen Arazi Date: Mon Oct 9 15:36:41 2017 -0300 Bug 19440: Identify overlimit problems in XISBN tests This patch makes C4::XISBN::get_xisbns() return an errors hashref including information of the failing fetches from xisbn services. It tackles the situation of XISBN, which in some cases returns 'overlimit' errors. The patch makes the relevant functions check if the response->{stat} string is 'ok' and returns the string in $errors otherwise. This only happens when in list context. This allows to fix the randomly failing tests while keeping the current behaviour. All this code should be rewritten. It does the job bug doesn't have problems handling or reoprting. This is just a band aid. To test: - Make sure k$ prove t/db_dependent/XISBN.t => SUCCESS :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit e90874241808354777cc1c27ad3ad106ffdc7cd4) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/XISBN.pm | 11 +++++++++-- catalogue/detail.pl | 2 +- opac/opac-detail.pl | 2 +- t/db_dependent/XISBN.t | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 09:31:49 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 07:31:49 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-119-g4ba051f 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.05.x has been updated via 4ba051fd6eb54bbc3abf94d8f60b5543009cb32c (commit) via a2fd973b644c9956ce7c35bdc2fcdb7b0e71e45e (commit) from c4112a744f38f2ae78db1828c20d98d512d6efb9 (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 4ba051fd6eb54bbc3abf94d8f60b5543009cb32c Author: Jonathan Druart Date: Tue Oct 3 12:15:30 2017 -0300 Bug 19350: Add tests (cherry picked from commit a2cc68e8b7a33dd7983c2125e32ba269777b8ace) Signed-off-by: Fridolin Somers commit a2fd973b644c9956ce7c35bdc2fcdb7b0e71e45e Author: Dobrica Pavlinusic Date: Wed Sep 20 16:01:16 2017 +0200 Bug 19350 - Holds without link in 773 trigger SQL::Abstract::puke Test: 1. find bibio without items which has something in field 773 (for us, it's article) but doesn't have 0 or 9 (host item entry) 2. click on hold in left menu 3. verify application error 4. apply patch and verify that it works Signed-off-by: Josef Moravec (cherry picked from commit 5c873a408f40fd1660d0b09c6de8c1ca2e252d11) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 5 +++++ t/db_dependent/Items.t | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 09:42:49 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 07:42:49 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-120-g2d04c80 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.05.x has been updated via 2d04c80b37cb2f37f9709b8bcfc6b9a4e4eaaae9 (commit) from 4ba051fd6eb54bbc3abf94d8f60b5543009cb32c (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 2d04c80b37cb2f37f9709b8bcfc6b9a4e4eaaae9 Author: Alex Arnaud Date: Fri Oct 6 07:19:15 2017 +0000 Bug 19418: (bug 12833 follow-up) Add missing use statement Patron search fail on calling svc/members/search. This script return a 500 error and the search stay on "Processing..." Test plan: - Enable ExtendedPatronAttributes system preference, - make a standard search (search fields), - check the search works and it doesn't stick on "Processing..." Signed-off-by: Jonathan Druart I do not recreate the issue, but the change make sense and the issue has been raised by several people (cherry picked from commit 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Utils/DataTables/Members.pm | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 09:47:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 07:47:22 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-121-g9722e31 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.05.x has been updated via 9722e31033a0a86091d4abdd99fd9b1e9fddf118 (commit) from 2d04c80b37cb2f37f9709b8bcfc6b9a4e4eaaae9 (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 9722e31033a0a86091d4abdd99fd9b1e9fddf118 Author: Nick Clemens Date: Fri Apr 7 23:09:05 2017 -0400 Bug 18318: Unicode support for Elasticsearch You must install the icu plugin for elasticsearch https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html Once installed, apply this patch Reindex your data, deleting the existing indexes perl /home/vagrant/kohaclone/misc/search_tools/rebuild_elastic_search.pl -d Find (or add) some titles with accented characters Verify that a search for the exact character or the unaccented version works Signed-off-by: Tomas Cohen Arazi Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 1404654d65baccacb2928f59171ec6f41d9b653b) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Elasticsearch.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 09:55:34 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 07:55:34 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-123-g47223f0 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.05.x has been updated via 47223f0cad47913c15f4c9dacfbc0ed4682a8e2d (commit) via 1b8e2f600a51047191fca14bdaa19bca612887c9 (commit) from 9722e31033a0a86091d4abdd99fd9b1e9fddf118 (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 47223f0cad47913c15f4c9dacfbc0ed4682a8e2d Author: Mark Tompsett Date: Fri Sep 1 21:23:20 2017 -0400 Bug 19120: Leave cancelled ordered items alone when reopening basket TEST PLAN --------- 1) Apply first patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS 3) Apply this patch 4) prove t/db_dependent/Acquisition/close_reopen_basket.t -- SUCCESS! 5) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 632e2ad51d2510a412224ded5e51a9f991d566b4) Signed-off-by: Fridolin Somers commit 1b8e2f600a51047191fca14bdaa19bca612887c9 Author: Mark Tompsett Date: Fri Sep 1 21:21:40 2017 -0400 Bug 19120: Add tests to reproduce the problem TEST PLAN --------- 1) apply this patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS! -- This proves the test works. 3) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit d34fae94995977b730e4bbfc11bdecaa3ce310a8) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 2 +- t/db_dependent/Acquisition/close_reopen_basket.t | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 10:03:40 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 08:03:40 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-124-gfe386c1 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.05.x has been updated via fe386c172496159198b34383c3080185de7ae0af (commit) from 47223f0cad47913c15f4c9dacfbc0ed4682a8e2d (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 fe386c172496159198b34383c3080185de7ae0af Author: Fridolin Somers Date: Fri Sep 15 11:12:01 2017 +0200 Bug 19323: subscription edit permission issue If a librarian has edit_subscription but not create_subscription : When trying to edit a subscription, after saving permission is denied. This is because permissions in serials/subscription-add.pl depends on arg 'op' and on edit this arg starts with 'modify' but changes to 'modsubscription' when saving. Test plan : - Create a user with staff access - Define its permissions on serials : only edit_subscription - Edit a subscription - Click 'Next' - Click 'Test prediction pattern' - Click 'Save subscription' => Without patch you get to page serials/subscription-add.pl with permission denied => With patch subscription is saved and you get to subscription details page Signed-off-by: Caroline Cyr La Rose Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 12bd6358cfe6c9348cb111d22f04097f7911babf) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: serials/subscription-add.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 10:17:40 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 08:17:40 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-125-ge23822b 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.05.x has been updated via e23822b869ea66f63ce6c6027e418c79e3c7ba04 (commit) from fe386c172496159198b34383c3080185de7ae0af (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 e23822b869ea66f63ce6c6027e418c79e3c7ba04 Author: Jonathan Druart Date: Wed Sep 27 13:44:00 2017 -0300 Bug 19366: Do not block patron's detail update if EmailMustBeUnique If the pref PatronSelfRegistrationEmailMustBeUnique is set ("consider"), a patron is not allowed to register with an existing email address. The existing code is wrong and reject a patron that is updating their personal details with "This email address already exists in our database.", even if the patron did not modify their email address. This is caused by the query we made, we must search for patron with this email address but who is not the current patron. Test plan: - Set PatronSelfRegistrationEmailMustBeUnique to "consider" - Register a new patron with an existing email address => you should not be allowed - Use a non-existent email address => You should be allowed - Edit your patron details - Modify some infos => Should pass - Modify your email address with an existing one => You should not be allowed to do that Followed test plan, patches worked as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit ae02cf97e469a17d3bdc9d5c7db702960fd620c8) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: opac/opac-memberentry.pl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 10:24:05 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 08:24:05 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-127-g699ac0e 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.05.x has been updated via 699ac0eba3b9acc057cdcf317a549df9b416d08c (commit) via 13f9359dc3da8be011370327b20d9cd4f05ee490 (commit) from e23822b869ea66f63ce6c6027e418c79e3c7ba04 (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 699ac0eba3b9acc057cdcf317a549df9b416d08c Author: Jonathan Druart Date: Mon Oct 2 14:11:52 2017 -0300 Bug 19122: (bug 18098 follow-up) Fix IncludeSeeFromInSearches behaviour The IncludeSeeFromInSearches system preference is designed so that 'See from' headings from the authorities are included when you search in the catalog. That means that you could find an author not only by the name printed on the book, but for example also by their pseudonym or a different spelling of their name. It was added by bug 7417. This regression has been introduced by commit 5ef1b6710e7520b844e145e248da0deeee707fde Bug 18098: Add an index with the count of not onloan items - } elsif ($record_type eq 'biblio' && C4::Context->preference('IncludeSeeFromInSearches')) { - my $normalizer = Koha::RecordProcessor->new( { filters => 'EmbedSeeFromHeadings' } ); [...] + push @filters, 'IncludeSeeFromInSearches' + if C4::Context->preference('IncludeSeeFromInSearches'); Test plan: - Activate IncludeSeeFromInSearches - Catalog an authority for a person - main heading in 100 - see from headings in 400 - Catalog a bibliographic record and link it to the authority - Make sure the record is indexed - Verify that the record can be found searching for the main heading - Verify that the record can be found searching for the see from headings Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Yet another reason to get rid of all this functions from this script. Signed-off-by: Jonathan Druart (cherry picked from commit 10b5e1ee049605ae6a0614214a7dab76e20e0ca5) Signed-off-by: Fridolin Somers commit 13f9359dc3da8be011370327b20d9cd4f05ee490 Author: Jonathan Druart Date: Wed Sep 27 12:54:18 2017 -0300 Bug 19372: (bug 15801 follow-up) pass selected frameworkcode to the template Bug 15801 removes the 2 lines that were necessary to retrieve the framework selected by the user and pass it to the template. All bibliographic records created when adding an order to the basket using an external source used the default framework. Test plan: Add an order to a basket from an external source Select another framework than the default one => Without this patch, whatever the framework you picked, the default one is used => With this patch applied the framework code you will pick will be used Signed-off-by: Marijana Glavica Signed-off-by: Marijana Glavica Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 60a17c1b2b8582620fc94ab9eadd7e8336a5d1fa) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/z3950_search.pl | 2 ++ misc/migration_tools/rebuild_zebra.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 17:22:21 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 15:22:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-847-g41e63c4 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 41e63c44e06fa17959b7cd1c9035c75b2577c633 (commit) via 708d02047d67bc5f8d5b43690c6967cc5e191f82 (commit) from 6bf390f38c7a0a1ae0be91f72baf7aa284ee0edb (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 41e63c44e06fa17959b7cd1c9035c75b2577c633 Author: Marcel de Rooy Date: Tue Oct 17 16:57:16 2017 +0200 Bug 19463: Additional changes to gen_text Use Bytes::Random::Secure instead of perl rand. Return a string from 50 to 100% of $size. Signed-off-by: Jonathan Druart commit 708d02047d67bc5f8d5b43690c6967cc5e191f82 Author: Jonathan Druart Date: Tue Oct 17 11:29:06 2017 -0300 Bug 19463: Reduce the chance to have TestBuilder generate twice the same value When an id is generated by TestBuilder (branchcode for instance) and the size of the generated string is 1, we have too many chances to get "Violation of unique constraint in Branch". This patch increases the number of retries to 5. Signed-off-by: Marcel de Rooy Amended to make room for follow-up. Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/lib/TestBuilder.pm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 17 17:49:28 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 17 Oct 2017 15:49:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-848-g0e9edcd 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 0e9edcd3be5ddfcd15c5924166ec509c6445f97b (commit) from 41e63c44e06fa17959b7cd1c9035c75b2577c633 (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 0e9edcd3be5ddfcd15c5924166ec509c6445f97b Author: Jonathan Druart Date: Tue Oct 17 12:40:45 2017 -0300 Bug 18298: Fix selenium tests The password has to be better than "password"... Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/selenium/basic_workflow.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 18 15:13:32 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 18 Oct 2017 13:13:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-849-ge772277 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 e772277a8aa7402f537ddb3c0886fb9dc3ce2d91 (commit) from 0e9edcd3be5ddfcd15c5924166ec509c6445f97b (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 e772277a8aa7402f537ddb3c0886fb9dc3ce2d91 Author: Marcel de Rooy Date: Wed Oct 18 13:59:06 2017 +0200 Bug 19463: (follow-up) Cosmetic changes String::Random version 0.26 (on Jessie) does not yet support the rand_gen parameter (0.27 does, newest is 0.29 on CPAN now). So alt_rand is only used in determining the size on Jessie. That might be enough though. Adding a documention line in this regard. Removing the obsolete max parameter. Note: I timed alt_rand for the creation of a new Bytes::Random::Secure object each time. But each call is about 0.1 milliseconds. So that should be fine. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/lib/TestBuilder.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 18 16:27:15 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 18 Oct 2017 14:27:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-851-g0835784 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 08357845c3db3b68990e655de3364bc0f4649fc1 (commit) via d8b89eead0c7576a295679b3ef3bb90e7dec8283 (commit) from e772277a8aa7402f537ddb3c0886fb9dc3ce2d91 (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 08357845c3db3b68990e655de3364bc0f4649fc1 Author: Marcel de Rooy Date: Fri Oct 13 09:03:25 2017 +0200 Bug 19296: (QA follow-up) Correct comment in populate_orders Just replacing a wrong - by a correct + sign in the comment. The code itself is fine. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit d8b89eead0c7576a295679b3ef3bb90e7dec8283 Author: Nick Clemens Date: Tue Sep 12 16:57:47 2017 +0000 Bug 19296: Allow all tax processing to happen in C4::Acquisition::populate_order_with_prices To test: 1 - Create an order file that includes prices and items (MarcFieldsToOrder) 2 - Stage the file 3 - Set vendor to 'prices exclude tax' 4 - Open a basket and add from the file 5 - View the items in the basket 6 - Prices are reduced by the tax rate and tax is calculated to return prices to the value in the file 7 - Apply patch 8 - Repeat steps 1-6 9 - Prices should now calculate correctly 10 - Repeat with 'MarcItemFieldsToOrder' Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 2 +- acqui/addorderiso2709.pl | 40 ++++++++++------------------------------ 2 files changed, 11 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Oct 18 23:29:57 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 18 Oct 2017 21:29:57 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-91-g8435688 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, 16.11.x has been updated via 8435688b2c3d35ed0ee5375841f8d17ab1c3d89c (commit) via 6a6f704d02d0ca0ab973afcb6729fa5e47c15f1a (commit) via ffd14c3d285c34fb5728d71d051fce022bf1f316 (commit) via be36b318beaf09d27bfff36b095afe34a94d9041 (commit) via 8884545ef632b746436a8117348de150e93071af (commit) via 5b3ad8e093f402b3e55544a54d4b10b8ac46f384 (commit) via 77d232b41c5968f7877e6bae8e61dc0a37f24dfd (commit) via 729e3aa486973d7deb9a922af6e7d9aa48cabe05 (commit) via d47465f38229ddab577a195419d4ddb4524885a7 (commit) via 0b2e517259eaf7838bb814d3a36137424df89583 (commit) from 61cfb6e24172804e48edc01e9dde2081cffcbaec (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 8435688b2c3d35ed0ee5375841f8d17ab1c3d89c Author: Jonathan Druart Date: Wed Sep 27 12:54:18 2017 -0300 Bug 19372: (bug 15801 follow-up) pass selected frameworkcode to the template Bug 15801 removes the 2 lines that were necessary to retrieve the framework selected by the user and pass it to the template. All bibliographic records created when adding an order to the basket using an external source used the default framework. Test plan: Add an order to a basket from an external source Select another framework than the default one => Without this patch, whatever the framework you picked, the default one is used => With this patch applied the framework code you will pick will be used Signed-off-by: Marijana Glavica Signed-off-by: Marijana Glavica Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 60a17c1b2b8582620fc94ab9eadd7e8336a5d1fa) Signed-off-by: Fridolin Somers (cherry picked from commit 13f9359dc3da8be011370327b20d9cd4f05ee490) Signed-off-by: Katrin Fischer commit 6a6f704d02d0ca0ab973afcb6729fa5e47c15f1a Author: Jonathan Druart Date: Wed Sep 27 13:44:00 2017 -0300 Bug 19366: Do not block patron's detail update if EmailMustBeUnique If the pref PatronSelfRegistrationEmailMustBeUnique is set ("consider"), a patron is not allowed to register with an existing email address. The existing code is wrong and reject a patron that is updating their personal details with "This email address already exists in our database.", even if the patron did not modify their email address. This is caused by the query we made, we must search for patron with this email address but who is not the current patron. Test plan: - Set PatronSelfRegistrationEmailMustBeUnique to "consider" - Register a new patron with an existing email address => you should not be allowed - Use a non-existent email address => You should be allowed - Edit your patron details - Modify some infos => Should pass - Modify your email address with an existing one => You should not be allowed to do that Followed test plan, patches worked as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit ae02cf97e469a17d3bdc9d5c7db702960fd620c8) Signed-off-by: Fridolin Somers (cherry picked from commit e23822b869ea66f63ce6c6027e418c79e3c7ba04) Signed-off-by: Katrin Fischer commit ffd14c3d285c34fb5728d71d051fce022bf1f316 Author: Fridolin Somers Date: Fri Sep 15 11:12:01 2017 +0200 Bug 19323: subscription edit permission issue If a librarian has edit_subscription but not create_subscription : When trying to edit a subscription, after saving permission is denied. This is because permissions in serials/subscription-add.pl depends on arg 'op' and on edit this arg starts with 'modify' but changes to 'modsubscription' when saving. Test plan : - Create a user with staff access - Define its permissions on serials : only edit_subscription - Edit a subscription - Click 'Next' - Click 'Test prediction pattern' - Click 'Save subscription' => Without patch you get to page serials/subscription-add.pl with permission denied => With patch subscription is saved and you get to subscription details page Signed-off-by: Caroline Cyr La Rose Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 12bd6358cfe6c9348cb111d22f04097f7911babf) Signed-off-by: Fridolin Somers (cherry picked from commit fe386c172496159198b34383c3080185de7ae0af) Signed-off-by: Katrin Fischer commit be36b318beaf09d27bfff36b095afe34a94d9041 Author: Mark Tompsett Date: Fri Sep 1 21:23:20 2017 -0400 Bug 19120: Leave cancelled ordered items alone when reopening basket TEST PLAN --------- 1) Apply first patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS 3) Apply this patch 4) prove t/db_dependent/Acquisition/close_reopen_basket.t -- SUCCESS! 5) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 632e2ad51d2510a412224ded5e51a9f991d566b4) Signed-off-by: Fridolin Somers (cherry picked from commit 47223f0cad47913c15f4c9dacfbc0ed4682a8e2d) Signed-off-by: Katrin Fischer commit 8884545ef632b746436a8117348de150e93071af Author: Mark Tompsett Date: Fri Sep 1 21:21:40 2017 -0400 Bug 19120: Add tests to reproduce the problem TEST PLAN --------- 1) apply this patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS! -- This proves the test works. 3) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit d34fae94995977b730e4bbfc11bdecaa3ce310a8) Signed-off-by: Fridolin Somers (cherry picked from commit 1b8e2f600a51047191fca14bdaa19bca612887c9) Signed-off-by: Katrin Fischer commit 5b3ad8e093f402b3e55544a54d4b10b8ac46f384 Author: Alex Arnaud Date: Fri Oct 6 07:19:15 2017 +0000 Bug 19418: (bug 12833 follow-up) Add missing use statement Patron search fail on calling svc/members/search. This script return a 500 error and the search stay on "Processing..." Test plan: - Enable ExtendedPatronAttributes system preference, - make a standard search (search fields), - check the search works and it doesn't stick on "Processing..." Signed-off-by: Jonathan Druart I do not recreate the issue, but the change make sense and the issue has been raised by several people (cherry picked from commit 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b) Signed-off-by: Fridolin Somers (cherry picked from commit 2d04c80b37cb2f37f9709b8bcfc6b9a4e4eaaae9) Signed-off-by: Katrin Fischer commit 77d232b41c5968f7877e6bae8e61dc0a37f24dfd Author: Jonathan Druart Date: Tue Oct 3 12:15:30 2017 -0300 Bug 19350: Add tests (cherry picked from commit a2cc68e8b7a33dd7983c2125e32ba269777b8ace) Signed-off-by: Fridolin Somers (cherry picked from commit 4ba051fd6eb54bbc3abf94d8f60b5543009cb32c) Signed-off-by: Katrin Fischer commit 729e3aa486973d7deb9a922af6e7d9aa48cabe05 Author: Dobrica Pavlinusic Date: Wed Sep 20 16:01:16 2017 +0200 Bug 19350 - Holds without link in 773 trigger SQL::Abstract::puke Test: 1. find bibio without items which has something in field 773 (for us, it's article) but doesn't have 0 or 9 (host item entry) 2. click on hold in left menu 3. verify application error 4. apply patch and verify that it works Signed-off-by: Josef Moravec (cherry picked from commit 5c873a408f40fd1660d0b09c6de8c1ca2e252d11) Signed-off-by: Fridolin Somers (cherry picked from commit a2fd973b644c9956ce7c35bdc2fcdb7b0e71e45e) Signed-off-by: Katrin Fischer commit d47465f38229ddab577a195419d4ddb4524885a7 Author: Jonathan Druart Date: Mon Oct 9 15:57:46 2017 -0300 Bug 19440: Existing calls need to be done in scalar context Signed-off-by: Jonathan Druart (cherry picked from commit fed86d50420dcb3fb468c5743a1e370d075bc5e0) Signed-off-by: Fridolin Somers (cherry picked from commit c4112a744f38f2ae78db1828c20d98d512d6efb9) Signed-off-by: Katrin Fischer commit 0b2e517259eaf7838bb814d3a36137424df89583 Author: Tomas Cohen Arazi Date: Mon Oct 9 15:36:41 2017 -0300 Bug 19440: Identify overlimit problems in XISBN tests This patch makes C4::XISBN::get_xisbns() return an errors hashref including information of the failing fetches from xisbn services. It tackles the situation of XISBN, which in some cases returns 'overlimit' errors. The patch makes the relevant functions check if the response->{stat} string is 'ok' and returns the string in $errors otherwise. This only happens when in list context. This allows to fix the randomly failing tests while keeping the current behaviour. All this code should be rewritten. It does the job bug doesn't have problems handling or reoprting. This is just a band aid. To test: - Make sure k$ prove t/db_dependent/XISBN.t => SUCCESS :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit e90874241808354777cc1c27ad3ad106ffdc7cd4) Signed-off-by: Fridolin Somers (cherry picked from commit aaf0d3dc474def89ffbb69548ebaf830109143b0) Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 2 +- C4/Items.pm | 5 +++++ C4/Utils/DataTables/Members.pm | 1 + C4/XISBN.pm | 11 +++++++++-- acqui/z3950_search.pl | 2 ++ catalogue/detail.pl | 2 +- opac/opac-detail.pl | 2 +- opac/opac-memberentry.pl | 13 ++++++++++++- serials/subscription-add.pl | 3 ++- t/db_dependent/Acquisition/close_reopen_basket.t | 12 +++++++++++- t/db_dependent/Items.t | 17 ++++++++++++++++- t/db_dependent/XISBN.t | 8 ++++---- 12 files changed, 65 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 20 22:19:55 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 20 Oct 2017 20:19:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-886-gd637acd 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 d637acd08c11d694e04954592e7ac8d7c1ed8c13 (commit) via 97ff6ae44d24c998502c3fc81d3ade69f7a70f8f (commit) via 6ecddf87f56361b0b13a76f0d1ae921917001f61 (commit) via ea5aef7841e79e6bb8e62e73c9d487e362d7a4ae (commit) via 226d61282a86002805c3c2f533339c3c93f237db (commit) via afe1eacceb3330025bf2c2c3e7710ef518aebc53 (commit) via 4492a3acf4d71f47a4f205d303ad98dfe8d9dfe3 (commit) via b6cd42bf5f0d8926d892f0c6a03512d753782f24 (commit) via a9ac1eff7f2cfd87ccca976d14f34ac3c18ff0ca (commit) via c1620ece00fdb225cad2f8ffebfe673fd2cdc2cb (commit) via 4b6c9178c42698d4734dbbef387000fad5a55b72 (commit) via 0931e15f150660f598ed0aa025ec22e8a8884b9f (commit) via 3b04f401b92ef96f0ca2dae05d8fec7dcce0ff7f (commit) via f4d702c668661f4ef01f5fe0d4ae99d81f89712d (commit) via 2dd0d6c359e12fe7cd30c8c36a5de6b0d23350e7 (commit) via 7417dd3704174735dd1232a4634f9ded00e44144 (commit) via 473bf22e42dfe9297a22ed5c6d5c0bdc3e97b99f (commit) via a588b3b996b003eea314add5e97f2b5c98fbbfc6 (commit) via f7c0cefff761e2c22e00c35b751c231ed4625063 (commit) via d2c555bb32c7b29b9896e6751ac665076317c3ee (commit) via c0aa6740d3c32a3cdf53e5d97405c260e4d74ac7 (commit) via 0dccc8ec5b2a4347cbc78e08aa905b79f1136787 (commit) via ca34994f23702ba4edeac7d7c5340c2bf7637d07 (commit) via 49eb0395defb9b21ab89a26eafa9a879bcbb176b (commit) via 399dcaa222c8e49da9aba8b6cac16928608f89ae (commit) via ef92ad31bffc80c308e9ed693b9de88391603b05 (commit) via 9ad872dc88236cae539bb02ac0053a50fbf31684 (commit) via 629598704a4ded9425293340bf5b9de8e347bd68 (commit) via f46d6a8785db490ec9067ba6964b5172e06ee848 (commit) via 0afe6eca76b3160fcdcddb9e376cf277d673acca (commit) via f0f3cb32889d6f0d64fb4965e8c00a3a1f31c6c9 (commit) via 7ed705ea458d47d199b8f3e20572397d4697516a (commit) via 850243ee2ec66a4b569d29ed84423f09c0001690 (commit) via 60bb936bc28b73f1653207cce36f432dec094017 (commit) via 7b5c1fce5880f8592c5a9dbd40614a760bb2607e (commit) from 08357845c3db3b68990e655de3364bc0f4649fc1 (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 d637acd08c11d694e04954592e7ac8d7c1ed8c13 Author: Jonathan Druart Date: Fri Oct 20 17:02:31 2017 -0300 Bug 12768: DBRev 17.06.00.018 Signed-off-by: Jonathan Druart commit 97ff6ae44d24c998502c3fc81d3ade69f7a70f8f Author: Jonathan Druart Date: Fri Oct 20 16:35:03 2017 -0300 Bug 12768: (follow-up) Add 'Processing fee' to templates Signed-off-by: Jonathan Druart commit 6ecddf87f56361b0b13a76f0d1ae921917001f61 Author: Nick Clemens Date: Wed Oct 18 15:47:30 2017 +0000 Bug 12768: (QA follow-up) Fix doubled code Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit ea5aef7841e79e6bb8e62e73c9d487e362d7a4ae Author: Kyle M Hall Date: Fri Oct 13 10:02:41 2017 -0400 Bug 12768: (QA follow-up) Add 'Processing fee' to templates Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 226d61282a86002805c3c2f533339c3c93f237db Author: Kyle M Hall Date: Thu Oct 12 12:44:49 2017 -0400 Bug 12768: Fix up unit tests a bit more Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit afe1eacceb3330025bf2c2c3e7710ef518aebc53 Author: Jonathan Druart Date: Tue Oct 10 17:32:59 2017 -0300 Bug 12768: DBIC Schema changes Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 4492a3acf4d71f47a4f205d303ad98dfe8d9dfe3 Author: Jonathan Druart Date: Tue Oct 10 17:29:00 2017 -0300 Bug 12768: Fix YAML syntax in circulation.pref Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b6cd42bf5f0d8926d892f0c6a03512d753782f24 Author: Jonathan Druart Date: Tue Oct 10 17:01:56 2017 -0300 Bug 12768: Add missing IGNORE clauses Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit a9ac1eff7f2cfd87ccca976d14f34ac3c18ff0ca Author: Kyle M Hall Date: Tue Oct 10 10:40:19 2017 -0400 Bug 12768: Revert changes to getcharges Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit c1620ece00fdb225cad2f8ffebfe673fd2cdc2cb Author: Kyle M Hall Date: Tue Oct 10 10:34:22 2017 -0400 Bug 12768: Fix up unit tests Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 4b6c9178c42698d4734dbbef387000fad5a55b72 Author: charles Date: Wed Apr 22 15:54:04 2015 -0400 Bug 12768: Replacement cost and processing fee management Signed-off-by: Eivin Giske Skaaren Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 0931e15f150660f598ed0aa025ec22e8a8884b9f Author: charles Date: Wed Apr 22 16:03:54 2015 -0400 Bug 12768: DB changes Signed-off-by: Eivin Giske Skaaren Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 3b04f401b92ef96f0ca2dae05d8fec7dcce0ff7f Author: Jonathan Druart Date: Fri Oct 20 17:06:49 2017 -0300 Bug 14826: DBRev 17.06.00.017 Signed-off-by: Jonathan Druart commit f4d702c668661f4ef01f5fe0d4ae99d81f89712d Author: Jonathan Druart Date: Fri Oct 20 16:28:52 2017 -0300 Bug 14826: DBIC Schema changes Signed-off-by: Jonathan Druart commit 2dd0d6c359e12fe7cd30c8c36a5de6b0d23350e7 Author: Kyle M Hall Date: Thu Oct 12 12:00:48 2017 -0400 Bug 14826: (QA follow-up) Make db update idempotent Signed-off-by: Jonathan Druart commit 7417dd3704174735dd1232a4634f9ded00e44144 Author: Tomas Cohen Arazi Date: Fri Sep 29 10:55:39 2017 -0300 Bug 14826: (QA follow-up) POD fixes This patch just fixes POD. There are still some false positives with the QA scripts. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 473bf22e42dfe9297a22ed5c6d5c0bdc3e97b99f Author: Kyle M Hall Date: Fri Sep 1 07:51:49 2017 -0400 Bug 14826: Add account offset type table Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit a588b3b996b003eea314add5e97f2b5c98fbbfc6 Author: Kyle M Hall Date: Tue Aug 8 10:04:31 2017 -0400 Bug 14826: (QA follow-up) Only use plural modules in other modules Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f7c0cefff761e2c22e00c35b751c231ed4625063 Author: Kyle M Hall Date: Tue Jun 6 09:33:46 2017 -0400 Bug 14826: Add unit tests for _FixAccountForLostAndReturned and _FixOverduesOnReturn Signed-off-by: Tomas Cohen Arazi Bug 14826: (QA followup) Fix minor issues with unit tests Signed-off-by: Tomas Cohen Arazi Bug 14826 [QA Followup] - Correct number of tests run following rebase Signed-off-by: Jonathan Druart commit d2c555bb32c7b29b9896e6751ac665076317c3ee Author: Kyle M Hall Date: Wed Feb 15 16:24:57 2017 +0000 Bug 14826: Add offset for rental fees Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit c0aa6740d3c32a3cdf53e5d97405c260e4d74ac7 Author: Kyle M Hall Date: Thu Jul 21 18:32:05 2016 +0000 Bug 14826: Unit Tests Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 0dccc8ec5b2a4347cbc78e08aa905b79f1136787 Author: Kyle M Hall Date: Tue Jul 12 14:48:03 2016 +0000 Bug 14826: Resurrect account offsets table The account offsets table should be used to track increments and decrements of fines via payments and credits, as well as fine accruals. It should be able to match fees to payments and visa versa, so we can know which fee was paid by a given payment, and which payments applied to a given fee. Test Plan: 1) Apply this patch 2) Run updatedatabase 3) Note the table accountoffsets has been renamed to account_offsets 4) Ensure fine generation creates offsets 5) Ensure creating a manual invoice creates an offset 6) Ensure a lost item charge creates an offset 7) Ensure Reverse Payment creates an offset 8) Ensure a payment creates an offset 9) Ensure a payment for multiple fees creates an offset for each 10) Ensure writeoffs create offsets Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ca34994f23702ba4edeac7d7c5340c2bf7637d07 Author: Kyle M Hall Date: Tue Jul 12 14:13:04 2016 +0000 Bug 14826: Add Koha::Account::Offset(s) modules Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 49eb0395defb9b21ab89a26eafa9a879bcbb176b Author: Kyle M Hall Date: Tue Jul 12 13:50:11 2016 +0000 Bug 14826: Update database Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 399dcaa222c8e49da9aba8b6cac16928608f89ae Author: Owen Leonard Date: Mon Jan 9 16:31:19 2017 +0000 Bug 19356: Move staff client cart JavaScript to the footer This patch modifies the staff client cart template so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the cart: All button controls, DataTables functionality. Signed-off-by: Aleisha Amohia Correction for QA: Removed contditional around footer JS (from copy-paste) because it will always be true. Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit ef92ad31bffc80c308e9ed693b9de88391603b05 Author: Owen Leonard Date: Wed Sep 20 13:21:27 2017 +0000 Bug 19348: Title column in item search is too narrow This patch adds IDs to the item search results table header so that columns can be targeted by CSS or JS. The CSS for the item search page has been modified to give the title column a minimum width. To test, apply the patch and clear your browser cache if necessary. Perform an item search and confirm that the title column stays at a reasonable width. Signed-off-by: Dominic Pichette Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 9ad872dc88236cae539bb02ac0053a50fbf31684 Author: Jonathan Druart Date: Fri Oct 20 16:15:46 2017 -0300 Bug 16187: accept --verbose and -h Signed-off-by: Jonathan Druart commit 629598704a4ded9425293340bf5b9de8e347bd68 Author: Jonathan Druart Date: Fri Oct 20 16:04:04 2017 -0300 Bug 16187: Do not use DateTime directly Koha::DateUtils takes care of what you need Signed-off-by: Jonathan Druart commit f46d6a8785db490ec9067ba6964b5172e06ee848 Author: Marcel de Rooy Date: Fri Oct 20 08:11:38 2017 +0200 Bug 16187: (QA follow-up) Additional fixes Fix: Can't locate object method "next" via package "13" (perhaps you forgot to load "13"?) at misc/cronjobs/holds/cancel_unfilled_holds.pl line 119. Undefined subroutine &main::CancelReserve called at misc/cronjobs/holds/cancel_unfilled_holds.pl line 143. The script does not use Koha::Object's get_column correctly for getting the branch codes. The call to CancelReserve is obsolete. Was moved in the meantime to Koha::Hold->cancel. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0afe6eca76b3160fcdcddb9e376cf277d673acca Author: Nick Clemens Date: Thu Jul 14 06:46:15 2016 -0400 Bug 16187: Add a script to cancel unfilled holds after a specified number of days This script takes parameters: days - how many days waiting to concal an unfilled hold on or after library - (repeatable) branches to consider holidays - whether or not to count holidays (default is no) This patchset adds two methods and covers them with tests: Koha::Holds->unfilled(); To return holds where found = undef Koha::Hold->age( $use_calendar ); To return the number of days since a hold was placed (including or excluding holidays) To test: 1 - Place some holds with varying reservedates 2 - Run script with different parameters to verify options are respected (-v for verbosity will assist here) 3 - verify that script does nothing without days parameter Sponsored by: Siskiyou County Library (http://www.siskiyoulibrary.info/) Signed-off-by: Marcel de Rooy Bug 16187 - Followup 1 - Correct use of original (bad) script name 2 - Explain options better 3 - Remove change from 'W' to 'w' Signed-off-by: Marcel de Rooy RM note: Squashed for readability Signed-off-by: Jonathan Druart commit f0f3cb32889d6f0d64fb4965e8c00a3a1f31c6c9 Author: Jonathan Druart Date: Tue Oct 10 12:18:10 2017 -0300 Bug 18961: Use exact match for select filters on item search The SQL operator LIKE is always used for filters when searching for items. If the filter is a select, we should search for an exact match. That way we avoid problematic search like "%NFIC%" and "%FIC%" (one includes the other one). Test plan: - Make sure you have collection codes 'Fiction' and 'Non-fiction' - Do an item search - Filter column 'Collection', select 'Fiction' - Result: Column contains items from Fiction only Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7ed705ea458d47d199b8f3e20572397d4697516a Author: Eric Vantillard Date: Tue May 9 23:10:21 2017 +0200 Bug 18564: Improve koha-common.cnf parsing to pick the mysql host my koha-common.cnf is using this form: [client] host=db user=root password="move_rootpwd_to_dotenv" this file is working has expected with mysql tools. but koha-create parsing will not find the db host resulting in koha-conf.xml containing no values in hostname element. Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 850243ee2ec66a4b569d29ed84423f09c0001690 Author: Jonathan Druart Date: Fri Oct 20 15:56:20 2017 -0300 Bug 19487: Refetch the object to get up-to-date values This has been raised by failures on t/db_dependent/Circulation/issue.t (thanks tests!) Signed-off-by: Jonathan Druart commit 60bb936bc28b73f1653207cce36f432dec094017 Author: Jonathan Druart Date: Thu Oct 19 09:02:20 2017 -0300 Bug 19487: Fix MarkIssueReturned.t MarkIssueReturned must now return directly if the issue does not exist. We then check if the anonymous patron configuration is correct. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7b5c1fce5880f8592c5a9dbd40614a760bb2607e Author: Jonathan Druart Date: Wed Oct 18 13:59:56 2017 -0300 Bug 19487: Do not return an item if not checked out To recreate: 1 - Manually add a lost fine to a ptron and include a barcode 2 - Attempt to write off the fine 3 - Internal server error 4 - Checkout an item and mark lost to checkin and fine 5 - Attempt to write off line 6 - Internal server error Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 203 +++++++++-------- C4/Circulation.pm | 228 ++++++++++---------- C4/Installer.pm | 1 + C4/Overdues.pm | 18 +- Koha.pm | 2 +- Koha/Account.pm | 59 +++-- Koha/{CsvProfile.pm => Account/Offset.pm} | 10 +- Koha/{Acquisition/Orders.pm => Account/Offsets.pm} | 16 +- Koha/Hold.pm | 29 +++ Koha/Holds.pm | 14 +- .../{HouseboundVisit.pm => AccountOffset.pm} | 111 +++++----- Koha/Schema/Result/AccountOffsetType.pm | 74 +++++++ Koha/Schema/Result/Accountline.pm | 34 ++- Koha/Schema/Result/Borrower.pm | 19 +- Koha/Schema/Result/Itemtype.pm | 26 ++- admin/itemtypes.pl | 28 ++- catalogue/itemsearch.pl | 10 +- debian/scripts/koha-create | 7 +- installer/data/mysql/account_offset_types.sql | 11 + installer/data/mysql/kohastructure.sql | 36 +++- installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 74 +++++++ .../intranet-tmpl/prog/css/itemsearchform.css | 4 + koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 3 + .../prog/en/modules/admin/itemtypes.tt | 14 +- .../en/modules/admin/preferences/circulation.pref | 12 ++ .../intranet-tmpl/prog/en/modules/basket/basket.tt | 12 +- .../prog/en/modules/catalogue/itemsearch.tt | 26 +-- .../prog/en/modules/members/boraccount.tt | 1 + .../intranet-tmpl/prog/en/modules/members/pay.tt | 1 + .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 1 + misc/cronjobs/holds/cancel_unfilled_holds.pl | 147 +++++++++++++ misc/devel/populate_db.pl | 1 + t/db_dependent/Accounts.t | 156 +++++++++++++- t/db_dependent/Circulation.t | 155 ++++++++++++- t/db_dependent/Circulation/Chargelostitem.t | 72 +++++++ t/db_dependent/Circulation/MarkIssueReturned.t | 33 ++- .../Circulation/NoIssuesChargeGuarantees.t | 12 +- t/db_dependent/Circulation/issue.t | 4 +- t/db_dependent/Hold.t | 10 +- t/db_dependent/Holds.t | 3 +- 41 files changed, 1304 insertions(+), 375 deletions(-) copy Koha/{CsvProfile.pm => Account/Offset.pm} (80%) copy Koha/{Acquisition/Orders.pm => Account/Offsets.pm} (75%) copy Koha/Schema/Result/{HouseboundVisit.pm => AccountOffset.pm} (51%) create mode 100644 Koha/Schema/Result/AccountOffsetType.pm create mode 100644 installer/data/mysql/account_offset_types.sql create mode 100755 misc/cronjobs/holds/cancel_unfilled_holds.pl create mode 100644 t/db_dependent/Circulation/Chargelostitem.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Oct 20 23:20:59 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 20 Oct 2017 21:20:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-887-g99f7337 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 99f73373e2461c10c3933332b8981dd1a4b403e5 (commit) from d637acd08c11d694e04954592e7ac8d7c1ed8c13 (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 99f73373e2461c10c3933332b8981dd1a4b403e5 Author: Jonathan Druart Date: Fri Oct 20 18:14:06 2017 -0300 Bug 14826: account_offset_types.sql is not in the mandatory subdir Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Installer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 23 17:42:01 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 23 Oct 2017 15:42:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-891-g2085001 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 208500193ef23678793c00ca2a8da4c55dba9724 (commit) via 1ea5f9c82ac195c29ebeff2e534eedce54ae84ca (commit) via 276b0e2587953a28e9bca16c397b2b8227ab9c63 (commit) via f254997c54d68855e5c12156b021a20f20f4d01d (commit) from 99f73373e2461c10c3933332b8981dd1a4b403e5 (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 208500193ef23678793c00ca2a8da4c55dba9724 Author: Jonathan Druart Date: Mon Oct 23 12:34:25 2017 -0300 Bug 12768: DBRev 17.06.00.019 Signed-off-by: Jonathan Druart commit 1ea5f9c82ac195c29ebeff2e534eedce54ae84ca Author: Kyle M Hall Date: Mon Oct 23 11:01:25 2017 -0400 Bug 12768: (QA follow-up) Use specific account offset types for Processing Fee and Lost Item Signed-off-by: Jonathan Druart commit 276b0e2587953a28e9bca16c397b2b8227ab9c63 Author: Jonathan Druart Date: Mon Oct 23 12:05:04 2017 -0300 Bug 12768: Fix tests - itemtypes.rentalcharge is now decimal(28,6) Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit f254997c54d68855e5c12156b021a20f20f4d01d Author: Marcel de Rooy Date: Mon Oct 23 12:49:20 2017 +0200 Bug 14826: (QA follow-up) Remove obsolete DBIx schema file Removes Accountoffset.pm. Has been replaced by AccountOffset.pm on bug 14826. Test plan: Run TestBuilder.t. Should pass now again. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 7 +- Koha.pm | 2 +- Koha/Schema/Result/Accountoffset.pm | 106 ------------------------- installer/data/mysql/account_offset_types.sql | 1 + installer/data/mysql/updatedatabase.pl | 12 +++ t/db_dependent/Circulation/Chargelostitem.t | 9 ++- t/db_dependent/Koha/ItemTypes.t | 4 +- 7 files changed, 30 insertions(+), 111 deletions(-) delete mode 100644 Koha/Schema/Result/Accountoffset.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 23 19:48:16 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 23 Oct 2017 17:48:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-893-gc63d560 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 c63d560b041ab67bafc65a6f9e65eee9e43c2a1a (commit) via d37bf788936b43d942c44caa2e47fc39e5d0e2a1 (commit) from 208500193ef23678793c00ca2a8da4c55dba9724 (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 c63d560b041ab67bafc65a6f9e65eee9e43c2a1a Author: Kyle M Hall Date: Mon Oct 23 12:51:50 2017 -0400 Bug 12768: (QA follow-up) Don't use manualinvoice for non-manual invoices in chargelostitem Signed-off-by: Jonathan Druart commit d37bf788936b43d942c44caa2e47fc39e5d0e2a1 Author: Jonathan Druart Date: Mon Oct 23 13:19:42 2017 -0300 Bug 19517: Prevent dateexpiry.t to fail randomly If categorycode is 'X', the test will fail Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 75 ++++++++++++++++++++++++++++++- t/db_dependent/Circulation/dateexpiry.t | 24 ++++++++-- 2 files changed, 93 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 23 22:05:58 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 23 Oct 2017 20:05:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-894-g42c6347 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 42c634745cac4fc33a53bc1312a3e143a2e0ffbc (commit) from c63d560b041ab67bafc65a6f9e65eee9e43c2a1a (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 42c634745cac4fc33a53bc1312a3e143a2e0ffbc Author: Jonathan Druart Date: Mon Oct 23 16:59:11 2017 -0300 Bug 12768: Fix bad merge resolution conflict RM note: I have applied https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68427 on top of other patches that were already pushed. But it was supposed to replace them, this change revert what was in https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68417 Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 24 08:22:44 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 24 Oct 2017 06:22:44 +0000 Subject: [koha-commits] main Koha release repository branch 16.05.x updated. v16.05.17-71-g7c859a0 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, 16.05.x has been updated via 7c859a06957c205d28d9f11117d360bab6cf3780 (commit) via 6e746e038a80d438e1562ecdadccc895cc72956b (commit) via d5ac7d7d064358a94830563710f172dd528bee04 (commit) via a49e29d7f5719750136403ebb6abb29f31a3b71c (commit) via c0c699d0fb30ae72b6716a9e6e6edabbc583e034 (commit) via 4b5c19df302a9738f315166ce5b9f0fff7f8116b (commit) via 14e82ee30d0bbd24870d9e62c63a2968d15c0493 (commit) via b02a0af06e92d244aa65b7cc2b451b74fc02bc0f (commit) via 356047b920ddb96f587fea1631c64fbd6da8bc2d (commit) via cd397d30b3f4d9c93ee836bafec96927d154f91f (commit) via 0c9920bae163f8c700d0a6fced64dc433d7f19c2 (commit) via 7faad3cef92b5e75ec1cf2761f5168c4b64388c7 (commit) via 2af51f0b681cfc0e92f5360f4875b35f2f84aec7 (commit) via 04c7552ac5fdd9ffa1d367f076754c44dd7d8d51 (commit) via a47b8ca9ba8fafda5427e8ab3280cd1d67cfd5cd (commit) via 3d61ff3e5da5b8ce9fee7b7f1eb04189c7f83f24 (commit) via a832183e6cee084934b028ae46aec44e87c11eb7 (commit) via 0e17d3bb329eeb3bb9e31aecfeddf5366ddae1d5 (commit) via 01f6f3e57c3ebceb0555491a85c6804e8c7f7ec5 (commit) via d77faf51ff094e17b016c345ab5472f300498b09 (commit) via 2d6507a47ff7a7cb8518b0cb02848526bb558f07 (commit) via 13c461793281d8065ddc76e8aa5cff90dd061496 (commit) via 6bf4853fd862c4ee66ca9770bbe74d0bb933afe0 (commit) via 1301ba18a60f1bd26be64b70147caaff840131f6 (commit) via 39bb40f593da37e3f49fa906c3764cdeab589819 (commit) via 0fe65fd42a654ccccf04d1609303e236d4ffa2c3 (commit) via 182292e0a51e35fcff5433bd6d6c7c7b318d18b3 (commit) via 76fd41c9857e433206632ac0185aa03e4c6b5c31 (commit) via 3ebb4bd2e80f6bfd79c881fae2511645d1f80c11 (commit) via a1be3908f2b31605ea83831220edd9ee855e5ffc (commit) via b1aef2bd92729c5e120cbd350459b24a431a7f22 (commit) via 2ff6f63cd055f2edcc60a212a646a1a488bed443 (commit) via bf9fde7fa29369d0e0076280b27ac6f8afd089bd (commit) via ce21b3a9d95f538be592627fe88d4cd8525bcab7 (commit) via c4d30720d1874e270b71896647cd788fc87eaf27 (commit) via 478d7297df3587503caad48734215ad5ffcf9d36 (commit) via 708eff99dabb527b95a0b23fc2a71a1b513dd3ca (commit) via 1a750d873e5a2931080d47129b3c36890c61bbe8 (commit) via 0353dc2cec48d30640c1eac9bfc32c43e2a9d8dd (commit) via 4ff8245ed2b14b91e2a47b06606dcf5eb97c1b2e (commit) via a44af993d0aa32cc8852125afdfcc2fa12e2a274 (commit) via 51e9dac429d7947ec40b84bdd9da4704bd85e5ff (commit) via f26db1e56058f590a9128bd7324bfe5eaa1820e6 (commit) via b26323891a763ca1e5de4cfd276dd46c06af0bef (commit) via 9a6fae9a38f336ff590faf86cc0a89b356aee932 (commit) via 14de764e5e737d512f42c8a51ccf8aba7112a649 (commit) via 5bca22d7cf69d2cd1f351a9c2b276b74c242436d (commit) via 75b85ad02e91999d3bb0cdaf7c8e0f77d9baedae (commit) via c29db07813802fdafadd76a0db0aab1a83def15b (commit) via 930d54f3cc9fdb9a05b2e0c707bda1dece00360a (commit) via eabbc7f9de5d2aeba4b1c44baeafb9e2ecd9603e (commit) via b09bf03d4e324e63eb8336df7d7a5a9414c0231b (commit) via 4fc60a9afd8b00044e8a7d07b86186faea2bd6e3 (commit) via b335a3abac06e1c5eb86e5f4375ed9e9765adc80 (commit) via 9a79340b8f7697604707463c495f66fd52e3c544 (commit) via 3320e622572850d4d0e6170d33391499e9020781 (commit) via 7a9cef0b8a02cc6f5a9bca6cfc4326bf91475436 (commit) via b2b1ee07cf024bc57ec268fd5c0e9e2ac9544b31 (commit) via cb555851c644763bdd3c80676524b0c23fd79b3a (commit) via 5c6f4968e05bbf92d4794f559be3296533993841 (commit) via e3d4b94d67b5c325a3dcb25f555a6b3a4fd6cb48 (commit) via 23d2002d424e58bc39e04a415b4d9ecf487cbe88 (commit) via 68ac3ef2f39d37e88e128b885d2fb08600c7ddfa (commit) via f76cfe153d41096f678683eed51d7e57dca645ba (commit) via 8f20c30c3a9c8192c61cafbfe5117d7101d5932a (commit) via 2b06af4eb3589ec06f03fc916c55a4b749f288af (commit) via 12cb749e836efbcc10f37a23b14ffabe0fdc454a (commit) via f1e25582b51c6d7911ffd430e5e10bcae80963d3 (commit) via 9ce9b8db50c9701de650504bb147f656c251aacf (commit) via ba82664d6f75977e9d737882386f8decc7813b63 (commit) via 0b1d54a54409fc11a5f1db61fee68dda19fa3471 (commit) from 1210a897592f1e213bd49c5a08cd4e8f62973940 (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 7c859a06957c205d28d9f11117d360bab6cf3780 Author: Mason James Date: Tue Oct 24 16:19:54 2017 +1300 [16.05.x] Small fixes for various tests commit 6e746e038a80d438e1562ecdadccc895cc72956b Author: Fridolin Somers Date: Fri Sep 15 11:12:01 2017 +0200 Bug 19323: subscription edit permission issue If a librarian has edit_subscription but not create_subscription : When trying to edit a subscription, after saving permission is denied. This is because permissions in serials/subscription-add.pl depends on arg 'op' and on edit this arg starts with 'modify' but changes to 'modsubscription' when saving. Test plan : - Create a user with staff access - Define its permissions on serials : only edit_subscription - Edit a subscription - Click 'Next' - Click 'Test prediction pattern' - Click 'Save subscription' => Without patch you get to page serials/subscription-add.pl with permission denied => With patch subscription is saved and you get to subscription details page Signed-off-by: Caroline Cyr La Rose Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 12bd6358cfe6c9348cb111d22f04097f7911babf) Signed-off-by: Fridolin Somers (cherry picked from commit fe386c172496159198b34383c3080185de7ae0af) Signed-off-by: Katrin Fischer commit d5ac7d7d064358a94830563710f172dd528bee04 Author: Mark Tompsett Date: Fri Sep 1 21:23:20 2017 -0400 Bug 19120: Leave cancelled ordered items alone when reopening basket TEST PLAN --------- 1) Apply first patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS 3) Apply this patch 4) prove t/db_dependent/Acquisition/close_reopen_basket.t -- SUCCESS! 5) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Mason James commit a49e29d7f5719750136403ebb6abb29f31a3b71c Author: Mark Tompsett Date: Fri Sep 1 21:21:40 2017 -0400 Bug 19120: Add tests to reproduce the problem TEST PLAN --------- 1) apply this patch 2) prove t/db_dependent/Acquisition/close_reopen_basket.t -- FAILS! -- This proves the test works. 3) run koha qa test tools Followed test plan, patch worked as described Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Mason James commit c0c699d0fb30ae72b6716a9e6e6edabbc583e034 Author: Alex Arnaud Date: Fri Oct 6 07:19:15 2017 +0000 Bug 19418: (bug 12833 follow-up) Add missing use statement Patron search fail on calling svc/members/search. This script return a 500 error and the search stay on "Processing..." Test plan: - Enable ExtendedPatronAttributes system preference, - make a standard search (search fields), - check the search works and it doesn't stick on "Processing..." Signed-off-by: Jonathan Druart I do not recreate the issue, but the change make sense and the issue has been raised by several people (cherry picked from commit 9c208a44313ed1f4bd12f8c9d3b45c5f2d386c5b) Signed-off-by: Fridolin Somers (cherry picked from commit 2d04c80b37cb2f37f9709b8bcfc6b9a4e4eaaae9) Signed-off-by: Katrin Fischer commit 4b5c19df302a9738f315166ce5b9f0fff7f8116b Author: Jonathan Druart Date: Tue Oct 3 12:15:30 2017 -0300 Bug 19350: Add tests commit 14e82ee30d0bbd24870d9e62c63a2968d15c0493 Author: Dobrica Pavlinusic Date: Wed Sep 20 16:01:16 2017 +0200 Bug 19350 - Holds without link in 773 trigger SQL::Abstract::puke Test: 1. find bibio without items which has something in field 773 (for us, it's article) but doesn't have 0 or 9 (host item entry) 2. click on hold in left menu 3. verify application error 4. apply patch and verify that it works Signed-off-by: Josef Moravec Signed-off-by: Mason James commit b02a0af06e92d244aa65b7cc2b451b74fc02bc0f Author: Jonathan Druart Date: Mon Oct 9 15:57:46 2017 -0300 Bug 19440: Existing calls need to be done in scalar context Signed-off-by: Mason James commit 356047b920ddb96f587fea1631c64fbd6da8bc2d Author: Tomas Cohen Arazi Date: Mon Oct 9 15:36:41 2017 -0300 Bug 19440: Identify overlimit problems in XISBN tests This patch makes C4::XISBN::get_xisbns() return an errors hashref including information of the failing fetches from xisbn services. It tackles the situation of XISBN, which in some cases returns 'overlimit' errors. The patch makes the relevant functions check if the response->{stat} string is 'ok' and returns the string in $errors otherwise. This only happens when in list context. This allows to fix the randomly failing tests while keeping the current behaviour. All this code should be rewritten. It does the job bug doesn't have problems handling or reoprting. This is just a band aid. To test: - Make sure k$ prove t/db_dependent/XISBN.t => SUCCESS :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James commit cd397d30b3f4d9c93ee836bafec96927d154f91f Author: Christophe Croullebois Date: Wed Aug 23 07:57:30 2017 +0000 Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices Signed-off-by: Your Name commit 0c9920bae163f8c700d0a6fced64dc433d7f19c2 Author: Tomas Cohen Arazi Date: Mon Oct 9 16:20:49 2017 -0300 Bug 18996: (followup) Fix tests count [16.11.x] This patch fixes a wrong tests count introduced on merging. Signed-off-by: Tomas Cohen Arazi commit 7faad3cef92b5e75ec1cf2761f5168c4b64388c7 Author: Aleisha Amohia Date: Thu Mar 30 04:15:54 2017 +0000 Bug 18351: Able to delete budget with funds To test: 1) Create a budget, add a fund 2) Delete budget. Notice this is successful and triggers no warning message etc. 3) Go to Funds. Notice the funds appear as if they are not there 4) Go into mysql and view the aqbudgetperiods table - notice the funds are still there and are now inaccessible. 5) Apply patch 6) Create a budget, add a fund 7) Attempt to delete budget. Notice you can't click Delete button. Confirm number of funds in hover message is correct. 8) Delete fund 9) Confirm you can now delete budget. Sponsored-by: Catalyst IT Signed-off-by: Felix Hemme Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Some code fixes See Comment 5. Ready to test. Signed-off-by: Lee Jamison Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Code fix See comment 10. Ready for testing. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL This patch adds a check in the script for existing funds so that the budget cannot be deleted when forcing the URL and has other small fixes. Signed-off-by: Owen Leonard Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete Followed test plan and patch works as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 0ed469525fe16e36663c1f5266568beb5e27672d) Signed-off-by: Fridolin Somers (cherry picked from commit 2a9dc2e595d916e4fb94948871f665df06b7088b) Signed-off-by: Katrin Fischer commit 2af51f0b681cfc0e92f5360f4875b35f2f84aec7 Author: Aleisha Amohia Date: Tue Sep 5 21:16:05 2017 +0000 Bug 19257: Prevent warn when reopening a basket To test: 1) Go to Acquisitions, find a vendor and a basket (create if you don't have either) 2) Close the basket 3) View the basket and reopen it 4) Notice the warn 5) Apply the patch and repeat steps 1-3 6) Notice the warn no longer shows and the basket is reopened as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 6ed1513e5fe91772c1720963006bf8f04452416d) Signed-off-by: Fridolin Somers (cherry picked from commit f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5) Signed-off-by: Katrin Fischer commit 04c7552ac5fdd9ffa1d367f076754c44dd7d8d51 Author: Aleisha Amohia Date: Thu Aug 31 21:25:28 2017 +0000 Bug 19229: Return to course when cancelling out of edit form To test: 1) Ensure UseCourseReserves is enabled 2) Go to Course Reserves, create a course 3) Edit course 4) Click Cancel 5) Notice you are returned to the courses home page rather than returned to the course 6) Apply patch 7) Go to edit course and click cancel again 8) Confirm you are returned to the course and that this feels like the natural expectation. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit f55af2fc078a7d6a05238232bc276e6924307179) Signed-off-by: Fridolin Somers (cherry picked from commit ae405f61c8d4c04361267b500347a496a2ce7d58) Signed-off-by: Katrin Fischer commit a47b8ca9ba8fafda5427e8ab3280cd1d67cfd5cd Author: Jonathan Druart Date: Wed Sep 6 13:14:56 2017 -0300 Bug 17834: Make translation easier Signed-off-by: Mason James commit 3d61ff3e5da5b8ce9fee7b7f1eb04189c7f83f24 Author: Aleisha Amohia Date: Thu Apr 20 03:12:14 2017 +0000 Bug 17834: Change library news text for single-branch libraries To test: 1) Log into OPAC, go to home page 2) Confirm that the text shows as 'RSS feed for (branchname) library news' if single-branch library 3) Confirm text shows as normal for libraries with more than one branch Sponsored-by: Catalyst IT Signed-off-by: maricris Signed-off-by: anafe Signed-off-by: iflora Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit a832183e6cee084934b028ae46aec44e87c11eb7 Author: Marcel de Rooy Date: Tue Oct 3 16:01:15 2017 +0200 Bug 19343: [16.11.X] Remove private lists with edit permission from search results If the list is not shared, it should not be listed. We only need to remove the allow_add line. Signed-off-by: Jonathan Druart Conflicts: Koha/Virtualshelves.pm commit 0e17d3bb329eeb3bb9e31aecfeddf5366ddae1d5 Author: Jonathan Druart Date: Tue Oct 3 11:45:45 2017 -0300 Bug 19343: [16.11.X] Add tests Conflicts: t/db_dependent/Virtualshelves.t commit 01f6f3e57c3ebceb0555491a85c6804e8c7f7ec5 Author: Katrin Fischer Date: Sat Aug 19 10:22:44 2017 +0200 Bug 14316: Clarify meaning of record number in Batch record modification tool Same change as the first patch, but for the batch record modification tool. Signed-off-by: Marc V?ron Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit d77faf51ff094e17b016c345ab5472f300498b09 Author: Katrin Fischer Date: Mon Jun 8 02:03:34 2015 +0200 Bug 14316: Clarify meaning of record number in Batch record deletion tool Changes the label from 'list of record numbers...' to 'List of biblionumbers or authority ids...' to make it more clear to the user which kind of input is expected. To test: - Go to Tools > Batch record deletion - Check the new description - Decide if it's more clear or not Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit 2d6507a47ff7a7cb8518b0cb02848526bb558f07 Author: Kyle M Hall Date: Fri Sep 1 08:41:51 2017 -0400 Bug 18946 [QA Followup] - code cleanup Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit 13c461793281d8065ddc76e8aa5cff90dd061496 Author: Karam Qubsi Date: Wed Jul 19 00:06:48 2017 +0800 Bug 18946 - Change language from external web fails How to reproduce: 1. Get a multiling?al Koha like http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=en http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=es-ES 2. Copy that urls to any web page in an other domain -it must be in some host - and try to link to the spanish or english version,it will keep you in the same position. 3. Apply this patch and try again , everything should work fine . Signed-off-by: Hugo Agud Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit 6bf4853fd862c4ee66ca9770bbe74d0bb933afe0 Author: Lari Taskula Date: Wed May 31 17:03:54 2017 +0300 Bug 18692 - intranet part Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intranet messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Mason James commit 1301ba18a60f1bd26be64b70147caaff840131f6 Author: Fridolin Somers Date: Thu Jun 1 17:22:42 2017 +0200 Bug 18692 - same with syspref TalkingTechItivaPhone Fixes misplaced columns introduced by previous patch and adds the "-" for phone transport type. To test: 1. Set SMSSendDriver system preference on 2. Go to intra and OPAC messaging preferences 3. By default you should see checkboxes for all messages for SMS 4. Ensure columns are not misplaced (pushing one column too much to the right) 5. Delete sms method from one of the messages in message_transports table 6. Observe that "-" is displayed instead of checkbox for that message for SMS 7. Repeat same for TalkingTechItivaPhoneNotification system preference. By default it may not have transports in message_transports, so make sure to assign some in order to have the checkboxes visible. https://bugs.koha-community.org/show_bug.cgi?id=8692 Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Mason James commit 39bb40f593da37e3f49fa906c3764cdeab589819 Author: Fridolin Somers Date: Mon May 29 16:32:18 2017 +0200 Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned Bug 6726 had corrected the fact that when SMS is enabled the messaging table is missing a column. Bug 6458 has broken this. The SMS column is missing an else case with cell containing only "-" like other columns. Test plan : - set SMSSendDriver preference empty - go to OPAC patron messaging - column SMS should not be visible - set SMSSendDriver preference not empty - go to OPAC patron messaging - column SMS appears with checkboxes Signed-off-by: Michael Andrew Cabus Signed-off-by: Nick Clemens Signed-off-by: Mason James commit 0fe65fd42a654ccccf04d1609303e236d4ffa2c3 Author: Marc V?ron Date: Wed Aug 9 09:46:02 2017 +0200 Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields This patch adds a note to the system preferences autonembernum and BorrowerMandatoryFields regarding a conflict if automembernum is on and BorrowerMandatoryFields contains cardnumber. To reproduce issue: See initial comment. To test: - Apply patch - Verify that in system preferences note appears with both prefs automembernum and BorrowerMandatoryFields Followed test plan, works as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 65bce82b1fb32d3d98fe4d4ef1e1738a97749632) Signed-off-by: Fridolin Somers (cherry picked from commit 07695e8de40c55f2837ae81b5e35b8e11656f272) Signed-off-by: Katrin Fischer commit 182292e0a51e35fcff5433bd6d6c7c7b318d18b3 Author: Marc V?ron Date: Tue Jun 27 18:50:44 2017 +0200 Bug 16485: collection column in Item search is always empty This patch fills the column 'Collection' in item search from the item values. To test: - Go to item search - Reproduce issue from initial comment - Apply patch - Verify that the column 'Collection' is filled Still to do, but outside of my datatable skills: Filter by drop down in the column header does a substring search. Example: Filter for 'Fiction" returns both 'Fiction' and 'Non-fiction' items. Signed-off-by: Owen Leonard Signed-off-by: Laurence Rault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5) Signed-off-by: Fridolin Somers (cherry picked from commit 74752502b309ddec4311a4311a3481bf54061187) Signed-off-by: Katrin Fischer commit 76fd41c9857e433206632ac0185aa03e4c6b5c31 Author: Colin Campbell Date: Wed Aug 2 17:12:44 2017 +0100 Bug 19024 Do not unset order cancelled status on basket close On closing a basket, status is updated to ordered for orders not completed. However the operation was resetting the status for cancelled as well as new orders. While display is correct from the basket view (it checks the cancellation date). The status in the acquisitions tab from the catalogue view reverts erroneously to ordered. This patch adds cancelled to the statuses not updated on basket close. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit 3ebb4bd2e80f6bfd79c881fae2511645d1f80c11 Author: Colin Campbell Date: Tue Aug 15 11:44:12 2017 +0100 Bug 19024 Fix some infelicities of phrasing in test messages The test messages were awkwardly phrased, re phrase them to sound more natuaral. Patch is cosmetic (grammar) only Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit a1be3908f2b31605ea83831220edd9ee855e5ffc Author: Jonathan Druart Date: Wed Aug 9 16:09:32 2017 -0300 Bug 19024: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit b1aef2bd92729c5e120cbd350459b24a431a7f22 Author: Jonathan Druart Date: Fri Sep 1 16:20:18 2017 -0300 Bug 9857: Fix failing tests Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit 2ff6f63cd055f2edcc60a212a646a1a488bed443 Author: Jonathan Druart Date: Fri Sep 1 16:20:18 2017 -0300 Bug 9857: Fix failing test Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit bf9fde7fa29369d0e0076280b27ac6f8afd089bd Author: Katrin Fischer Date: Fri Aug 18 08:36:59 2017 +0000 Bug 9857 - Follow-up - Fix for searches with su= or su: When the initial search is su=.../su:... the links was not constructed correctly. With this change, it should be the case. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit ce21b3a9d95f538be592627fe88d4cd8525bcab7 Author: Katrin Fischer Date: Fri Dec 4 01:17:50 2015 +0100 Bug 9857: Did you mean? uses wrong punctuation in search links The link changes the search links generated by the plugins from an=authid to an:authid, as suggested by Jared on the bug report. - Turn on the AuthorityFile und ExplodedTerms plugins for the OPAC from the "Did you mean" section of the administration module - Search a term in your OPAC where one or several authorities exist. A last name or a place name might work well. - Verify that there are suggestions displayed on top of your result list. - Verify that the link created is something like: /cgi-bin/koha/opac-search.pl?q=an=14084 - Apply patch. - Verify the link has changed a little and still works correctly: /cgi-bin/koha/opac-search.pl?q=an:14084 Signed-off-by: Fr?d?ric Demians Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Mason James commit c4d30720d1874e270b71896647cd788fc87eaf27 Author: Alex Buckley Date: Wed Jul 12 10:09:48 2017 +1200 Bug 18621: Added in value attribute to dateexpiry field Test plan: 1. Create a patron category with the dateexpiry value of 29/9/2017 2. Create a patron user from that patron category (which I'll refer to as patron A) with the date expiry value of 1/10/2017 and submit the form 3. Notice that the manual dateexpiry you have submitted is correctly displayed 4. Create a duplicate patron with the same firstname and surname and patron A, and set the date expiry value of 1/10/2017 and submit the form 5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now 6. Select the new member (not a duplicate member) option in the messagebox 7. The form successfully submits and notice that the date expiry value displayed is that of the patron category (i.e. it is 29/9/2017) not the dateexpiry value of 1/10/2017 that you manually set for this patron 8. Apply patch 9. Repeat step 4 10. The form displays a duplicate patron message. Notice the dateexpiry input box still contains the value you entered which is 1/10/2017. Select the new member (not a duplicate member) option in the messagebox 11. The form successfully submits and notice that the date expiry value displayed is 1/10/2017 that you manually set for this patron Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 515e62992893b72c54a34311088a9442a37d8138) Signed-off-by: Fridolin Somers (cherry picked from commit 60b6d736ee306198af83e1a1482ff89280a05e7b) Signed-off-by: Katrin Fischer commit 478d7297df3587503caad48734215ad5ffcf9d36 Author: Nick Clemens Date: Thu Jun 15 11:07:03 2017 -0400 Bug 18812 - SIP Patron status does not respect OverduesBlockCirc To test: 1 - Set 'OverduesBlockCirc' to block 2 - Find or create a patron with overdues 3 - Perform a SIP patron lookup on that patron misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron {userid or cardnumber} --password {pass} -m patron_information 4 - Note the first character of response is a ' ' 5 - Apply patch 6 - Restart memcached, apache, and plack 7 - Perform SIP patron lookup 8 - Note the first character of response is 'Y' 9 - prove t/db_dependent/SIP/Patron.t 10 - Test should return green Signed-off-by: Chris Kirby Works as advertised Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ff4f0858950c37eeede38b2f067841602b97d7ba) Signed-off-by: Fridolin Somers (cherry picked from commit 4b360f1371a56268458b62e5c8c68da853b4e52d) Signed-off-by: Katrin Fischer commit 708eff99dabb527b95a0b23fc2a71a1b513dd3ca Author: Kyle M Hall Date: Mon Jul 31 09:18:15 2017 -0400 Bug 19007 - Allow paypal payments via debit or credit card again A recent change in Paypal has removed the previous default option of paying via debit or credit card without an account. To bring this option back, we need to send an additional parameter to the PayPal API. Test Plan: 1) Enable paypal for your Koha instance 2) Ensure you are not logged in to PayPal 3) Attempt to pay a fine via PayPal 4) Not the the "Pay with Debit or Credit Card" option is missing 5) Apply this patch 6) Refresh opac-account.pl 7) Attempt to make a payment via PayPal again 8) Note the option "Pay with Debit or Credit Card" is now available Signed-off-by: Kyle M Hall Signed-off-by: George Williams Signed-off-by: Julian Maurice Signed-off-by: Mason James commit 1a750d873e5a2931080d47129b3c36890c61bbe8 Author: Nick Clemens Date: Fri Feb 26 14:46:45 2016 +0000 Bug 15924 - Coce not enabled on lists To test: Enable Coce and disable other image services Load a list and not there are no covers Apply patch Load a list and note there are covers https://bugs.koha-community.org/show_bug.cgi?id=15924 Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 85b963d11fb5d8674ca6b0ec60821663f9d8cf19) Signed-off-by: Fridolin Somers (cherry picked from commit 669b6839eab456f36ed7c65a7a97fa7b386ab4e6) Signed-off-by: Katrin Fischer commit 0353dc2cec48d30640c1eac9bfc32c43e2a9d8dd Author: Jonathan Druart Date: Mon Sep 18 14:23:54 2017 -0300 Bug 19335: Fix 00-merge-conflict-markers.t when dockerised This does not make sense, but fix a bug (why?) Without this patch, the tests failed on po files: [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests Test Summary Report ------------------- t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0) Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. Result: FAIL Note that this is not related to bug 19227. if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail As saw it failed on *-pref.po files misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 0d03f143e25f498de780d2ddd1972c3be7947519) Signed-off-by: Fridolin Somers (cherry picked from commit bdfec37ab66f9c72f86adc7d6045bc83b5a92d88) Signed-off-by: Katrin Fischer commit 4ff8245ed2b14b91e2a47b06606dcf5eb97c1b2e Author: Jonathan Druart Date: Thu Aug 31 11:47:11 2017 -0300 Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t The number of tests on jenkins is sometimes confusing: https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/ shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than the previous run. However 124 files have not been removed from the codebase! I suggest to count only 1 test for all files. Moreover files from blib and cover_db are counted, they should be excluded. Test plan: prove t/00-merge-conflict-markers.t must return green echo ">>>>>>>" >> mainpage.pl and run the test again It should now fail Signed-off-by: Magnus Enger Works as advertised. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James commit a44af993d0aa32cc8852125afdfcc2fa12e2a274 Author: Jonathan Druart Date: Thu Oct 5 17:42:21 2017 -0300 Bug 18794: Fix test ListMetadataFormats in OAI/Server.t This test may fail on slow servers, it compares the response date with 'now', but both can differ a bit. https://jenkins.koha-community.org/job/Koha_Master_D8/198/consoleFull Failed test 'ListMetadataFormats' at t/db_dependent/OAI/Server.t line 150. Structures begin differing at: $got->{responseDate} = '2017-06-12T14:31:51Z' $expected->{responseDate} = '2017-06-12T14:31:50Z' commit 51e9dac429d7947ec40b84bdd9da4704bd85e5ff Author: Aleisha Amohia Date: Wed Jun 28 00:40:00 2017 +0000 Bug 18871: Make patron list name a link to view contents of list The link is the same as the 'Add patrons' button in Actions dropdown, but requires one less click, and makes finding the contents of the list more obvious. To test: 1) Go to Tools -> Patron lists 2) Create a patron list if you haven't already 3) Confirm that clicking the name of the list takes you to the correct list and shows the expected content. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart (cherry picked from commit d51059807690797aa4d16b0c0dd2932235a3b683) Signed-off-by: Fridolin Somers (cherry picked from commit e570915729b6b8e02e22b0cfdff4440b75815d26) Signed-off-by: Katrin Fischer commit f26db1e56058f590a9128bd7324bfe5eaa1820e6 Author: Marc V?ron Date: Mon Jun 12 09:07:28 2017 +0200 Bug 18781: Translatability: Get rid of exposed tt directives in openlibrary-readapi.inc The file koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc exposes template directives to translation. The only string that should appear in .po from this file is "Open Library: " To test: - Apply patch - Verify that code changes make sense - Bonus test: create a new language 'aa-AA', verify in aa-AA-opac-bootstrap.po that there is only the following string for openlibrary-readapi.inc: msgid "Open Library: " msgstr "" NOTE: Followed a test plan similar to bug 18776 comment 3 Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 23cc8b39682fea7b0a9150933c65c34ef22d23dd) Signed-off-by: Fridolin Somers (cherry picked from commit 861fa8c8db8bd8bbd6281863d5029d55675f359c) Signed-off-by: Katrin Fischer commit b26323891a763ca1e5de4cfd276dd46c06af0bef Author: Marc V?ron Date: Mon Jun 12 08:41:41 2017 +0200 Bug 18780: Translatability: Get rid of exposed tt directive in masthead-langmenu.inc The file opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc exposes following tt directive to translators: "[%% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && " "( languages_loop ) && ( OpacLangSelectorMode == 'both' || " "OpacLangSelectorMode == 'top') ) %%] " This patch fixes it. To test: - Apply patch - Verify that language selector in OPAC (top of the page) works as expected - Bonus test: create a new language 'aa-AA', verify that line above does not show up in aa-AA-opac-bootstrap.po NOTE: Followed a test plan similar to bug 18776 comment 3 Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 255cadeb772d63b06f77146c95b8d6e4b31d5836) Signed-off-by: Fridolin Somers (cherry picked from commit e0adbc10c09c25310f79fec55518fb5df50ad040) Signed-off-by: Katrin Fischer commit 9a6fae9a38f336ff590faf86cc0a89b356aee932 Author: Marc V?ron Date: Mon Jun 12 08:20:56 2017 +0200 Bug 18779: Translatability: Get rid of exposed tt directives in authorities-search-results.inc (OPAC) The file opac-tmpl/bootstrap/en/includes/authorities-search-results.inc exposes template directives to translation where translators should not be confronted with. Example: "[%% PROCESS showreference heading=seeals.heading linkType='seealso' " "type=seeals.type authid=seeals.authid %%] " To test: - Apply patch - Verify that Authority search in OPAC works as before - Bonus test: create a new language 'aa-AA', verify that line above does not show up in aa-AA-opac-bootstrap.po Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart (cherry picked from commit 331320f93a5ef5293c3bcad80b9554ddea0196b0) Signed-off-by: Fridolin Somers (cherry picked from commit 4dc640244651c584347b01f35f2cb25b6369a638) Signed-off-by: Katrin Fischer commit 14de764e5e737d512f42c8a51ccf8aba7112a649 Author: Marc V?ron Date: Sun Jun 11 16:54:28 2017 +0200 Bug 18776: Translatability: Get rid of exposed tt directives in opac-advsearch.tt The file opac-advsearch.tt exposes template directives to translation where translators should not be confronted with. Example in po file: "[%% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype')." "size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and " "OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) " "%%] " To test: - Apply patch - Verify that advanced search in OPAC behaves as before - Create a new translation for a 'language' aa-AA (perl translate create aa-AA) - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit ae684fc9491102ba0b560ca6f414a325e763b31a) Signed-off-by: Fridolin Somers (cherry picked from commit b1bce06e515e22482ca555b85da19f965b475f5f) Signed-off-by: Katrin Fischer commit 5bca22d7cf69d2cd1f351a9c2b276b74c242436d Author: Marcel de Rooy Date: Fri Aug 4 16:44:51 2017 +0200 Bug 18754: [QA Follow-up] Tiny corrections Converted one INCLUDE directive to PROCESS; we are not changing variables here. (The PROCESS directive is slightly faster than INCLUDE because it avoids the need to localise (i.e. copy) the variable stash before processing the template.) Removed one vim inserted letter i. Error in [% IF ( XISBN.publicationyear ) _ ', ' _ XISBN.publicationyear %][% END %] The concatenation became part of the condition. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128) Signed-off-by: Fridolin Somers (cherry picked from commit 78e527129b0b547eff7311c3f25a4b1f679d2a97) Signed-off-by: Katrin Fischer commit 75b85ad02e91999d3bb0cdaf7c8e0f77d9baedae Author: Marc V?ron Date: Fri Jun 9 15:43:36 2017 +0200 Bug 18754: Translatability: Get rid of exposed tt directives in opac-detail.tt The file opac-detail.tt exposes a lot of template directives to translation where translators should not be confronted with. Some examples from po file are: $[% SUBFIELD.code %] [% SUBFIELD.value %] %s [%% INCLUDE \"openlibrary-readapi.inc\" bib = { normalized_isbn => " "normalized_isbn, lccn => lccn, normalized_oclc => normalized_oclc } %%] See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END " "%] To test: - Apply patch - Do a search in OPAC that has more than 1 results - Go to the detail page of one of the items found - Verify that the details display as before and that you can browse the results with Previous and Next - In staff client, change OPACXSLTDetailsDisplay from 'default' to empty for "no xslt" and repeat steps above - In staff client, set HTML5MediaEnabled to 'OPAC' or 'OPAC and staff client' - Verify that media catalogued in field 856 still work - Create a new translation for a 'language' aa-AA (perl translate create aa-AA) - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po Followed test plan which works as intended Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 752aef4593f1aa2d64700bf9738e7e03907eb1cd) Signed-off-by: Fridolin Somers (cherry picked from commit 65e09b28dbbe43772b9104ffcafa1f81441c4d70) Signed-off-by: Katrin Fischer commit c29db07813802fdafadd76a0db0aab1a83def15b Author: Marc V?ron Date: Sun May 28 09:34:21 2017 +0200 Bug 18687: Translatability: abbr tag should not contain lang attribute In manage-marc-import.tt, we have an abbreviation: Diff In translations (e.g. German), the line appears as follows: Diff The lang attribute is wrong here, it is still "en". The text language is the same as defined at the top of the page - or with other words, the lang tag is superfluous. This patch removes it. To test: Verify that code change makes sense. Passes QA test and the change is logical Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart (cherry picked from commit 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb) Signed-off-by: Fridolin Somers (cherry picked from commit 9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153) Signed-off-by: Katrin Fischer commit 930d54f3cc9fdb9a05b2e0c707bda1dece00360a Author: Lee Jamison Date: Fri Aug 11 18:58:53 2017 +0000 Bug 19088: plugins-upload causes error log noise After uploading a plugin the error log indicates use of uninitialized value in $op. This patch silences the noise. To test: 1) Set to 1 (one) in koha-conf.xml. 2) Set the UseKohaPlugins system preference to 'Enable'. 3) Navigate to Administration -> Manage plugins. 4) Install the test plugin KPZ file attached to this bug. 5) Notice the uninitialized value noise in the error log. 6) Uninstall the plugin (plack restart may be required if plack is enabled). 7) Apply patch. 8) Install the plugin again. 9) Notice no noise in the error log. 10) Run qa tools. 11) Run prove t/db_dependent/Plugins.t Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart (cherry picked from commit 1076a0edf32b621da54c53ea71595885f7e14c38) Signed-off-by: Fridolin Somers (cherry picked from commit cdcc0458b796aff59a50e0f5d4c7b7140682eacf) Signed-off-by: Katrin Fischer commit eabbc7f9de5d2aeba4b1c44baeafb9e2ecd9603e Author: Amit Gupta Date: Tue Aug 15 22:21:37 2017 +0530 Bug 19118 - Due to wrong variable name passed vendor name is not coming in browser title bar Test 1. Hit the page /cgi-bin/koha/acqui/supplier.pl?booksellerid=xx xx is a booksellerid 2. Apply the patch and reload the page. 3. You can see vendor name in browser title bar. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit b09bf03d4e324e63eb8336df7d7a5a9414c0231b Author: Marcel de Rooy Date: Wed Aug 16 13:15:19 2017 +0200 Bug 19126: Fix Members.t with IndependentBranches set If you enabled that pref, Members.t fails with: t/db_dependent/Members.t .. 63/63 # Looks like you failed 15 tests of 63. The first one is: t/db_dependent/Members.t .. 32/63 Failed test 'Staff patron not deleted from list' at t/db_dependent/Members.t line 304. Bottle neck is GetBorrowersToExpunge. The results of that sub depend on the state of this preference. Trivially fixing it here by disabling the pref before the first call. Test plan: [1] Do not apply this patch yet. Enable IndependentBranches. [2] Run Members.t and observe that it fails. [3] Apply this patch. And run Members.t again. It should pass now. Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit 4fc60a9afd8b00044e8a7d07b86186faea2bd6e3 Author: Tomas Cohen Arazi Date: Fri Aug 11 15:09:00 2017 -0300 Bug 9409: (QA followup) Add --dbhost help to koha-create man page Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James commit b335a3abac06e1c5eb86e5f4375ed9e9765adc80 Author: Mark Tompsett Date: Fri Jun 23 01:46:50 2017 +0000 Bug 9409: Add --dbhost parameter and dbhost field This allows setting the remote db host correctly for request-db either with a command-line or passwd file. Signed-off-by: Lee Jamison Signed-off-by: Nick Clemens Signed-off-by: Mason James commit 9a79340b8f7697604707463c495f66fd52e3c544 Author: Nick Clemens Date: Fri Jul 7 11:25:24 2017 +0000 Bug 18469: QA Follow-up Restore datepicker class Use Koha.Preference Copy changes to moremember Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9) Signed-off-by: Fridolin Somers (cherry picked from commit c26108afa776b9de93ebe7c334c0eeff8ea2ed98) Signed-off-by: Katrin Fischer commit 3320e622572850d4d0e6170d33391499e9020781 Author: Nick Clemens Date: Fri Apr 21 10:08:27 2017 -0400 Bug 18469: Suspend all holds when specifying a date to resume hold does not keep date Name of field had 'datepicker' embedded, this caused variable issue To test: 1 - Place several holds for a patron 2 - Go to holds tab in circulation 3 - Select a date for suspend all holds until 4 - Suspend all holds 5 - Note date is not used, suspended indefinitely 6 - Apply patch 7 - Resume all suspended holds 8 - Select a date for suspend all holds until 9 - Suspend all holds 10 - Note date is used Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91) Signed-off-by: Fridolin Somers (cherry picked from commit fec723524cbd972b4788f34e105908697c43ea01) Signed-off-by: Katrin Fischer commit 7a9cef0b8a02cc6f5a9bca6cfc4326bf91475436 Author: Marc V?ron Date: Wed Aug 2 18:01:06 2017 +0200 Bug 19027 - Circulation rules: Better wording for standard rules for all libraries In Home > Administration > Circulation and fine rules, the standard value for "Select a library: All libraries" is confusing and leads to support cases. Change wording to "Standard rules for all libraries". To test: - Apply patch - Go to Home > Administration > Circulation and fine rules - Verfiy that text in drop down 'Select a library' makes sense. Followed test plan which works as intended. I agree with the wording it is significantly clearer than previously Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit b2b1ee07cf024bc57ec268fd5c0e9e2ac9544b31 Author: Nick Clemens Date: Fri Jul 14 11:25:42 2017 +0000 Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets To test: 1 - Create an active budget 2 - Create an inactive budget 3 - Ensure they each have a fund with the same code 4 - Set MarcFieldsToOrder to get the budget_code from a marc field 5 - Stage a file using the duplicated code 6 - Add to a basket from the staged file 7 - Add the items 8 - Note funds are encumbered from the inactive budget 9 - Apply patch 10 - Repeat 5-8 with a new basket 11 - Note the active budget is now used Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit cb555851c644763bdd3c80676524b0c23fd79b3a Author: Nick Clemens Date: Fri Jul 14 11:06:16 2017 +0000 Bug 18941 - Unit tests Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit 5c6f4968e05bbf92d4794f559be3296533993841 Author: Marcel de Rooy Date: Thu Aug 10 09:24:08 2017 +0200 Bug 19071: Fix Members/IssueSlip.t Resolve: DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Members/IssueSlip.t line 44. We do not need to delete all branches here. Note: The test still needs attention for noisy userenv warns, but it should pass now. Test plan: Run t/db_dependent/Members/IssueSlip.t Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit e3d4b94d67b5c325a3dcb25f555a6b3a4fd6cb48 Author: Marcel de Rooy Date: Thu Aug 10 09:13:44 2017 +0200 Bug 19071: Fix Circulation/issue.t Resolve: DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/issue.t line 65. Cause: See also bug 19070. We do not need to delete all branches here. Test plan: Run t/db_dependent/Circulation/issue.t Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit 23d2002d424e58bc39e04a415b4d9ecf487cbe88 Author: Jonathan Druart Date: Thu Aug 10 15:06:39 2017 -0300 Bug 19047: Fix AddBiblio call in ShelfBrowser.t Signed-off-by: Jonathan Druart commit 68ac3ef2f39d37e88e128b885d2fb08600c7ddfa Author: Marcel de Rooy Date: Mon Aug 7 08:44:43 2017 +0200 Bug 19047: Fix AddBiblio call in Reserves.t AddBiblio does not return a title; the biblioitemnumber is stored in the title variable. The variables for biblioitemnumber are not used and can be removed. Test plan: Run t/db_dependent/Reserves.t Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Mason James commit f76cfe153d41096f678683eed51d7e57dca645ba Author: Tomas Cohen Arazi Date: Mon Aug 7 11:04:51 2017 -0300 Bug 19013: (QA followup) Set guarantorid to NULL patron sample data Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James commit 8f20c30c3a9c8192c61cafbfe5117d7101d5932a Author: Jonathan Druart Date: Mon Jul 31 16:12:16 2017 -0300 Bug 19013: Fix borrowers.guarantorid in sammple_patrons.sql That breaks randomly tests on Jenkins (Koha/Patrons.t) It certainly affects data in other languages but I did not find a quick and easy way to modify this file (replace all guarantorid values with NULL) Signed-off-by: Tomas Cohen Arazi Easy fix Signed-off-by: Mason James commit 2b06af4eb3589ec06f03fc916c55a4b749f288af Author: Jonathan Druart Date: Wed Oct 11 10:50:18 2017 -0300 Bug 19441: Remove ES-related tests 16.05.x do not provided stable ES support, it will take us too much time to keep these tests up-to-date. Signed-off-by: Mason James commit 12cb749e836efbcc10f37a23b14ffabe0fdc454a Author: Jonathan Druart Date: Mon Oct 9 18:32:18 2017 -0300 Bug 19441: Fix t/db_dependent/Biblio/TransformKohaToMarc.t Koha::Caches and Koha::MarcSubfieldStructures do not exist in 16.05.x Signed-off-by: Mason James commit f1e25582b51c6d7911ffd430e5e10bcae80963d3 Author: Jonathan Druart Date: Mon Oct 9 18:27:23 2017 -0300 Bug 19441: Fix t/db_dependent/Biblio/Isbd.t Signed-off-by: Mason James commit 9ce9b8db50c9701de650504bb147f656c251aacf Author: Jonathan Druart Date: Mon Oct 9 18:25:36 2017 -0300 Bug 19441: Fix AutomaticItemModificationByAge.t Koha::Caches does not exist in 16.05.x Signed-off-by: Mason James commit ba82664d6f75977e9d737882386f8decc7813b63 Author: Jonathan Druart Date: Mon Oct 9 18:23:58 2017 -0300 Bug 19441: Fix AuthorisedValues.t Koha::AuthorisedValueCategor[y|ies] do not exist in 16.05.x Signed-off-by: Mason James commit 0b1d54a54409fc11a5f1db61fee68dda19fa3471 Author: Jonathan Druart Date: Mon Oct 9 18:21:03 2017 -0300 Bug 19441: Fix xt/sample_notices.t fr-CA is not up-to-date: - RESERVESLIP have been renamed with HOLD_SLIP - PASSWORD_RESET and MEMBERSHIP_EXPIRY are not defined Signed-off-by: Mason James ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 8 +- C4/Budgets.pm | 5 +- C4/Items.pm | 7 ++ C4/SIP/ILS/Patron.pm | 3 +- C4/Utils/DataTables/Members.pm | 1 + C4/XISBN.pm | 11 +- Koha/SuggestionEngine/Plugin/AuthorityFile.pm | 5 +- Koha/SuggestionEngine/Plugin/ExplodedTerms.pm | 7 +- Koha/Virtualshelves.pm | 38 +++++++ acqui/addorderiso2709.pl | 1 + acqui/basket.pl | 2 +- admin/aqbudgetperiods.pl | 30 ++++-- catalogue/detail.pl | 2 +- circ/circulation.pl | 2 - debian/docs/koha-create.xml | 10 +- debian/scripts/koha-create | 18 +++- .../data/mysql/de-DE/optional/sample_patrons.sql | 24 ++--- .../data/mysql/en/optional/sample_patrons.sql | 24 ++--- .../data/mysql/es-ES/optional/sample_patrons.sql | 24 ++--- .../mysql/fr-CA/obligatoire/sample_notices.sql | 6 +- .../mysql/nb-NO/2-Valgfritt/sample_patrons.sql | 24 ++--- .../data/mysql/pl-PL/optional/sample_patrons.sql | 24 ++--- .../en/includes/catalogue/itemsearch_item.json.inc | 3 +- .../prog/en/includes/messaging-preference-form.inc | 20 +++- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 40 +++++--- .../prog/en/modules/admin/preferences/patrons.pref | 2 + .../prog/en/modules/admin/smart-rules.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 4 +- .../prog/en/modules/circ/circulation.tt | 6 +- .../prog/en/modules/course_reserves/course.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember.tt | 6 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../en/includes/authorities-search-results.inc | 28 ++---- .../bootstrap/en/includes/masthead-langmenu.inc | 8 +- .../bootstrap/en/includes/openlibrary-readapi.inc | 10 +- .../bootstrap/en/modules/opac-advsearch.tt | 24 ++--- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 83 ++++++++------- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 14 ++- .../bootstrap/en/modules/opac-messaging.tt | 10 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 20 +++- members/moremember.pl | 2 - opac/opac-account-pay.pl | 1 + opac/opac-changelanguage.pl | 14 ++- opac/opac-detail.pl | 2 +- plugins/plugins-upload.pl | 2 +- serials/subscription-add.pl | 3 +- t/00-merge-conflict-markers.t | 30 +++--- t/SuggestionEngine_AuthorityFile.t | 2 +- t/db_dependent/Acquisition/close_reopen_basket.t | 25 ++++- t/db_dependent/Biblio/Isbd.t | 1 + t/db_dependent/Biblio/TransformKohaToMarc.t | 18 ++-- t/db_dependent/Budgets.t | 24 ++++- t/db_dependent/Circulation/issue.t | 1 - t/db_dependent/Items.t | 17 +++- .../Items/AutomaticItemModificationByAge.t | 5 +- t/db_dependent/Koha_Elasticsearch. | 23 ----- t/db_dependent/Koha_Elasticsearch_Indexer.t | 55 ---------- .../Koha_SearchEngine_Elasticsearch_Search.t | 106 -------------------- t/db_dependent/Members.t | 4 + t/db_dependent/Members/IssueSlip.t | 1 - t/db_dependent/OAI/Server.t | 6 +- t/db_dependent/Reserves.t | 6 +- t/db_dependent/SIP/Message.t | 2 +- t/db_dependent/SIP/Patron.t | 34 ++++++- t/db_dependent/ShelfBrowser.t | 2 +- t/db_dependent/SuggestionEngine_ExplodedTerms.t | 4 +- t/db_dependent/Template/Plugin/AuthorisedValues.t | 3 +- t/db_dependent/Virtualshelves.t | 91 ++++++++++++++++- t/db_dependent/XISBN.t | 8 +- 74 files changed, 593 insertions(+), 469 deletions(-) delete mode 100644 t/db_dependent/Koha_Elasticsearch. delete mode 100644 t/db_dependent/Koha_Elasticsearch_Indexer.t delete mode 100644 t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 24 09:55:14 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 24 Oct 2017 07:55:14 +0000 Subject: [koha-commits] main Koha release repository annotated tag v16.11.13 created. v16.11.13 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 annotated tag, v16.11.13 has been created at b0998683c6ced5e326b77a1a97ccc976d5916c67 (tag) tagging 9fa91c75a967fdadff9d28791449bdae63c54d2a (commit) replaces v16.11.12 tagged by Katrin Fischer on Mon Oct 23 01:05:41 2017 +0200 - Log ----------------------------------------------------------------- Koha release 16.11.13 -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJZ7SRFAAoJEB+uyDM6ADoA8AUQAJdq4DRwZgMFRh0AXYpeGhje jbwj1eERd2DpuEp3YmrafAw4+g09stG38ZkCcgR9OZakRyL+yX9pXawYb3sxSHQy fJdGUJ+VmfwULfDHULrEPwTvnlul0L+R1FHNjcRiUWeAwIIPwQ7EDK2p/Qo+NDIH 6DBCdh8LEkwY3n0ufg0ruSVN5Lti90NX3FiRyZaqrkhEeu+wFnA3VNHIr9oINCnO oqHGe9DVDPM5uC55BhaLmjm91bQ+C1yYACCjaeEGapl/E1yLlc0vb5dWPSe8MuXw u1WmcFPnbcaxAGp7Ge9/W4H03yh2B/F28Me0QJDRX/c/N8fTECZSxVfmKGcDdf8p yFhUZ9LH1NjG7InmkhowymeLxaaMKv9EJYMy80hokmZZu7wEitOdZ4fxTZm1LVMD Jrmykpbvw/iFnut/QAakbm6zQdJe7XwVudlDX/+KDuiX/p1PnsCpgYLkPnyy4rzr Yp7AqwwU05RTvdCbXVKS0vbUFEGGkfAHTOOqAF81/yCedM1tafnIz8rj1wGdE2PX peE/5gk9ShwHoN5taQpJDb33XE5QfFltYVOStVcckisa3xX8ERb0LglzLzB0+pHZ Y32ZlNhJhtm4qI/USBiRbIJLii1br7py6Ixsevx5wXGyGPRcTJiC5/k+vNJWHtFt aAjeGBPs9abdeDf38tHJ =b50r -----END PGP SIGNATURE----- Aleisha Amohia (6): Bug 18871: Make patron list name a link to view contents of list Bug 17834: Change library news text for single-branch libraries Bug 19229: Return to course when cancelling out of edit form Bug 19228: Trigger confirm delete when removing item from course Bug 19257: Prevent warn when reopening a basket Bug 18351: Able to delete budget with funds Alex Arnaud (1): Bug 19418: (bug 12833 follow-up) Add missing use statement Alex Buckley (1): Bug 18621: Added in value attribute to dateexpiry field Amit Gupta (1): Bug 19118 - Due to wrong variable name passed vendor name is not coming in browser title bar Christophe Croullebois (1): Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices Colin Campbell (2): Bug 19024 Fix some infelicities of phrasing in test messages Bug 19024 Do not unset order cancelled status on basket close Dobrica Pavlinusic (1): Bug 19350 - Holds without link in 773 trigger SQL::Abstract::puke Fridolin Somers (3): Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned Bug 18692 - same with syspref TalkingTechItivaPhone Bug 19323: subscription edit permission issue Jonathan Druart (26): Bug 19013: Fix borrowers.guarantorid in sammple_patrons.sql Bug 17699: Add more tests to highlight the problem Bug 17699: Use limit as end_of_month Bug 17699: Add test descriptions Bug 17699: Reset time simulation Bug 19042: Add mock IndependentBranches=0 for the other test Bug 19047: Fix AddBiblio call in ShelfBrowser.t Bug 13012: Add more tests Bug 18794: Fix test ListMetadataFormats in OAI/Server.t Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t Bug 19335: Fix 00-merge-conflict-markers.t when dockerised Bug 19055: Remove C4::Reserves::GetReservesToBranch Bug 9857: Fix failing tests Bug 19024: Add tests Bug 19385: Fix random t/Calendar.t failure - clear the cache before Bug 19116: Unit tests Bug 19343: [16.11.X] Add tests Bug 19081: Do not list plugins that have been uninstalled Bug 17834: Make translation easier Bug 19440: Existing calls need to be done in scalar context Bug 19350: Add tests Bug 19366: Do not block patron's detail update if EmailMustBeUnique Bug 19372: (bug 15801 follow-up) pass selected frameworkcode to the template Bug 19333: Fix XSS in opac-shelves Bug 19117: Add CSRF protection to paycollect.pl Josef Moravec (2): Bug 19116: (followup) Add tests to highlight the problem in CheckReserves Bug 19116: Hold not set to waiting after transfer Karam Qubsi (1): Bug 18946 - Change language from external web fails Katrin Fischer (7): Bug 9857: Did you mean? uses wrong punctuation in search links Bug 9857 - Follow-up - Fix for searches with su= or su: Bug 14316: Clarify meaning of record number in Batch record deletion tool Bug 14316: Clarify meaning of record number in Batch record modification tool Increment version for 16.11.13 release Merge remote-tracking branch 'transl/16.11.13-translate-20171022' into 16.11.x Add release notes for Koha 16.11.13 Kyle M Hall (3): Bug 13012 - suggestion.suggesteddate should be set to NOW if not defined Bug 19007 - Allow paypal payments via debit or credit card again Bug 18946 [QA Followup] - code cleanup Lari Taskula (1): Bug 18692 - intranet part Lee Jamison (2): Bug 19088: plugins-upload causes error log noise Bug 18897: Koha_Elasticsearch_Indexer.t doesn't skip when ES module(s) not installed Marc V?ron (11): Bug 19027 - Circulation rules: Better wording for standard rules for all libraries Bug 18687: Translatability: abbr tag should not contain lang attribute Bug 18754: Translatability: Get rid of exposed tt directives in opac-detail.tt Bug 18776: Translatability: Get rid of exposed tt directives in opac-advsearch.tt Bug 18777: Translatability: Get rid of exposed tt directives in opac-memberentry.tt Bug 18779: Translatability: Get rid of exposed tt directives in authorities-search-results.inc (OPAC) Bug 18780: Translatability: Get rid of exposed tt directive in masthead-langmenu.inc Bug 18781: Translatability: Get rid of exposed tt directives in openlibrary-readapi.inc Bug 14353 - Show 'damaged' and other status on the 'place holds' page in staff Bug 16485: collection column in Item search is always empty Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields Marcel de Rooy (10): Bug 19047: Fix AddBiblio call in Reserves.t Bug 19071: Fix Circulation/issue.t Bug 19071: Fix Members/IssueSlip.t Bug 19126: Fix Members.t with IndependentBranches set Bug 18754: [QA Follow-up] Tiny corrections Bug 19004: Patrons.t should create its own data for enrollment fees. Bug 19004: Adjust AddReturn for retrieving item type Bug 19004: [QA Follow-up] No need to check item-level_itypes again Bug 19343: [16.11.X] Remove private lists with edit permission from search results Bug 18956: [QA Follow-up] Resolve a CGI::Param in list context warn Mark Tompsett (10): Bug 19042: Silence warnings t/db_dependent/Letters.t Bug 9409: Add --dbhost parameter and dbhost field Bug 18897: Improve error message Bug 18897: Use Module::Load::Conditional::can_load Bug 18897: Skipping t/db_dependend/00-strict elastic search stuffs as needed Bug 18897: Add skipping to t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t Bug 19120: Add tests to reproduce the problem Bug 19120: Leave cancelled ordered items alone when reopening basket Bug 18956: Prevent leaking during password recovery Bug 18956: Fix empty to in message queue Nick Clemens (6): Bug 18941 - Unit tests Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets Bug 18469: Suspend all holds when specifying a date to resume hold does not keep date Bug 18469: QA Follow-up Bug 15924 - Coce not enabled on lists Bug 18812 - SIP Patron status does not respect OverduesBlockCirc Tomas Cohen Arazi (4): Bug 19013: (QA followup) Set guarantorid to NULL patron sample data Bug 9409: (QA followup) Add --dbhost help to koha-create man page Bug 18996: (followup) Fix tests count [16.11.x] Bug 19440: Identify overlimit problems in XISBN tests root (1): Translation updates for Koha 16.11.13 ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 24 09:54:50 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 24 Oct 2017 07:54:50 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.13 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, 16.11.x has been updated via 9fa91c75a967fdadff9d28791449bdae63c54d2a (commit) via 396c86ccdf59a89aa5f731d1457cb3d207b7ac92 (commit) via d8d35b30f6eac25e8296bd1bad7b084c8b486a24 (commit) via 32c736b065fb2e854280b1327b01fcc57e9cf987 (commit) via 654f2bc2e588305bb10b2dc0b7756dbe53238d64 (commit) via f296ea690bd3e9ef108f7566e9dc3bf21e42f873 (commit) via 042a110e36d36d23f7ce0dc47f198f4b42c1f461 (commit) via a80f15353bbd4b55142008214ad95f6bc924b079 (commit) via 0e2472abaf7d17e86b27b3e9211ff32ab4e526f6 (commit) from 8435688b2c3d35ed0ee5375841f8d17ab1c3d89c (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 9fa91c75a967fdadff9d28791449bdae63c54d2a Author: Katrin Fischer Date: Mon Oct 23 00:58:11 2017 +0200 Add release notes for Koha 16.11.13 commit 396c86ccdf59a89aa5f731d1457cb3d207b7ac92 Merge: 32c736b d8d35b3 Author: Katrin Fischer Date: Mon Oct 23 00:39:38 2017 +0200 Merge remote-tracking branch 'transl/16.11.13-translate-20171022' into 16.11.x commit d8d35b30f6eac25e8296bd1bad7b084c8b486a24 Author: root Date: Sun Oct 22 19:34:24 2017 -0300 Translation updates for Koha 16.11.13 commit 32c736b065fb2e854280b1327b01fcc57e9cf987 Author: Katrin Fischer Date: Mon Oct 23 00:31:19 2017 +0200 Increment version for 16.11.13 release commit 654f2bc2e588305bb10b2dc0b7756dbe53238d64 Author: Jonathan Druart Date: Wed Oct 4 17:49:51 2017 -0300 Bug 19117: Add CSRF protection to paycollect.pl Security bug, trivial changes, no need to provide procedure for script kiddies. Test plan: Pay fines using the different options from the "Pay fines" tab. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer commit f296ea690bd3e9ef108f7566e9dc3bf21e42f873 Author: Jonathan Druart Date: Mon Sep 18 14:53:41 2017 -0300 Bug 19333: Fix XSS in opac-shelves category is send back to the template, it must be escaped Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer commit 042a110e36d36d23f7ce0dc47f198f4b42c1f461 Author: Mark Tompsett Date: Wed Sep 13 03:44:19 2017 +0000 Bug 18956: Fix empty to in message queue Follow the test plan in comment #20. Also tweaked string, because it was really 'or' before too. Signed-off-by: Marcel de Rooy Amended text in added comment. Signed-off-by: Katrin Fischer commit a80f15353bbd4b55142008214ad95f6bc924b079 Author: Marcel de Rooy Date: Fri Sep 8 08:53:37 2017 +0200 Bug 18956: [QA Follow-up] Resolve a CGI::Param in list context warn From the plack-error.log: CGI::param called in list context from package CGI::Compile::ROOT::usr_share_koha_masterclone_opac_opac_2dpassword_2drecovery_2epl line 129, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer commit 0e2472abaf7d17e86b27b3e9211ff32ab4e526f6 Author: Mark Tompsett Date: Fri Aug 25 15:09:38 2017 -0400 Bug 18956: Prevent leaking during password recovery TEST PLAN --------- It is assumed you have set the OpacResetPassword to 'allowed', and likely in combination with OpacPasswordChange to 'Allowed'. You will have two patrons: one with and another without any email address entered. You will want to test this test plan with both patrons. $ git checkout -b bug_18956 origin/master Prepend the following as understood between step sections: opac -> forgot password and then enter... correct login/cardnumber, it will email delete from borrower_password_recovery; correct email, it will email delete from borrower_password_recovery; correct login/cardnumber && correct email, it will email delete from borrower_password_recovery; wrong login/cardnumber && correct email, error page as expected delete from borrower_password_recovery; correct login/cardnumber && wrong email, error page as expected delete from borrower_password_recovery; wrong login/cardnumber && wrong email, error page as expected delete from borrower_password_recovery; submit empty -- INTERNAL SERVER ERROR?! delete from borrower_password_recovery; -- None of the above step sections displayed email. correct login/cardnumber, it will email correct login/cardnumber again, but it leaks email address! delete from borrower_password_recovery; correct email, it will email correct email again, but it leaks login/cardnumber! delete from borrower_password_recovery; $ git bz apply 18956 -- choose interactive, and choose this counter patch. repeat the same test set again -- no leaks will occur, error message pages returned should be reasonable, code should read reasonably. run koha qa test tools. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 6 + .../prog/en/modules/members/paycollect.tt | 3 + .../bootstrap/en/modules/opac-password-recovery.tt | 9 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 10 +- members/paycollect.pl | 9 + ...s_16_11_09.html => release_notes_16_11_13.html} | 341 ++--- misc/release_notes/release_notes_16_11_13.md | 392 +++++ misc/translator/po/am-Ethi-marc-MARC21.po | 2 +- misc/translator/po/am-Ethi-marc-NORMARC.po | 2 +- misc/translator/po/am-Ethi-marc-UNIMARC.po | 2 +- misc/translator/po/am-Ethi-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/am-Ethi-pref.po | 8 + misc/translator/po/am-Ethi-staff-help.po | 2 +- misc/translator/po/am-Ethi-staff-prog.po | 424 +++--- misc/translator/po/ar-Arab-marc-MARC21.po | 2 +- misc/translator/po/ar-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ar-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ar-Arab-opac-bootstrap.po | 1450 ++++++++----------- misc/translator/po/ar-Arab-pref.po | 8 + misc/translator/po/ar-Arab-staff-help.po | 2 +- misc/translator/po/ar-Arab-staff-prog.po | 431 +++--- misc/translator/po/as-IN-marc-MARC21.po | 2 +- misc/translator/po/as-IN-marc-NORMARC.po | 2 +- misc/translator/po/as-IN-marc-UNIMARC.po | 2 +- misc/translator/po/as-IN-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/as-IN-pref.po | 8 + misc/translator/po/as-IN-staff-help.po | 2 +- misc/translator/po/as-IN-staff-prog.po | 424 +++--- misc/translator/po/az-AZ-marc-MARC21.po | 2 +- misc/translator/po/az-AZ-marc-NORMARC.po | 2 +- misc/translator/po/az-AZ-marc-UNIMARC.po | 2 +- misc/translator/po/az-AZ-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/az-AZ-pref.po | 8 + misc/translator/po/az-AZ-staff-help.po | 2 +- misc/translator/po/az-AZ-staff-prog.po | 428 +++--- misc/translator/po/be-BY-marc-MARC21.po | 2 +- misc/translator/po/be-BY-marc-NORMARC.po | 2 +- misc/translator/po/be-BY-marc-UNIMARC.po | 2 +- misc/translator/po/be-BY-opac-bootstrap.po | 1416 ++++++++---------- misc/translator/po/be-BY-pref.po | 8 + misc/translator/po/be-BY-staff-help.po | 2 +- misc/translator/po/be-BY-staff-prog.po | 432 +++--- misc/translator/po/bg-Cyrl-marc-MARC21.po | 2 +- misc/translator/po/bg-Cyrl-marc-NORMARC.po | 2 +- misc/translator/po/bg-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/bg-Cyrl-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/bg-Cyrl-pref.po | 8 + misc/translator/po/bg-Cyrl-staff-help.po | 2 +- misc/translator/po/bg-Cyrl-staff-prog.po | 424 +++--- misc/translator/po/bn-IN-marc-MARC21.po | 2 +- misc/translator/po/bn-IN-marc-NORMARC.po | 2 +- misc/translator/po/bn-IN-marc-UNIMARC.po | 2 +- misc/translator/po/bn-IN-opac-bootstrap.po | 1379 ++++++++---------- misc/translator/po/bn-IN-pref.po | 8 + misc/translator/po/bn-IN-staff-help.po | 2 +- misc/translator/po/bn-IN-staff-prog.po | 424 +++--- misc/translator/po/ca-ES-marc-MARC21.po | 2 +- misc/translator/po/ca-ES-marc-NORMARC.po | 2 +- misc/translator/po/ca-ES-marc-UNIMARC.po | 2 +- misc/translator/po/ca-ES-opac-bootstrap.po | 1452 ++++++++----------- misc/translator/po/ca-ES-pref.po | 8 + misc/translator/po/ca-ES-staff-help.po | 2 +- misc/translator/po/ca-ES-staff-prog.po | 428 +++--- misc/translator/po/cs-CZ-marc-MARC21.po | 2 +- misc/translator/po/cs-CZ-marc-NORMARC.po | 2 +- misc/translator/po/cs-CZ-marc-UNIMARC.po | 2 +- misc/translator/po/cs-CZ-opac-bootstrap.po | 1456 ++++++++----------- misc/translator/po/cs-CZ-pref.po | 8 + misc/translator/po/cs-CZ-staff-help.po | 2 +- misc/translator/po/cs-CZ-staff-prog.po | 432 +++--- misc/translator/po/cy-GB-marc-MARC21.po | 2 +- misc/translator/po/cy-GB-marc-NORMARC.po | 2 +- misc/translator/po/cy-GB-marc-UNIMARC.po | 2 +- misc/translator/po/cy-GB-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/cy-GB-pref.po | 8 + misc/translator/po/cy-GB-staff-help.po | 2 +- misc/translator/po/cy-GB-staff-prog.po | 424 +++--- misc/translator/po/da-DK-marc-MARC21.po | 2 +- misc/translator/po/da-DK-marc-NORMARC.po | 2 +- misc/translator/po/da-DK-marc-UNIMARC.po | 2 +- misc/translator/po/da-DK-opac-bootstrap.po | 1457 ++++++++----------- misc/translator/po/da-DK-pref.po | 8 + misc/translator/po/da-DK-staff-help.po | 2 +- misc/translator/po/da-DK-staff-prog.po | 430 +++--- misc/translator/po/de-CH-marc-MARC21.po | 2 +- misc/translator/po/de-CH-marc-NORMARC.po | 2 +- misc/translator/po/de-CH-marc-UNIMARC.po | 2 +- misc/translator/po/de-CH-opac-bootstrap.po | 1454 ++++++++----------- misc/translator/po/de-CH-pref.po | 8 + misc/translator/po/de-CH-staff-help.po | 2 +- misc/translator/po/de-CH-staff-prog.po | 432 +++--- misc/translator/po/de-DE-marc-MARC21.po | 18 +- misc/translator/po/de-DE-marc-NORMARC.po | 2 +- misc/translator/po/de-DE-marc-UNIMARC.po | 2 +- misc/translator/po/de-DE-opac-bootstrap.po | 1454 ++++++++----------- misc/translator/po/de-DE-pref.po | 21 +- misc/translator/po/de-DE-staff-help.po | 8 +- misc/translator/po/de-DE-staff-prog.po | 498 ++++--- misc/translator/po/el-GR-marc-MARC21.po | 8 +- misc/translator/po/el-GR-marc-NORMARC.po | 2 +- misc/translator/po/el-GR-marc-UNIMARC.po | 2 +- misc/translator/po/el-GR-opac-bootstrap.po | 1496 ++++++++----------- misc/translator/po/el-GR-pref.po | 70 +- misc/translator/po/el-GR-staff-help.po | 88 +- misc/translator/po/el-GR-staff-prog.po | 948 ++++++------ misc/translator/po/en-GB-marc-MARC21.po | 2 +- misc/translator/po/en-GB-marc-NORMARC.po | 2 +- misc/translator/po/en-GB-marc-UNIMARC.po | 2 +- misc/translator/po/en-GB-opac-bootstrap.po | 1389 ++++++++---------- misc/translator/po/en-GB-pref.po | 8 + misc/translator/po/en-GB-staff-help.po | 2 +- misc/translator/po/en-GB-staff-prog.po | 426 +++--- misc/translator/po/en-NZ-marc-MARC21.po | 2 +- misc/translator/po/en-NZ-marc-NORMARC.po | 2 +- misc/translator/po/en-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/en-NZ-opac-bootstrap.po | 1453 ++++++++----------- misc/translator/po/en-NZ-pref.po | 8 + misc/translator/po/en-NZ-staff-help.po | 2 +- misc/translator/po/en-NZ-staff-prog.po | 430 +++--- misc/translator/po/eo-marc-MARC21.po | 2 +- misc/translator/po/eo-marc-NORMARC.po | 2 +- misc/translator/po/eo-marc-UNIMARC.po | 2 +- misc/translator/po/eo-opac-bootstrap.po | 1399 ++++++++---------- misc/translator/po/eo-pref.po | 8 + misc/translator/po/eo-staff-help.po | 2 +- misc/translator/po/eo-staff-prog.po | 424 +++--- misc/translator/po/es-ES-marc-MARC21.po | 2 +- misc/translator/po/es-ES-marc-NORMARC.po | 2 +- misc/translator/po/es-ES-marc-UNIMARC.po | 2 +- misc/translator/po/es-ES-opac-bootstrap.po | 1464 ++++++++----------- misc/translator/po/es-ES-pref.po | 8 + misc/translator/po/es-ES-staff-help.po | 2 +- misc/translator/po/es-ES-staff-prog.po | 596 ++++---- misc/translator/po/eu-marc-MARC21.po | 2 +- misc/translator/po/eu-marc-NORMARC.po | 2 +- misc/translator/po/eu-marc-UNIMARC.po | 2 +- misc/translator/po/eu-opac-bootstrap.po | 1427 ++++++++---------- misc/translator/po/eu-pref.po | 8 + misc/translator/po/eu-staff-help.po | 2 +- misc/translator/po/eu-staff-prog.po | 424 +++--- misc/translator/po/fa-Arab-marc-MARC21.po | 2 +- misc/translator/po/fa-Arab-marc-NORMARC.po | 2 +- misc/translator/po/fa-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/fa-Arab-opac-bootstrap.po | 1422 ++++++++---------- misc/translator/po/fa-Arab-pref.po | 8 + misc/translator/po/fa-Arab-staff-help.po | 2 +- misc/translator/po/fa-Arab-staff-prog.po | 430 +++--- misc/translator/po/fi-FI-marc-MARC21.po | 2 +- misc/translator/po/fi-FI-marc-NORMARC.po | 2 +- misc/translator/po/fi-FI-marc-UNIMARC.po | 2 +- misc/translator/po/fi-FI-opac-bootstrap.po | 1452 ++++++++----------- misc/translator/po/fi-FI-pref.po | 8 + misc/translator/po/fi-FI-staff-help.po | 2 +- misc/translator/po/fi-FI-staff-prog.po | 430 +++--- misc/translator/po/fo-FO-marc-MARC21.po | 2 +- misc/translator/po/fo-FO-marc-NORMARC.po | 2 +- misc/translator/po/fo-FO-marc-UNIMARC.po | 2 +- misc/translator/po/fo-FO-opac-bootstrap.po | 1377 ++++++++---------- misc/translator/po/fo-FO-pref.po | 8 + misc/translator/po/fo-FO-staff-help.po | 2 +- misc/translator/po/fo-FO-staff-prog.po | 424 +++--- misc/translator/po/fr-CA-marc-MARC21.po | 2 +- misc/translator/po/fr-CA-marc-NORMARC.po | 2 +- misc/translator/po/fr-CA-marc-UNIMARC.po | 2 +- misc/translator/po/fr-CA-opac-bootstrap.po | 1468 ++++++++----------- misc/translator/po/fr-CA-pref.po | 8 + misc/translator/po/fr-CA-staff-help.po | 2 +- misc/translator/po/fr-CA-staff-prog.po | 433 +++--- misc/translator/po/fr-FR-marc-MARC21.po | 2 +- misc/translator/po/fr-FR-marc-NORMARC.po | 2 +- misc/translator/po/fr-FR-marc-UNIMARC.po | 2 +- misc/translator/po/fr-FR-opac-bootstrap.po | 1476 ++++++++----------- misc/translator/po/fr-FR-pref.po | 8 + misc/translator/po/fr-FR-staff-help.po | 2 +- misc/translator/po/fr-FR-staff-prog.po | 635 ++++---- misc/translator/po/gl-marc-MARC21.po | 2 +- misc/translator/po/gl-marc-NORMARC.po | 2 +- misc/translator/po/gl-marc-UNIMARC.po | 2 +- misc/translator/po/gl-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/gl-pref.po | 8 + misc/translator/po/gl-staff-help.po | 2 +- misc/translator/po/gl-staff-prog.po | 428 +++--- misc/translator/po/he-Hebr-marc-MARC21.po | 2 +- misc/translator/po/he-Hebr-marc-NORMARC.po | 2 +- misc/translator/po/he-Hebr-marc-UNIMARC.po | 2 +- misc/translator/po/he-Hebr-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/he-Hebr-pref.po | 8 + misc/translator/po/he-Hebr-staff-help.po | 2 +- misc/translator/po/he-Hebr-staff-prog.po | 427 +++--- misc/translator/po/hi-marc-MARC21.po | 2 +- misc/translator/po/hi-marc-NORMARC.po | 2 +- misc/translator/po/hi-marc-UNIMARC.po | 2 +- misc/translator/po/hi-opac-bootstrap.po | 1522 +++++++++----------- misc/translator/po/hi-pref.po | 8 + misc/translator/po/hi-staff-help.po | 2 +- misc/translator/po/hi-staff-prog.po | 432 +++--- misc/translator/po/hr-HR-marc-MARC21.po | 2 +- misc/translator/po/hr-HR-marc-NORMARC.po | 2 +- misc/translator/po/hr-HR-marc-UNIMARC.po | 2 +- misc/translator/po/hr-HR-opac-bootstrap.po | 1425 ++++++++---------- misc/translator/po/hr-HR-pref.po | 8 + misc/translator/po/hr-HR-staff-help.po | 2 +- misc/translator/po/hr-HR-staff-prog.po | 432 +++--- misc/translator/po/hu-HU-marc-MARC21.po | 2 +- misc/translator/po/hu-HU-marc-NORMARC.po | 2 +- misc/translator/po/hu-HU-marc-UNIMARC.po | 2 +- misc/translator/po/hu-HU-opac-bootstrap.po | 1450 ++++++++----------- misc/translator/po/hu-HU-pref.po | 8 + misc/translator/po/hu-HU-staff-help.po | 2 +- misc/translator/po/hu-HU-staff-prog.po | 428 +++--- misc/translator/po/hy-Armn-marc-MARC21.po | 2 +- misc/translator/po/hy-Armn-marc-NORMARC.po | 2 +- misc/translator/po/hy-Armn-marc-UNIMARC.po | 2 +- misc/translator/po/hy-Armn-opac-bootstrap.po | 1459 ++++++++----------- misc/translator/po/hy-Armn-pref.po | 8 + misc/translator/po/hy-Armn-staff-help.po | 2 +- misc/translator/po/hy-Armn-staff-prog.po | 430 +++--- misc/translator/po/ia-marc-MARC21.po | 2 +- misc/translator/po/ia-marc-NORMARC.po | 2 +- misc/translator/po/ia-marc-UNIMARC.po | 2 +- misc/translator/po/ia-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ia-pref.po | 8 + misc/translator/po/ia-staff-help.po | 2 +- misc/translator/po/ia-staff-prog.po | 424 +++--- misc/translator/po/id-ID-marc-MARC21.po | 2 +- misc/translator/po/id-ID-marc-NORMARC.po | 2 +- misc/translator/po/id-ID-marc-UNIMARC.po | 2 +- misc/translator/po/id-ID-opac-bootstrap.po | 1385 ++++++++---------- misc/translator/po/id-ID-pref.po | 8 + misc/translator/po/id-ID-staff-help.po | 2 +- misc/translator/po/id-ID-staff-prog.po | 424 +++--- misc/translator/po/iq-CA-marc-MARC21.po | 2 +- misc/translator/po/iq-CA-marc-NORMARC.po | 2 +- misc/translator/po/iq-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iq-CA-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/iq-CA-pref.po | 8 + misc/translator/po/iq-CA-staff-help.po | 2 +- misc/translator/po/iq-CA-staff-prog.po | 424 +++--- misc/translator/po/is-IS-marc-MARC21.po | 2 +- misc/translator/po/is-IS-marc-NORMARC.po | 2 +- misc/translator/po/is-IS-marc-UNIMARC.po | 2 +- misc/translator/po/is-IS-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/is-IS-pref.po | 8 + misc/translator/po/is-IS-staff-help.po | 2 +- misc/translator/po/is-IS-staff-prog.po | 428 +++--- misc/translator/po/it-IT-marc-MARC21.po | 2 +- misc/translator/po/it-IT-marc-NORMARC.po | 2 +- misc/translator/po/it-IT-marc-UNIMARC.po | 2 +- misc/translator/po/it-IT-opac-bootstrap.po | 1456 ++++++++----------- misc/translator/po/it-IT-pref.po | 8 + misc/translator/po/it-IT-staff-help.po | 2 +- misc/translator/po/it-IT-staff-prog.po | 432 +++--- misc/translator/po/iu-CA-marc-MARC21.po | 2 +- misc/translator/po/iu-CA-marc-NORMARC.po | 2 +- misc/translator/po/iu-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iu-CA-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/iu-CA-pref.po | 8 + misc/translator/po/iu-CA-staff-help.po | 2 +- misc/translator/po/iu-CA-staff-prog.po | 424 +++--- misc/translator/po/ja-Jpan-JP-marc-MARC21.po | 2 +- misc/translator/po/ja-Jpan-JP-marc-NORMARC.po | 2 +- misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po | 2 +- misc/translator/po/ja-Jpan-JP-opac-bootstrap.po | 1407 ++++++++---------- misc/translator/po/ja-Jpan-JP-pref.po | 8 + misc/translator/po/ja-Jpan-JP-staff-help.po | 2 +- misc/translator/po/ja-Jpan-JP-staff-prog.po | 428 +++--- misc/translator/po/ka-marc-MARC21.po | 2 +- misc/translator/po/ka-marc-NORMARC.po | 2 +- misc/translator/po/ka-marc-UNIMARC.po | 2 +- misc/translator/po/ka-opac-bootstrap.po | 1384 ++++++++---------- misc/translator/po/ka-pref.po | 8 + misc/translator/po/ka-staff-help.po | 2 +- misc/translator/po/ka-staff-prog.po | 424 +++--- misc/translator/po/km-KH-marc-MARC21.po | 2 +- misc/translator/po/km-KH-marc-NORMARC.po | 2 +- misc/translator/po/km-KH-marc-UNIMARC.po | 2 +- misc/translator/po/km-KH-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/km-KH-pref.po | 8 + misc/translator/po/km-KH-staff-help.po | 2 +- misc/translator/po/km-KH-staff-prog.po | 424 +++--- misc/translator/po/kn-Knda-marc-MARC21.po | 2 +- misc/translator/po/kn-Knda-marc-NORMARC.po | 2 +- misc/translator/po/kn-Knda-marc-UNIMARC.po | 2 +- misc/translator/po/kn-Knda-opac-bootstrap.po | 1379 ++++++++---------- misc/translator/po/kn-Knda-pref.po | 8 + misc/translator/po/kn-Knda-staff-help.po | 2 +- misc/translator/po/kn-Knda-staff-prog.po | 424 +++--- misc/translator/po/ko-Kore-KP-marc-MARC21.po | 2 +- misc/translator/po/ko-Kore-KP-marc-NORMARC.po | 2 +- misc/translator/po/ko-Kore-KP-marc-UNIMARC.po | 2 +- misc/translator/po/ko-Kore-KP-opac-bootstrap.po | 1438 ++++++++---------- misc/translator/po/ko-Kore-KP-pref.po | 8 + misc/translator/po/ko-Kore-KP-staff-help.po | 2 +- misc/translator/po/ko-Kore-KP-staff-prog.po | 430 +++--- misc/translator/po/ku-Arab-marc-MARC21.po | 2 +- misc/translator/po/ku-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ku-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ku-Arab-opac-bootstrap.po | 1385 ++++++++---------- misc/translator/po/ku-Arab-pref.po | 8 + misc/translator/po/ku-Arab-staff-help.po | 2 +- misc/translator/po/ku-Arab-staff-prog.po | 428 +++--- misc/translator/po/lo-Laoo-marc-MARC21.po | 2 +- misc/translator/po/lo-Laoo-marc-NORMARC.po | 2 +- misc/translator/po/lo-Laoo-marc-UNIMARC.po | 2 +- misc/translator/po/lo-Laoo-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/lo-Laoo-pref.po | 8 + misc/translator/po/lo-Laoo-staff-help.po | 2 +- misc/translator/po/lo-Laoo-staff-prog.po | 424 +++--- misc/translator/po/mi-NZ-marc-MARC21.po | 2 +- misc/translator/po/mi-NZ-marc-NORMARC.po | 2 +- misc/translator/po/mi-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/mi-NZ-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/mi-NZ-pref.po | 8 + misc/translator/po/mi-NZ-staff-help.po | 2 +- misc/translator/po/mi-NZ-staff-prog.po | 428 +++--- misc/translator/po/ml-marc-MARC21.po | 2 +- misc/translator/po/ml-marc-NORMARC.po | 2 +- misc/translator/po/ml-marc-UNIMARC.po | 2 +- misc/translator/po/ml-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ml-pref.po | 8 + misc/translator/po/ml-staff-help.po | 2 +- misc/translator/po/ml-staff-prog.po | 424 +++--- misc/translator/po/mon-marc-MARC21.po | 2 +- misc/translator/po/mon-marc-NORMARC.po | 2 +- misc/translator/po/mon-marc-UNIMARC.po | 2 +- misc/translator/po/mon-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/mon-pref.po | 8 + misc/translator/po/mon-staff-help.po | 2 +- misc/translator/po/mon-staff-prog.po | 428 +++--- misc/translator/po/mr-marc-MARC21.po | 2 +- misc/translator/po/mr-marc-NORMARC.po | 2 +- misc/translator/po/mr-marc-UNIMARC.po | 2 +- misc/translator/po/mr-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/mr-pref.po | 8 + misc/translator/po/mr-staff-help.po | 2 +- misc/translator/po/mr-staff-prog.po | 424 +++--- misc/translator/po/ms-MY-marc-MARC21.po | 2 +- misc/translator/po/ms-MY-marc-NORMARC.po | 2 +- misc/translator/po/ms-MY-marc-UNIMARC.po | 2 +- misc/translator/po/ms-MY-opac-bootstrap.po | 1385 ++++++++---------- misc/translator/po/ms-MY-pref.po | 8 + misc/translator/po/ms-MY-staff-help.po | 2 +- misc/translator/po/ms-MY-staff-prog.po | 424 +++--- misc/translator/po/my-marc-MARC21.po | 2 +- misc/translator/po/my-marc-NORMARC.po | 2 +- misc/translator/po/my-marc-UNIMARC.po | 2 +- misc/translator/po/my-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/my-pref.po | 8 + misc/translator/po/my-staff-help.po | 2 +- misc/translator/po/my-staff-prog.po | 424 +++--- misc/translator/po/nb-NO-marc-MARC21.po | 2 +- misc/translator/po/nb-NO-marc-NORMARC.po | 2 +- misc/translator/po/nb-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nb-NO-opac-bootstrap.po | 1450 ++++++++----------- misc/translator/po/nb-NO-pref.po | 8 + misc/translator/po/nb-NO-staff-help.po | 2 +- misc/translator/po/nb-NO-staff-prog.po | 430 +++--- misc/translator/po/ne-NE-marc-MARC21.po | 2 +- misc/translator/po/ne-NE-marc-NORMARC.po | 2 +- misc/translator/po/ne-NE-marc-UNIMARC.po | 2 +- misc/translator/po/ne-NE-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ne-NE-pref.po | 8 + misc/translator/po/ne-NE-staff-help.po | 2 +- misc/translator/po/ne-NE-staff-prog.po | 424 +++--- misc/translator/po/nl-BE-marc-MARC21.po | 2 +- misc/translator/po/nl-BE-marc-NORMARC.po | 2 +- misc/translator/po/nl-BE-marc-UNIMARC.po | 2 +- misc/translator/po/nl-BE-opac-bootstrap.po | 1423 ++++++++---------- misc/translator/po/nl-BE-pref.po | 8 + misc/translator/po/nl-BE-staff-help.po | 2 +- misc/translator/po/nl-BE-staff-prog.po | 430 +++--- misc/translator/po/nl-NL-marc-MARC21.po | 2 +- misc/translator/po/nl-NL-marc-NORMARC.po | 2 +- misc/translator/po/nl-NL-marc-UNIMARC.po | 2 +- misc/translator/po/nl-NL-opac-bootstrap.po | 1418 ++++++++---------- misc/translator/po/nl-NL-pref.po | 8 + misc/translator/po/nl-NL-staff-help.po | 2 +- misc/translator/po/nl-NL-staff-prog.po | 424 +++--- misc/translator/po/nn-NO-marc-MARC21.po | 2 +- misc/translator/po/nn-NO-marc-NORMARC.po | 2 +- misc/translator/po/nn-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nn-NO-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/nn-NO-pref.po | 8 + misc/translator/po/nn-NO-staff-help.po | 2 +- misc/translator/po/nn-NO-staff-prog.po | 428 +++--- misc/translator/po/oc-marc-MARC21.po | 2 +- misc/translator/po/oc-marc-NORMARC.po | 2 +- misc/translator/po/oc-marc-UNIMARC.po | 2 +- misc/translator/po/oc-opac-bootstrap.po | 1440 ++++++++---------- misc/translator/po/oc-pref.po | 8 + misc/translator/po/oc-staff-help.po | 2 +- misc/translator/po/oc-staff-prog.po | 430 +++--- misc/translator/po/pbr-marc-MARC21.po | 2 +- misc/translator/po/pbr-marc-NORMARC.po | 2 +- misc/translator/po/pbr-marc-UNIMARC.po | 2 +- misc/translator/po/pbr-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/pbr-pref.po | 8 + misc/translator/po/pbr-staff-help.po | 2 +- misc/translator/po/pbr-staff-prog.po | 424 +++--- misc/translator/po/pl-PL-marc-MARC21.po | 2 +- misc/translator/po/pl-PL-marc-NORMARC.po | 2 +- misc/translator/po/pl-PL-marc-UNIMARC.po | 2 +- misc/translator/po/pl-PL-opac-bootstrap.po | 1463 ++++++++----------- misc/translator/po/pl-PL-pref.po | 20 +- misc/translator/po/pl-PL-staff-help.po | 2 +- misc/translator/po/pl-PL-staff-prog.po | 582 ++++---- misc/translator/po/prs-marc-MARC21.po | 2 +- misc/translator/po/prs-marc-NORMARC.po | 2 +- misc/translator/po/prs-marc-UNIMARC.po | 2 +- misc/translator/po/prs-opac-bootstrap.po | 1379 ++++++++---------- misc/translator/po/prs-pref.po | 8 + misc/translator/po/prs-staff-help.po | 2 +- misc/translator/po/prs-staff-prog.po | 427 +++--- misc/translator/po/pt-BR-marc-MARC21.po | 2 +- misc/translator/po/pt-BR-marc-NORMARC.po | 2 +- misc/translator/po/pt-BR-marc-UNIMARC.po | 2 +- misc/translator/po/pt-BR-opac-bootstrap.po | 1451 ++++++++----------- misc/translator/po/pt-BR-pref.po | 8 + misc/translator/po/pt-BR-staff-help.po | 2 +- misc/translator/po/pt-BR-staff-prog.po | 430 +++--- misc/translator/po/pt-PT-marc-MARC21.po | 2 +- misc/translator/po/pt-PT-marc-NORMARC.po | 2 +- misc/translator/po/pt-PT-marc-UNIMARC.po | 2 +- misc/translator/po/pt-PT-opac-bootstrap.po | 1462 ++++++++----------- misc/translator/po/pt-PT-pref.po | 17 +- misc/translator/po/pt-PT-staff-help.po | 2 +- misc/translator/po/pt-PT-staff-prog.po | 472 +++--- misc/translator/po/ro-RO-marc-MARC21.po | 2 +- misc/translator/po/ro-RO-marc-NORMARC.po | 2 +- misc/translator/po/ro-RO-marc-UNIMARC.po | 2 +- misc/translator/po/ro-RO-opac-bootstrap.po | 1398 ++++++++---------- misc/translator/po/ro-RO-pref.po | 8 + misc/translator/po/ro-RO-staff-help.po | 2 +- misc/translator/po/ro-RO-staff-prog.po | 428 +++--- misc/translator/po/ru-RU-marc-MARC21.po | 2 +- misc/translator/po/ru-RU-marc-NORMARC.po | 2 +- misc/translator/po/ru-RU-marc-UNIMARC.po | 2 +- misc/translator/po/ru-RU-opac-bootstrap.po | 1449 ++++++++----------- misc/translator/po/ru-RU-pref.po | 8 + misc/translator/po/ru-RU-staff-help.po | 2 +- misc/translator/po/ru-RU-staff-prog.po | 432 +++--- misc/translator/po/rw-RW-marc-MARC21.po | 2 +- misc/translator/po/rw-RW-marc-NORMARC.po | 2 +- misc/translator/po/rw-RW-marc-UNIMARC.po | 2 +- misc/translator/po/rw-RW-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/rw-RW-pref.po | 8 + misc/translator/po/rw-RW-staff-help.po | 2 +- misc/translator/po/rw-RW-staff-prog.po | 424 +++--- misc/translator/po/sd-PK-marc-MARC21.po | 2 +- misc/translator/po/sd-PK-marc-NORMARC.po | 2 +- misc/translator/po/sd-PK-marc-UNIMARC.po | 2 +- misc/translator/po/sd-PK-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/sd-PK-pref.po | 8 + misc/translator/po/sd-PK-staff-help.po | 2 +- misc/translator/po/sd-PK-staff-prog.po | 424 +++--- misc/translator/po/sk-SK-marc-MARC21.po | 2 +- misc/translator/po/sk-SK-marc-NORMARC.po | 2 +- misc/translator/po/sk-SK-marc-UNIMARC.po | 2 +- misc/translator/po/sk-SK-opac-bootstrap.po | 1455 ++++++++----------- misc/translator/po/sk-SK-pref.po | 8 + misc/translator/po/sk-SK-staff-help.po | 2 +- misc/translator/po/sk-SK-staff-prog.po | 430 +++--- misc/translator/po/sl-SI-marc-MARC21.po | 2 +- misc/translator/po/sl-SI-marc-NORMARC.po | 2 +- misc/translator/po/sl-SI-marc-UNIMARC.po | 2 +- misc/translator/po/sl-SI-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/sl-SI-pref.po | 8 + misc/translator/po/sl-SI-staff-help.po | 2 +- misc/translator/po/sl-SI-staff-prog.po | 424 +++--- misc/translator/po/sq-AL-marc-MARC21.po | 2 +- misc/translator/po/sq-AL-marc-NORMARC.po | 2 +- misc/translator/po/sq-AL-marc-UNIMARC.po | 2 +- misc/translator/po/sq-AL-opac-bootstrap.po | 1454 ++++++++----------- misc/translator/po/sq-AL-pref.po | 8 + misc/translator/po/sq-AL-staff-help.po | 2 +- misc/translator/po/sq-AL-staff-prog.po | 424 +++--- misc/translator/po/sr-Cyrl-marc-MARC21.po | 2 +- misc/translator/po/sr-Cyrl-marc-NORMARC.po | 2 +- misc/translator/po/sr-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/sr-Cyrl-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/sr-Cyrl-pref.po | 8 + misc/translator/po/sr-Cyrl-staff-help.po | 2 +- misc/translator/po/sr-Cyrl-staff-prog.po | 424 +++--- misc/translator/po/sv-SE-marc-MARC21.po | 2 +- misc/translator/po/sv-SE-marc-NORMARC.po | 2 +- misc/translator/po/sv-SE-marc-UNIMARC.po | 2 +- misc/translator/po/sv-SE-opac-bootstrap.po | 1457 ++++++++----------- misc/translator/po/sv-SE-pref.po | 8 + misc/translator/po/sv-SE-staff-help.po | 2 +- misc/translator/po/sv-SE-staff-prog.po | 432 +++--- misc/translator/po/sw-KE-marc-MARC21.po | 2 +- misc/translator/po/sw-KE-marc-NORMARC.po | 2 +- misc/translator/po/sw-KE-marc-UNIMARC.po | 2 +- misc/translator/po/sw-KE-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/sw-KE-pref.po | 8 + misc/translator/po/sw-KE-staff-help.po | 2 +- misc/translator/po/sw-KE-staff-prog.po | 424 +++--- misc/translator/po/ta-LK-marc-MARC21.po | 2 +- misc/translator/po/ta-LK-marc-NORMARC.po | 2 +- misc/translator/po/ta-LK-marc-UNIMARC.po | 2 +- misc/translator/po/ta-LK-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ta-LK-pref.po | 8 + misc/translator/po/ta-LK-staff-help.po | 2 +- misc/translator/po/ta-LK-staff-prog.po | 424 +++--- misc/translator/po/ta-marc-MARC21.po | 2 +- misc/translator/po/ta-marc-NORMARC.po | 2 +- misc/translator/po/ta-marc-UNIMARC.po | 2 +- misc/translator/po/ta-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ta-pref.po | 8 + misc/translator/po/ta-staff-help.po | 2 +- misc/translator/po/ta-staff-prog.po | 424 +++--- misc/translator/po/tet-marc-MARC21.po | 2 +- misc/translator/po/tet-marc-NORMARC.po | 2 +- misc/translator/po/tet-marc-UNIMARC.po | 2 +- misc/translator/po/tet-opac-bootstrap.po | 1442 ++++++++----------- misc/translator/po/tet-pref.po | 8 + misc/translator/po/tet-staff-help.po | 2 +- misc/translator/po/tet-staff-prog.po | 430 +++--- misc/translator/po/th-TH-marc-MARC21.po | 2 +- misc/translator/po/th-TH-marc-NORMARC.po | 2 +- misc/translator/po/th-TH-marc-UNIMARC.po | 2 +- misc/translator/po/th-TH-opac-bootstrap.po | 1381 ++++++++---------- misc/translator/po/th-TH-pref.po | 8 + misc/translator/po/th-TH-staff-help.po | 2 +- misc/translator/po/th-TH-staff-prog.po | 424 +++--- misc/translator/po/tl-PH-marc-MARC21.po | 2 +- misc/translator/po/tl-PH-marc-NORMARC.po | 2 +- misc/translator/po/tl-PH-marc-UNIMARC.po | 2 +- misc/translator/po/tl-PH-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/tl-PH-pref.po | 8 + misc/translator/po/tl-PH-staff-help.po | 2 +- misc/translator/po/tl-PH-staff-prog.po | 427 +++--- misc/translator/po/tr-TR-marc-MARC21.po | 2 +- misc/translator/po/tr-TR-marc-NORMARC.po | 2 +- misc/translator/po/tr-TR-marc-UNIMARC.po | 2 +- misc/translator/po/tr-TR-opac-bootstrap.po | 1467 ++++++++----------- misc/translator/po/tr-TR-pref.po | 17 +- misc/translator/po/tr-TR-staff-help.po | 2 +- misc/translator/po/tr-TR-staff-prog.po | 535 +++---- misc/translator/po/uk-UA-marc-MARC21.po | 2 +- misc/translator/po/uk-UA-marc-NORMARC.po | 2 +- misc/translator/po/uk-UA-marc-UNIMARC.po | 2 +- misc/translator/po/uk-UA-opac-bootstrap.po | 1438 ++++++++---------- misc/translator/po/uk-UA-pref.po | 8 + misc/translator/po/uk-UA-staff-help.po | 2 +- misc/translator/po/uk-UA-staff-prog.po | 432 +++--- misc/translator/po/ur-Arab-marc-MARC21.po | 2 +- misc/translator/po/ur-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ur-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ur-Arab-opac-bootstrap.po | 1383 ++++++++---------- misc/translator/po/ur-Arab-pref.po | 8 + misc/translator/po/ur-Arab-staff-help.po | 2 +- misc/translator/po/ur-Arab-staff-prog.po | 424 +++--- misc/translator/po/vi-VN-marc-MARC21.po | 2 +- misc/translator/po/vi-VN-marc-NORMARC.po | 2 +- misc/translator/po/vi-VN-marc-UNIMARC.po | 2 +- misc/translator/po/vi-VN-opac-bootstrap.po | 1421 ++++++++---------- misc/translator/po/vi-VN-pref.po | 8 + misc/translator/po/vi-VN-staff-help.po | 2 +- misc/translator/po/vi-VN-staff-prog.po | 432 +++--- misc/translator/po/zh-Hans-CN-marc-MARC21.po | 2 +- misc/translator/po/zh-Hans-CN-marc-NORMARC.po | 2 +- misc/translator/po/zh-Hans-CN-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-CN-opac-bootstrap.po | 1436 ++++++++---------- misc/translator/po/zh-Hans-CN-pref.po | 8 + misc/translator/po/zh-Hans-CN-staff-help.po | 2 +- misc/translator/po/zh-Hans-CN-staff-prog.po | 426 +++--- misc/translator/po/zh-Hans-TW-marc-MARC21.po | 2 +- misc/translator/po/zh-Hans-TW-marc-NORMARC.po | 2 +- misc/translator/po/zh-Hans-TW-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-TW-opac-bootstrap.po | 1446 ++++++++----------- misc/translator/po/zh-Hans-TW-pref.po | 8 + misc/translator/po/zh-Hans-TW-staff-help.po | 2 +- misc/translator/po/zh-Hans-TW-staff-prog.po | 428 +++--- opac/opac-password-recovery.pl | 16 +- 576 files changed, 69599 insertions(+), 83193 deletions(-) copy misc/release_notes/{release_notes_16_11_09.html => release_notes_16_11_13.html} (54%) create mode 100644 misc/release_notes/release_notes_16_11_13.md hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Oct 24 09:59:37 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 24 Oct 2017 07:59:37 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-164-g1a2e52f 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.05.x has been updated via 1a2e52f494918cb8ad4a529ed9d099281501f179 (commit) via 58bbdb61298c4f6e699e308ba227f9da45bd94b1 (commit) via 1766d21389a104948aba639921d987674cba3d6b (commit) via 8cd8df19480a3765e54c3dcfb4948b097e7ea5ad (commit) via b3884ec092cd80268fa2f484ab95984d434f1c78 (commit) via 30811a653eb2f5e6ab089094bbb9936756aa9a16 (commit) via f2b53042bd94ae4427ad08f5c55944974458ded4 (commit) via d3f3512d3f480e3a7a36c3917e6748fef825d34f (commit) via 3d3900b53c31e0e7567760bf69128fc52998d075 (commit) via 4f2dede23fe09d68f94276d8e26b58091c590c9e (commit) via 3e2db351f299ca4b462725b781d7c54086f849bf (commit) via f8bac19351fad964b08e4047f33f7b9b8c775e58 (commit) via 1b29d6e087055969def157245b1bc4f72a030406 (commit) via 21f2d6c813196b722cb640f556cd2322d8c93788 (commit) via 7aee7d583d019f124f784ce34b978bfd704c1714 (commit) via f53b6ec248322706033695ef2928921d0aaa36aa (commit) via b4326600132bb3d87764687385cc13a19dd35c54 (commit) via 6db90c0cb97a9d03669d97bbc7465a6a27ff16f0 (commit) via ed45e76bf928a5c929525b8f2795524ada217a1e (commit) via c7b47b3dfa689e8b746d188c648ad257feb678b6 (commit) via 96e747dca35ba717b7081030b7f4e34db48f0728 (commit) via 47ee62f0d00527987d427f6685a2aaecc11c2b21 (commit) via e87f428a919e1ba629c067ef708323fadab24021 (commit) via 2ee997768d9f3cbbe351b6ba13ee472d3a94a6c5 (commit) via ac99a1244abff2a80e77d9887df0d64dcf75c68e (commit) via ea441e7d093ce8c54bac9a9ca64d02faaf462d7f (commit) via ae29acfb26548b32eff2a0cdaace0fe1fb5b2796 (commit) via d8e09eaec4b7bcbeb66a4e33fbe1adb2fc976fcf (commit) via 17f207f2e98c3e962001864013046243b47deeb6 (commit) via 64f1d88543fe7b88cf4b0535db355caeb99d47d4 (commit) via ba57d7a30c4bb7df04368db3e45415014a8edbf2 (commit) via 8b5f6db81fc63b653a22009cb397b2558f945591 (commit) via c0a81f0b7e26a548e372965514d94c862ac6f704 (commit) via 750c5f958654e8b6e17dee1a8202b3426e70f443 (commit) via 97ac383dbaba638f8b8bc994e934f21cdaf8fe01 (commit) via e534fdacd15471bb07bf88d7d4b352f396085a15 (commit) via 8933e69863a581a799767af4d0a0e1e7b908e238 (commit) from 699ac0eba3b9acc057cdcf317a549df9b416d08c (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 1a2e52f494918cb8ad4a529ed9d099281501f179 Author: Aleisha Amohia Date: Tue Aug 29 21:21:00 2017 +0000 Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername' ... when referring to the name of the vendor. To test: 1) Confirm vendor shows on webpage title (tab name) 2) Confirm vendor shows in breadcrumbs 3) Confirm vendor shows in heading when viewing basket ('Basket x (1) for vendor') Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Caroline Cyr La Rose Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 06b602b0976e2a8d53ff31f95a2213cbeb98e9cb) Signed-off-by: Fridolin Somers commit 58bbdb61298c4f6e699e308ba227f9da45bd94b1 Author: Aleisha Amohia Date: Sun Aug 27 23:00:15 2017 +0000 Bug 19180: Add vendor name to breadcrumbs when closing an order To test: 1) Go to Acquisitions 2) Find a vendor and a basket 3) Click 'Close basket' button 4) Notice that on confirmation page, breadcrumbs are missing vendor 5) Apply patch and refresh page 6) Vendor name should now show 7) Confirm link to vendor works as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 438a3dea0c8ef1a5adcec58d8b97474d14ccca9b) Signed-off-by: Fridolin Somers commit 1766d21389a104948aba639921d987674cba3d6b Author: Aleisha Amohia Date: Wed Aug 30 04:36:50 2017 +0000 Bug 16204: Show friendly error message if trying to edit record which no longer exists To test: 1) Create a record 2) Click Edit -> Edit record. open this in another tab 3) Delete the record in the original tab 4) Refresh the edit form in the other tab. Notice the software error 5) Apply patch and refresh page 6) There should be a nice error message with the form fields and buttons hidden. Confirm links work as expected. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 17c5b76597b9a356bc215a3682d7293e307fcc46) Signed-off-by: Fridolin Somers commit 8cd8df19480a3765e54c3dcfb4948b097e7ea5ad Author: Owen Leonard Date: Thu Jun 8 16:01:32 2017 +0000 Bug 15644 - City dropdown default selection when modifying a patron matches only on city This patch modifies the include files which contain the form fields for city, state, zipcode, etc. shown on the patron entry screen. The files are modified so that the city/state/zip preselects a value based on city, state, and zipcode matching the values in the corresponding text fields. To test, confirm that the bug's steps to reproduce are fixed: - Enter two cities via Administration -> Patrons and circulation -> Cities and towns: Springfield, MA 01101 Springfield, VT 05156 - Edit a patron choosing, Springfield VT, and save. - Edit the patron again and confirm that the correct city is pre-selected. - Confirm this result with all three different settings of the "AddressFormat" system preference. Signed-off-by: Amit Gupta Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 83704cb1fab33feb0262fdab99bccf0052243d14) Signed-off-by: Fridolin Somers (cherry picked from commit 8cd8df19480a3765e54c3dcfb4948b097e7ea5ad) Signed-off-by: Katrin Fischer commit aec169578298e56bb41cf0534442231486187d5a Author: Julian Maurice Date: Fri Sep 1 16:07:36 2017 +0200 Bug 18742: (QA followup) Fix indentation Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 0ae70349809d51552e4297625db1382aa4e26dc5) Signed-off-by: Fridolin Somers (cherry picked from commit b3884ec092cd80268fa2f484ab95984d434f1c78) Signed-off-by: Katrin Fischer commit 5cd43029a2e1993e275be12227f86daaec746fb3 Author: Nick Clemens Date: Wed Jun 7 10:56:47 2017 -0400 Bug 18742: Circulation statistics wizard no longer exports the total row To test: - Run the circulation wizard - Export to csv - Note there is no total row - Apply patch - Export to csv - Total row totally there! Signed-off-by: Christopher Brannon Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9) Signed-off-by: Fridolin Somers (cherry picked from commit 30811a653eb2f5e6ab089094bbb9936756aa9a16) Signed-off-by: Katrin Fischer commit e2ee7118d0c97cb008b242b61a00a98f2c6e62c6 Author: Tomas Cohen Arazi Date: Mon Sep 18 15:58:15 2017 -0300 Bug 19337: Make basic_workflow.t configurable through ENV This patch makes the basic_workflow.t selenium tests read ENV for the following vars: KOHA_USER KOHA_PASS KOHA_INTRANET_URL SELENIUM_ADDR SELENIUM_PORT to properly configure the running environment. If absent, all variables fallback to current behaviour: KOHA_USER // 'koha' KOHA_PASS // 'koha' KOHA_INTRANET_URL (unchanged) SELENIUM_ADDR // 'localhost' SELENIUM_PORT // 4444 [*] Selenium defaults are documented on the Selenium::Remote::Driver docs. Prerequisites: Make sure you have a working environment for the Selenium tests: - Run: $ sudo apt update $ sudo apt install xvfb firefox-esr To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ wget https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar \ -O /tmp/selenium.jar k$ SELENIUM_PATH=/tmp/selenium.jar k$ Xvfb :1 -screen 0 1024x768x24 2>&1 >/dev/null & k$ DISPLAY=:1 java -jar $SELENIUM_PATH & k$ prove t/db_dependent/selenium/basic_workflow.t => SUCCESS: Tests pass - Apply this patch - Run: k$ prove t/db_dependent/selenium/basic_workflow.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6) Signed-off-by: Fridolin Somers (cherry picked from commit f2b53042bd94ae4427ad08f5c55944974458ded4) Signed-off-by: Katrin Fischer commit ea2dd33e30af5e69c546f4330a892bebcdaf0cfd Author: Dominic Pichette Date: Tue Sep 12 10:13:58 2017 -0400 Bug 18584 - removed white space in C4/Accounts.pm Test Plan: 1-go to C4/Accounts.pm 2-there should not be a trailing space at line 279. Signed-off-by: Dominic Pichette Signed-off-by: Jonathan Druart (cherry picked from commit 5400795a6651adc021801052fa0186747983b587) Signed-off-by: Fridolin Somers (cherry picked from commit d3f3512d3f480e3a7a36c3917e6748fef825d34f) Signed-off-by: Katrin Fischer commit b7c622aef048d137eca9be6e30497c5c92d79c7e Author: Jonathan Druart Date: Wed Sep 6 11:23:10 2017 -0300 Bug 12346: Display the correct number of pending patron modifications on the patron module home page Due to the way members-home.pl handles the variable $branch, the number of patron modifications listed on members-home.pl may differ from the number listed on mainpage.pl. When the librarian clicks this link, he or she may see a different number than was listed, or none at all! Test Plan: 0) Set IndependentBranchesPatronModifications = Yes 1) Create a number of modification request for BranchA 2) Log into the staff intranet with a patron without superlibrarian permissions and set your branch to BranchB 3) Note the modifications alert to does not display on mainpage.pl 4) Click the "Patrons" link to take you to members-home.pl 5) Note the modifictions alert does display on this page 6) Apply this patch 7) Reload members-home.pl, note the alert no longer displays QA notes: What was the point of the branch variable? Followed test plan, patch worked as described. Also passed QA test tool Signed-off-by: Alex Buckley Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 4efe251f353cb9eddd302b6214e1f4392620b395) Signed-off-by: Fridolin Somers (cherry picked from commit 4f2dede23fe09d68f94276d8e26b58091c590c9e) Signed-off-by: Katrin Fischer commit c1d72e60df9ac1378ed7a8d0be903ab8be34c86a Author: Katrin Fischer Date: Sun Oct 29 18:42:12 2017 +0100 Bug 18801: DBRev 16.11.13.001 commit 73213fbefc06dea7c98df3363a6a8ca6621a3e20 Author: Marcel de Rooy Date: Thu Jun 15 15:47:21 2017 +0200 Bug 18801: [Follow-up] Dbrev to repair bad auth type codes Test plan Run updatedatabase. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit aa03981e79a10bd5a032f13533d93f0b87bd37f7) Signed-off-by: Fridolin Somers (cherry picked from commit ed45e76bf928a5c929525b8f2795524ada217a1e) Signed-off-by: Katrin Fischer commit a19c652f8faeb9c3477fe5fc4f03eb33f525e494 Author: Nick Clemens Date: Wed Jun 14 09:19:10 2017 -0400 Bug 18801 - Merging authorities has an invalid 'Default' type in the merge framework selector To test: 1 - Find two authorities and start a merge 2 - Leave the dropdown at 'Default' 3 - Merge records and note you get an error and can no longer view the new record 4 - Check DB value of record authtypecode = 'Default' 5 - Apply patch 6 - Find two other authorities 7 - Merge leaving selector at default 8 - Success 9 - Check DB value of record authtypecode = '' Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit c1112236f908626b273f7dc950807ce2e085db2d) Signed-off-by: Fridolin Somers (cherry picked from commit c7b47b3dfa689e8b746d188c648ad257feb678b6) Signed-off-by: Katrin Fischer commit 2ce56249346ba9262ea81deab63eb10274345064 Author: Jonathan Druart Date: Wed Sep 6 10:42:28 2017 -0300 Bug 19262: Remove xt/author/pod_spell.t If you run `prove xt/author/pod_spell.t` without having Test::Spelling installed, it will skip the tests. If you install the lib-test-spelling-perl, the test will fail: xt/author/pod_spell.t .. You said to run 0 tests at xt/author/pod_spell.t line 21. xt/author/pod_spell.t .. Dubious, test returned 25 (wstat 6400, 0x1900) No subtests run This is because the call to all_pod_files_spelling_ok is expecting a path If we try to fix it with adding "." as parameter, the tests will raise tone of errors. Let's remove this file Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 35e3de845c591958d66c6602940453f2a803a7ee) Signed-off-by: Fridolin Somers (cherry picked from commit d8e09eaec4b7bcbeb66a4e33fbe1adb2fc976fcf) Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 2 +- C4/AuthoritiesMarc.pm | 2 +- C4/Budgets.pm | 12 +-- Koha.pm | 2 +- Koha/QueryParser/Driver/PQF/query_plan/node.pm | 2 +- acqui/basketheader.pl | 34 ++++---- cataloguing/addbiblio.pl | 10 ++- cataloguing/additem.pl | 33 ++++---- installer/data/mysql/updatedatabase.pl | 17 ++++ .../en/includes/circ-patron-search-results.inc | 3 +- .../en/includes/member-main-address-style-de.inc | 2 +- .../en/includes/member-main-address-style-us.inc | 2 +- .../prog/en/includes/prefs-admin-search.inc | 2 +- .../prog/en/modules/admin/preferences.tt | 2 + .../prog/en/modules/authorities/authorities.tt | 8 ++ .../prog/en/modules/authorities/merge.tt | 1 - .../prog/en/modules/cataloguing/addbiblio.tt | 13 +++ .../prog/en/modules/cataloguing/additem.tt | 40 +++++++--- .../prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 16 ++-- .../bootstrap/en/modules/opac-discharge.tt | 7 +- members/members-home.pl | 14 ++-- opac/opac-discharge.pl | 5 ++ opac/opac-password-recovery.pl | 1 + reports/issues_stats.pl | 6 ++ reserve/request.pl | 3 +- t/db_dependent/Budgets.t | 83 +++++++++++++++++++- .../Circulation/NoIssuesChargeGuarantees.t | 1 + t/db_dependent/DecreaseLoanHighHolds.t | 5 +- t/db_dependent/SIP/Patron.t | 18 ++++- t/db_dependent/Search.t | 2 +- t/db_dependent/selenium/basic_workflow.t | 21 +++-- t/db_dependent/www/auth_values_input_www.t | 6 +- xt/author/pod_spell.t | 22 ------ 34 files changed, 282 insertions(+), 117 deletions(-) delete mode 100644 xt/author/pod_spell.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Oct 30 14:05:58 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 30 Oct 2017 13:05:58 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.13-37-g389dd63 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, 16.11.x has been updated via 389dd63c4e6ded84aba441c0c254537645d7a153 (commit) from a84c842f0930b7e216f3c0d53791b414912c4e9f (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 389dd63c4e6ded84aba441c0c254537645d7a153 Author: Katrin Fischer Date: Mon Oct 30 12:47:02 2017 +0000 Bug 18999 (follow-up) - Fix failing test Test was using methods not present in 16.11.x, fixed by rewriting to old API. ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Budgets.t | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository