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 b9b824559d336150afb27836c2c8e36ca3ad4900 (commit) via 5e41df9101667304a09da007e7ef1104c4fdfeb6 (commit) via 55abcbee5323b16071392cdc3f0dc38b0f1c3cfe (commit) via ad2b04001fe3100a5caeafbbdd5ea56a6ff65e1a (commit) via 198096ffab71ced1aa6ce453ee5c08fc43d0b5d3 (commit) via 30faa632e95362e0f80cf42f9fa37e96047e4a74 (commit) via 946d5bcdd2ccaefaba2596b8be1278781d1cc482 (commit) via 84ce1fb5921cdddf2368f0c330dede0f602742d0 (commit) via d632da51c80f9c4215c6952793353803038d98d3 (commit) via ccc71f6cf13334d554cad74ae85df2e8be3e3649 (commit) via cc8f3dc1cc046ecd7d53349091fbba864dfb91c9 (commit) via d8b6fde9b7f59ba32f4726f55acb6f803c7816d6 (commit) via 654d8c0cfd6cd2643e2deed7bb18618ea740cace (commit) via 5e9c703d2bef25f7ada760952d3e070203376a05 (commit) via 4218875ec039dc375124f969caea1624399c21a4 (commit) via 84d6c23eddf8744a61e06432b0f443753138d7f2 (commit) via dd0469132cf5aee7fded7e69949b4e6e2e54694b (commit) via 999f2ed7e9e56dda254308f9bbbc85dcc66a160c (commit) via f3b8f17395f05548c87129d286a3f49d0b171e0b (commit) via 8acf5912b3fd213b8bcb3e7ee9b47f7cb086002b (commit) via 9a3d12e35e20766a2175c68f870a48058a25d6ec (commit) via b068259521ebea158e8b664cfbab46d5a65495ff (commit) via 7513c70ef04f9326a8f726556788ea85c098ae60 (commit) via 9b1a5cd640a69f6accb6e35eb02eebd35d8af338 (commit) via e8ac2d38331872bc812f6ed32cf2fc5735a88bde (commit) via 015e7ee3331ededee37dd68a7e9743b93605b05a (commit) via cb35784d3cf9fc878859200bcab8f577583d8b07 (commit) via 8fb700b81dac0e180d1acf24c50420b4f6939fd5 (commit) via 4cdf3e38afd608bcd0f8a1c7b6918d40ad84859f (commit) from 33618eaec3eedf148a235d246e5ccc9ebc9ae7c3 (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 b9b824559d336150afb27836c2c8e36ca3ad4900 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Tue Apr 10 16:31:44 2018 +0200 Bug 19904: (follow-up) Add Nick Clemens as RM assistant See comments on Bugzilla report and wiki roles page for 18.05. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 5e41df9101667304a09da007e7ef1104c4fdfeb6 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Mon Apr 9 14:29:40 2018 +0200 Bug 19904: Release team for 18.05 First moved all relevant 17.11 release team entries to the development section, and then updated the release team section from the wiki 18.05 roles page. Test plan: [1] Check if Koha team tab on about looks as it should. [2] Verify changes with 17.11 and 18.05 roles. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 55abcbee5323b16071392cdc3f0dc38b0f1c3cfe Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Wed Apr 11 16:50:37 2018 -0300 Bug 19289: DBRev 17.12.00.027 Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit ad2b04001fe3100a5caeafbbdd5ea56a6ff65e1a Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Apr 9 12:52:31 2018 -0300 Bug 19289: (follow-up) Add existing fields to the ACQ framework Changes for other frameworks Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 198096ffab71ced1aa6ce453ee5c08fc43d0b5d3 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Fri Apr 6 17:15:34 2018 -0300 Bug 19289: Extend size of inputs to 50 Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 30faa632e95362e0f80cf42f9fa37e96047e4a74 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Tue Feb 27 10:38:47 2018 -0300 Bug 19289: Use copyrightdate instead of publicationyear for MARC21 See comment 24 Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 946d5bcdd2ccaefaba2596b8be1278781d1cc482 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Fri Jan 19 14:13:48 2018 -0300 Bug 19289: Use jQuery validate plugin This is quite dirty but rewrite the JS checks is out of the scope of this bug report. Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 84ce1fb5921cdddf2368f0c330dede0f602742d0 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Fri Oct 13 17:35:11 2017 -0300 Bug 19289: Use the ACQ framework to display bibliographic details The ACQ MARC framework is only used for the ‘Item’ block. This patch add the ability to define biblio fields (!= 995 or 952) to customize the display of the bibliographic details when ordering. This new feature is controlled by a new pref: UseACQFrameworkForBiblioRecords Test plan: - Create a new installation to populate the ACQ framework correctly - Set the pref UseACQFrameworkForBiblioRecords to "Use" - Create a new order => You will see the lib from the ACQ framework - Add/remove/update biblio subfields in the ACQ framework - Create a new order => You should see the new subfields displayed Note for QA: I though I would be able to refactor existing code to make it more flexible, but it is a bit messy and lost a lot of time. I finally decided to copy/paste the existing code. I simplified it as, I think, we do not want the plugin, etc. like in the full biblio editor. Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Nicolas Legrand <nicolas.legr...@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit d632da51c80f9c4215c6952793353803038d98d3 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Thu Oct 26 17:29:36 2017 -0300 Bug 19289: Add existing fields to the ACQ framework When ordering, the bibliographic details contain the title, author, publisher code, publication year, isbn and series info. To avoid regression to provide the same behaviour, we will add these fields to the ACQ framework NOTE: This patch makes the change only for - en - fr / unimarc complet Other frameworks will be updated before to be pushed, to avoid unecessary rebases Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Nicolas Legrand <nicolas.legr...@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit ccc71f6cf13334d554cad74ae85df2e8be3e3649 Author: Katrin Fischer <katrin.fischer...@web.de> Date: Sat Apr 7 10:59:47 2018 +0200 Bug 20540: (follow-up) Remove debug line Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit cc8f3dc1cc046ecd7d53349091fbba864dfb91c9 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Fri Apr 6 17:16:30 2018 -0300 Bug 20540: Fix TransformHtmlToXml if last tag is empty This bug has been found during testing bug 19289. In some conditions C4::Biblio::TransformHtmlToXml will generate a malformed XML structure. The last </datafield> can be duplicated. For instance, if a call like: my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values ); with the last value of @field_values is empty, it will return: <?xml version="1.0" encoding="UTF-8"?> <collection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd" xmlns="http://www.loc.gov/MARC21/slim"> <record> <datafield2 tag="020" ind1=" " ind2=" "> <subfield code="a">l</subfield> </datafield> <datafield1 tag="100" ind1=" " ind2=" "> <subfield code="a">k</subfield> </datafield> <datafield1 tag="245" ind1=" " ind2=" "> <subfield code="a">k</subfield> </datafield> <datafield1 tag="250" ind1=" " ind2=" "> <subfield code="a">k</subfield> </datafield> <datafield1 tag="260" ind1=" " ind2=" "> <subfield code="b">k</subfield> <subfield code="c">k</subfield> </datafield> </datafield> </record> </collection> Which will result later in the following error: :23: parser error : Opening and ending tag mismatch: record line 6 and datafield </datafield> ^ :24: parser error : Opening and ending tag mismatch: collection line 2 and record </record> ^ :25: parser error : Extra content at the end of the document </collection> Test plan: You can test it along with bug 19289 and confirm that it fixes the problem raised on bug 19289 comment 30 Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit d8b6fde9b7f59ba32f4726f55acb6f803c7816d6 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Wed Oct 11 14:41:17 2017 +0200 Bug 18625: (QA follow-up) Simplify update_lastseen No need to check the pref. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 654d8c0cfd6cd2643e2deed7bb18618ea740cace Author: Colin Campbell <colin.campb...@ptfs-europe.com> Date: Thu May 18 15:59:49 2017 +0100 Bug 18625: Update lastseen in patron info request Many services use SIP patron req info to validate a patron against the koha database. If recording lastseen sites will also want to record that the user has accessed these library facilities although they have not logged into koha Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Verified that Patron Info request (63) updates lastseen when the pref has been enabled. Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 5e9c703d2bef25f7ada760952d3e070203376a05 Author: Nick Clemens <n...@bywatersolutions.com> Date: Fri Oct 27 02:23:22 2017 +0000 Bug 18625: (QA follow-up) Unit tests Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 4218875ec039dc375124f969caea1624399c21a4 Author: Mark Tompsett <mtomp...@hotmail.com> Date: Tue Jan 30 19:53:32 2018 +0000 Bug 20104: Update minimum version of Perl to 5.20 This patch not only updates the version check, but repurposes the perlversion parameter, so as to not have to retranslate templates again when the version number changes after this. The changes are very self-evident. Signed-off-by: Roch D'Amour <roch.dam...@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 84d6c23eddf8744a61e06432b0f443753138d7f2 Author: Martin Renvoize <martin.renvo...@ptfs-europe.com> Date: Fri Apr 6 10:22:20 2018 +0100 Bug 20536: (ILL) authnotrequired should be explicitly unset on opac * koha/opac-illrequest.pl - Added explicit setting of authnotrequired Signed-off-by: Mark Tompsett <mtomp...@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit dd0469132cf5aee7fded7e69949b4e6e2e54694b Author: Claire Gravely <claire.grav...@bsz-bw.de> Date: Tue Apr 10 12:46:11 2018 +0000 Bug 20552: Fix HTML tag for search facets The tags for home library and holding library in the 'refine your search' list should be h5. This patch changes the html tag for the availability, holding library and home library facets. To test: - Search for an item in the OPAC where the relevant facet appears - Use 'Inspect element' to check the tag - Apply patch - Confirm the facet now has the h5 tag - Confirm spacing is improved Signed-off-by: Mark Tompsett <mtomp...@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 999f2ed7e9e56dda254308f9bbbc85dcc66a160c Author: Nick Clemens <n...@bywatersolutions.com> Date: Fri Oct 27 11:38:51 2017 +0000 Bug 19538: Move EnableAdvancedCatalogingEdtor from 'Labs' to 'Cataloging' To test: 1 - View sysprefs 2 - Note 'Labs' tab 3 - Note EnableAdvancedCatalogingEditor is the only pref there 4 - Note that prefs works 5 - Apply patch 6 - Note 'Labs' tba is gone 7 - Check the 'Cataloging' tab (under Interface) 8 - There it is! 9 - Verify it still works Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Maksim Sen <maksim....@inlibro.com> Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit f3b8f17395f05548c87129d286a3f49d0b171e0b Author: Owen Leonard <oleon...@myacpl.org> Date: Wed Apr 4 16:33:34 2018 +0000 Bug 20518: Don't show "Messages" header and link on patron details if there are no messages This patch modifies the patron detail page so that the "Messages" header is not displayed if there are no messages. Unrelated: A minor change was made to moremember.pl to quiet an error in the log, "Use of uninitialized value $print in string eq at members/moremember.pl line 219." To test, apply the patch and open the detail page for a patron who has no messages. There should be no "Messages" header or "add message" link. Add a message to the patron's account. The message should appear, along with the "Messages" header and "add message" link. The error logs should show no errors. Signed-off-by: Maksim Sen <maksim....@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 8acf5912b3fd213b8bcb3e7ee9b47f7cb086002b Author: Nick Clemens <n...@bywatersolutions.com> Date: Mon Jan 15 14:11:29 2018 +0000 Bug 9634: Allow for combining same paraneters in SQL reports This patch combines report paramters with the same name and data type (authorised value) This presereves the past ability to provide all parameters as 'sql_params' in order to preserve existing public report links To test: 1 - Create a report that takes multiple parameters, e.g.: SELECT <<cat>> AS one, <<dog|branches>> AS two, <<dog|YES_NO>> as three, <<cat>> as four, <<dog|branches>> as five 2 - Run this report, note you are asked for five parameters 3 - Apply patch 4 - Update database 5 - Run report, note you are asked for three params 6 - Verify the results reflect the supplied parameters 7 - Export the report and verify results 8 - Alter the URL and provide 5 params as sql_params and no param_name variables i.e. http://localhost:8081/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Run+this+report&sql_params=Banana&sql_params=CPL&sql_params=0&sql_params=Orange&sql_params=LPL 9 - Verify results come out as expected. i.e. 5 different values that are those of the URL. Signed-off-by: Victor Grousset <victor.grous...@biblibre.com> Signed-off-by: Charles Farmer <charles.far...@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 9a3d12e35e20766a2175c68f870a48058a25d6ec Author: Tomas Cohen Arazi <tomasco...@theke.io> Date: Wed Apr 11 15:47:01 2018 -0300 Bug 18674: (QA follow-up) Add date and time This patch adds current date and time, formatted as configured. It makes the timezone name be displayed the system uses it (important for the 'local' use case). It removes some warnings too. Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit b068259521ebea158e8b664cfbab46d5a65495ff Author: Tomas Cohen Arazi <tomasco...@theke.io> Date: Thu Apr 5 16:29:23 2018 -0300 Bug 18674: TZ error handling This patch adds C4::Context->timezone bad timezone handling. The calculated 'effective' timezone is tested with the right tool and a fallback to 'local' is added. A warning is printed in the logs. A test for this is added to about.pl too, along with the right warning messages in case of problems. Tests are added for both invalid TZ and to make sure the warning is raised. To test: - Apply the patch - Run: $ kshell k$ prove t/timezones.t => SUCCESS: All tests pass Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 7513c70ef04f9326a8f726556788ea85c098ae60 Author: Tomas Cohen Arazi <tomasco...@theke.io> Date: Wed Apr 4 20:49:07 2018 +0000 Bug 18674: Style changes to match other entries Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 9b1a5cd640a69f6accb6e35eb02eebd35d8af338 Author: Mark Tompsett <mtomp...@hotmail.com> Date: Mon Apr 2 15:24:25 2018 -0400 Bug 18674: Allow TZ SetEnv for plack It should also be noted that /etc/apache2/sites-enabled/{configuration file} should also contain: RequestHeader add X-Koha-SetEnv "TZ {timezone}" Where {timezone} is the desired instance timezone. Signed-off-by: Mark Tompsett <mtomp...@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit e8ac2d38331872bc812f6ed32cf2fc5735a88bde Author: Mark Tompsett <mtomp...@hotmail.com> Date: Mon Feb 26 15:00:54 2018 +0000 Bug 18674: Added timezone information to about page Before patch: No timezone section After patch: timezone section at bottom of Server information tab. Actual is what is being used. Config overrides environment variables. So if there is confusion why the environment variables aren't working, it will be visible why. Signed-off-by: Mark Tompsett <mtomp...@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 015e7ee3331ededee37dd68a7e9743b93605b05a Author: Tomas Cohen Arazi <tomasco...@theke.io> Date: Thu Apr 5 10:31:04 2018 -0300 Bug 20123: Make the timezone entry empty and uncommented by default Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit cb35784d3cf9fc878859200bcab8f577583d8b07 Author: Kyle M Hall <k...@bywatetsolutions.com> Date: Fri Mar 9 09:26:13 2018 -0500 Bug 20123: Add commented out example to koha-conf.xml Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 8fb700b81dac0e180d1acf24c50420b4f6939fd5 Author: Kyle M Hall <k...@bywatersolutions.com> Date: Tue Feb 27 12:10:59 2018 +0000 Bug 20123: (QA follow-up) If tz is 'local', no need to tell database to set the timezone Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 4cdf3e38afd608bcd0f8a1c7b6918d40ad84859f Author: Kyle M Hall <k...@bywatetsolutions.com> Date: Thu Feb 1 13:21:54 2018 -0500 Bug 20123: Allow multiple instances of Koha to have different timezones on the same server Most of Koha depends on the local timezone of the server, except for Koha::Database which support an ENV override with the key TZ. We should take this a step further. We should not only accept the TZ environment variable for all of Koha, we should really be able to set the timezone in the koha conf file as well so we don't have to pass that environment variable to things like cronjobs and one-off scripts. Test Plan: 1) Apply this patch 2) Set a timzone in your koha_conf file, that is *not* your local time zone Available timzones are listed here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones 3) Restart apache/plack 4) Perform some actions, check the timestamps in the database and in the html output, note they are for the set timezone and not the local timezone. Signed-off-by: Mark Tompsett <mtomp...@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 7 +- C4/Context.pm | 23 +- C4/SIP/ILS/Patron.pm | 15 ++ C4/SIP/Sip/MsgType.pm | 1 + Koha.pm | 2 +- Koha/Database.pm | 3 +- Koha/Middleware/SetEnv.pm | 3 +- about.pl | 34 +++ acqui/addorder.pl | 43 ++-- acqui/neworderempty.pl | 118 +++++++++- catalogue/ISBDdetail.pl | 2 +- debian/templates/koha-conf-site.xml.in | 5 + etc/koha-conf.xml | 5 + .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../obligatoire/marc21_sample_acq_framework.sql | 22 ++ .../Optionnel/marc21_simple_bib_frameworks.sql | 22 ++ .../Obligatoire/framework_DEFAULT.sql | 25 ++ .../Obligatoire/framework_DEFAULT.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 22 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 22 ++ installer/data/mysql/sysprefs.sql | 1 + .../marc21_bibliographic_DEFAULT_general.sql | 22 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 22 ++ installer/data/mysql/updatedatabase.pl | 11 + installer/install.pl | 4 +- .../prog/en/includes/html_helpers.inc | 12 + .../intranet-tmpl/prog/en/includes/prefs-menu.inc | 1 - .../prog/en/includes/reports-toolbar.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 86 ++++--- .../prog/en/modules/acqui/neworderempty.tt | 239 ++++++++++++-------- .../en/modules/admin/preferences/acquisitions.pref | 7 + .../en/modules/admin/preferences/cataloguing.pref | 9 + .../prog/en/modules/admin/preferences/labs.pref | 11 - .../prog/en/modules/installer/step1.tt | 2 +- .../prog/en/modules/members/moremember.tt | 51 +++-- .../en/modules/reports/guided_reports_start.tt | 1 + .../bootstrap/en/includes/opac-facets.inc | 6 +- members/moremember.pl | 6 +- opac/opac-illrequests.pl | 2 +- reports/guided_reports.pl | 22 +- t/Biblio/TransformHtmlToXml.t | 12 +- t/db_dependent/SIP/Message.t | 52 ++++- t/db_dependent/SIP/Patron.t | 26 ++- t/timezones.t | 34 +++ 48 files changed, 941 insertions(+), 205 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref create mode 100644 t/timezones.t hooks/post-receive -- main Koha release repository _______________________________________________ koha-commits mailing list koha-commits@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits