[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-33-g96fa3f5
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 2 00:41:01 CEST 2017
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 <aleishaamohia at hotmail.com>
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 <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit d51059807690797aa4d16b0c0dd2932235a3b683)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e570915729b6b8e02e22b0cfdff4440b75815d26)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 915f5d1ca18eafac9e0ba633e86e3bece8d12a5e
Author: Marc Véron <veron at veron.ch>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 23cc8b39682fea7b0a9150933c65c34ef22d23dd)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 861fa8c8db8bd8bbd6281863d5029d55675f359c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit acf28ae38c885cb0e59013c743841ef92b662f83
Author: Marc Véron <veron at veron.ch>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 255cadeb772d63b06f77146c95b8d6e4b31d5836)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e0adbc10c09c25310f79fec55518fb5df50ad040)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0c30269d9eed47749b97275b35dfe3ba5dd2cbc2
Author: Marc Véron <veron at veron.ch>
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 <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 331320f93a5ef5293c3bcad80b9554ddea0196b0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4dc640244651c584347b01f35f2cb25b6369a638)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit db9975db23c98d6a131a42f91e31796c8be179cf
Author: Marc Véron <veron at veron.ch>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b17412da1b14dca4d42ed534482abdeff1c2fd2f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c583929799f87e7092cad06a4e1cc1855630411a
Author: Marc Véron <veron at veron.ch>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ae684fc9491102ba0b560ca6f414a325e763b31a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b1bce06e515e22482ca555b85da19f965b475f5f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit df8a9f82a6cf8fba92cbee9c171410fe01d500de
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 78e527129b0b547eff7311c3f25a4b1f679d2a97)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b0d86d10443809f3762bdac75a59d704f1a3976b
Author: Marc Véron <veron at veron.ch>
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 <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 752aef4593f1aa2d64700bf9738e7e03907eb1cd)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 65e09b28dbbe43772b9104ffcafa1f81441c4d70)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3e23ffe5845c44008cf462e8dfd8d4c78a755561
Author: Marc Véron <veron at veron.ch>
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:
<abbr title="Differences between the original biblio and the imported" lang="en">Diff</abbr>
In translations (e.g. German), the line appears as follows:
<abbr title="Unterschiede zwischen Originaltitelsatz und importiertem Titelsatz" lang="en">Diff</abbr>
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 <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ba61c6b8054b34c58dc5914088c200fac529c402
Author: Lee Jamison <ldjamison at marywood.edu>
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 <enable_plugins> 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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1076a0edf32b621da54c53ea71595885f7e14c38)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit cdcc0458b796aff59a50e0f5d4c7b7140682eacf)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2ea0bac58bbe58f5fb53e66829e217ca87799928
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ea886885d0efa0200cfa166453a4495692afc4d4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3e9af632d97f412d44fe4a11e97edd990b0d3ad1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1c0f36468749af352caac6e861a0ed514698adec
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 <aleishaamohia at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 44a8fc5b9363eb27223f32e1150fb8fff6f55d08)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 916d564055502aac3d09e227d90a0f3f6d291cdd)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f3571db3365e7b6d3a25133e146992d73df38280
Author: Tomas Cohen Arazi <tomascohen at theke.io>
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 <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 7efb871fa31869044045ccef0b37be438ba704ff)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 67462ae8704cd8a41a6939b5ee7c47010d9942e6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7042e2ce9d9db6f0704befe35c2289ac36fd35c4
Author: Mark Tompsett <mtompset at hotmail.com>
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 <ldjamison at marywood.edu>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit e4573d709936bbd7f454a26f073e2131aa9c8df3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e4995e5196621f8d9aa76301af68064e39fdac6a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 091ef48f4240724877a0b492aa1d6e11aa51a502
Author: Nick Clemens <nick at bywatersolutions.com>
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 <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c26108afa776b9de93ebe7c334c0eeff8ea2ed98)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b6cc1f06b6cf0a277b20af882a485fb4fe4b3604
Author: Nick Clemens <nick at bywatersolutions.com>
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 <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fec723524cbd972b4788f34e105908697c43ea01)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5e7897f21c844016a586fdef53885a56bbb0b678
Author: Marc Véron <veron at veron.ch>
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 <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c140b9129124262db27c9ba17f47134ec3232ada)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 04c76ad707e83558fd619d6c73f4a0b9094b8e70)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b6632784b4f4c2f2352e064bd9c38cb43973af47
Author: Nick Clemens <nick at bywatersolutions.com>
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 <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0e2c823e8806c35673505d0e2a03081cac00190a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8818b604696512da7d094101036c8704ba315d96)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 936bcce4ba9c15d45f241cbce80e489a043687da
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 14 11:06:16 2017 +0000
Bug 18941 - Unit tests
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 22944fb61241239124b4db218d098b8510327276)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 69f0c2ece61abb2b512ba9189369b9fbec22941d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3fcfb2c00326697955be7cd0d747e3d5feb4450c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 10 15:52:35 2017 -0300
Bug 13012: Add more tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 28a979487f3d8c4a5887c484ae71c7c63e7ee03d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0b83a18907c8bcefeaa978d44a62736390e4bcf8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit aefcb510aee6452034f4f2a7f6c536e5cbb73e40
Author: Kyle M Hall <kyle at bywatersolutions.com>
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 <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b2a8e726fe32d4aae3f279f4142af240c60d7fe5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e03ae320f7705cbf0a9e8ce872c5218ac901dab7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3b0827ef4f6da188d4c140834794d52614fc9c10
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 8651016ce8e959b5b6ca19ccddbb3f5342b5d456)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3cdea3aaf6194cc9e448a424e2646867e9c3ddd1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a51fad02e41c354a0be1fcdca5dbd911d9b26b42
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b80704aa1b763c7a29c3b95c162dfb12ded8faa2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9f8b896d707905043f75a3a86ab29c3ed2eaffa6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a8ae524ffea9bc12de6196e1937155300faccb1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 10 15:06:39 2017 -0300
Bug 19047: Fix AddBiblio call in ShelfBrowser.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b4ce1feb1bc6b4f20cf71bd545e018917cf518db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2b903d74acbdefbfb1dd678f23dc57f655262940)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cbf9b7d50aae0c78c52ae3822b05899607b6a690
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c6f8cf69d3943599fa6a0c250ae0e8221ead44ff)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c22e87282095a3e97c1bdc8c9944464d5ae4d617)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c3844b2ab5750c7708cfbec1e5f26ebc7e319f4f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
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 <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit e3dafbfccd06af8fca45fada449e93e3d0616cd6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d1b5a9f5bb4a28e86fbd2f3c0ca3127a98d2d4d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 369216769b4dfd4a75f03792c3273eb8c9b5e280
Author: Mark Tompsett <mtompset at hotmail.com>
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 <ldjamison at marywood.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit d01ce104a7711814152e4f8228064f79c8a7f68c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 306614068eb20cc52dfb6b69227f72e0e37baf1e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c1f29c5914e612212e43b0c1cbe441380cf50c67
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 1 11:44:29 2017 -0300
Bug 17699: Reset time simulation
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0853c4e2b4366a235077a24a873fc81a754afecb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d3e6a1a5fd9246811ef0036c6234c7a2cf11f7b3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 57387aa4278f13b135036182bfe0cb721e3e8431
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
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 <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ec9b691de934f82c50057c15fb7d3a1b32717b72)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit af0cdbaa24033ff2494a3afc721fb0cf6711020c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bdda52d14b19898d40a03a96c774724bc964bdce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
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 <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 24b4006ecbc0a258b09500bdd8f639c7018067c0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit cdfa1b0db7f98be3da503861075fecafeff9e600)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit caeab6a7e55cca56325dd6fee062face9df998e3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
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 <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 9512b015662f8ec56d8b8884b4e4bb14d5e563f1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1416b65e0949deca4a83b41c9ef1df1be5eb433e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7f27e04dace4922b5bc44fc6297a6700ea0b009a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
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 <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0bcf6a79427297c332588317dde749e923c7bbdc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1f19154532f438319aa789d8b7cdabb14f53275a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e0f09538d0d241e9b132929bb491634ecdbc7544
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
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 <tomascohen at theke.io>
Easy fix
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b7d291a1ee692d6de71503683a3e61c9311c33d8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b59ce0c61785a317d06eac14fafd16070b21e479)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
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
More information about the koha-commits
mailing list