Commit Graph

2475 Commits

Author SHA1 Message Date
Julian Maurice c4d5cc0f29 Increment version for 3.22.20 2017-04-24 09:29:18 +02:00
Julian Maurice 2e9be0441c Increment version for 3.22.19 2017-03-31 16:03:25 +02:00
Julian Maurice 2effbe144a Increment version for 3.22.18 2017-03-17 10:13:09 +01:00
Julian Maurice ccf341a5e6 Increment version for 3.22.17 2017-02-20 12:50:38 +01:00
Julian Maurice 7a9d353760 Update DB rev (3.22.16.001) 2017-02-20 12:01:52 +01:00
Frédéric Demians 11f9f2ecd4 Bug 17913: Add AuthorityMergeMode preference
Original patch from bug 5572, dating back to 2011!
Amended by Marcel de Rooy January 2017. Renamed the pref.

The fix on this report is based on this preference.
Depending on the pref, subfields will be deleted or kept.

Test plan:
Run the dbrev.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-02-20 12:00:42 +01:00
Julian Maurice ce1cdb5794 Increment version for 3.22.16 release 2017-01-31 10:16:05 +01:00
Julian Maurice 6a291b3ac7 Increment version for 3.22.15 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-01-23 12:21:47 +01:00
Jonathan Druart d0d628c611 Bug 17234: Need to separate KEY and FOREIGN KEY checks
In the previous patch we use the constraint_exists subroutine to verify
if an index or a foreign key exists.
But the `SHOW INDEX` query does not return foreign keys (as its name
suggests!).
We need another subroutine foreign_key_exists to check the FK existence.

I have found that because t/db_dependent/TestBuilder.t fails on
oai_sets_biblios, because oai_sets_biblios_ibfk_1 has not been removed.

Test plan:
0/ Do not apply this patch
1/ Use a 3.20 DB
2/ update the DB
3/ SHOW CREATE TABLE oai_sets_biblios
will display oai_sets_biblios_ibfk_1

Apply the patch and repeat 1, 2, 3
=> Will not display oai_sets_biblios_ibfk_1
It has been removed as expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 05fdd855c8)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit ba45608b0d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-01-19 16:36:53 +01:00
Jonathan Druart c6927e6ef0 Bug 17234: Move new subroutines to C4::Installer
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0b15c5e2cc)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit a34a60823f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-01-19 16:36:52 +01:00
Jonathan Druart 96c27a95d5 Bug 17234: Add constraint_exists and column_exists to updatedatabase.pl
These 2 subroutines will help us deal with the absense of ALTER IGNORE
TABLE

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c08922180e)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 70fe225bea)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-01-19 16:36:41 +01:00
Blou 2e5c2a8201 Bug 17234 - updatedatabase.pl's ALTER IGNORE break with mysql 5.7.4+
The doc says: "As of MySQL 5.7.4, the IGNORE clause for ALTER TABLE is removed and its use produces an error."
This fix replaces ALTER IGNORE with ALTER in updatedatabase.pl

To TEST, try an upgrade from 3.18 to 3.22 after installing the latest mysql (at least 5.7.4, by the doc).
Some will fail with error

DBD::mysql::db do failed: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IGNORE TABLE aqbasket
            ADD KEY authorisedby (authorisedby)' at line 1 [for Statement "
        ALTER IGNORE TABLE aqbasket
            ADD KEY authorisedby (authorisedby)
    "] at ./installer/data/mysql/updatedatabase.pl line 10563.

0) Find a database on 3.18, save it.
1) Set your code base to 3.22(or master)
2) run updatedatabase.pl
3) See the errors.
4) Apply the patch
5) Reload the 3.18 database
6) succeed with updatedatabase.pl

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit acf425bbbc)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit e2e61a798c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2017-01-19 16:35:09 +01:00
Julian Maurice 1121c6f59c Increment version for 3.22.14 release 2017-01-02 15:16:38 +01:00
Julian Maurice 2618afd8bb Increment version for 3.22.13 release 2016-11-30 15:31:21 +01:00
Kyle M Hall b8dd36ecf1 Bug 17391: Update DB rev (3.22.12.003)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:43:03 +01:00
Nick Clemens 688268b1fc Bug 17391 (QA Followup) use INSERT INGORE in atomicupdate
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0a84274f6b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:40:35 +01:00
Jonathan Druart 5215dcf946 Bug 17391: Fix number of values in sysprefs.sql
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 49f8e05b20)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:40:34 +01:00
Jonathan Druart 1201f42e49 Bug 17391: Add atomic update file
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d785cd5b0a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:40:34 +01:00
Katrin Fischer f65faf1cf6 Bug 17391: Add missing prefs to sysprefs.sql
Adds
- ReturnpathDefault
- ReplytoDefault
to the sysprefs.sql file.

To test:
- Run the web installer in any language
- Check all preferences are installed without error
- Check prefs listed above now exsit in your
  systempreferences table

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 15e57368bb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:40:34 +01:00
Kyle M Hall f080cf4546 Bug 14598: Update DB rev (3.22.12.002)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 14:01:04 +01:00
Marcel de Rooy 0c1201bcce Bug 14598: [QA Follow-up] Small changes
[1] Renames the dbrev version to XXX; adding a my for $sth, although
    not strictly necessary it feels better.
[2] Circulation.t stumbles over:
    Undefined subroutine &C4::Circulation::GetItem called at ... line 1283.
    Somehow this is related to use_ok instead of a regular use.
    Worked around this by require_ok and adding a regular use.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3660c451a3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 13:51:09 +01:00
Tomas Cohen Arazi 96440b4fe1 Bug 14598: (QA followup) use deleted{items|biblioitems} during upgrade
If the 'statistics' table contains circulation information about items
that are no longer on the DB it will raise a warning. This patch
makes the updatedatabase.pl script use the deleteditems and deletedbiblioitems
tables to get information for those items on the statistics table.

To reproduce:
- Have your sample DB contain some circulation data on the statistics table
- Make sure some of them have NULL itemtype:
> UPDATE statistics SET itemtype = NULL WHERE type='return';
- Check the upgrade query catches them:
> SELECT s.itemnumber, i.itype, b.itemtype FROM  ( SELECT DISTINCT itemnumber    FROM statistics    WHERE ( type = "return" OR type = "localuse" ) AND itemtype IS NULL ) s  LEFT JOIN  ( SELECT itemnumber,biblionumber, itype      FROM items    UNION    SELECT itemnumber,biblionumber, itype      FROM deleteditems ) i  ON (s.itemnumber=i.itemnumber)  LEFT JOIN  ( SELECT biblionumber, itemtype      FROM biblioitems    UNION    SELECT biblionumber, itemtype      FROM deletedbiblioitems ) b  ON (i.biblionumber=b.biblionumber);
+------------+-------+----------+
| itemnumber | itype | itemtype |
+------------+-------+----------+
|        732 | BK    | BK       |
|        731 | BK    | BK       |
+------------+-------+----------+
2 rows in set (0.00 sec)

- Delete the items, and some biblio too.
- Re-run the query
=> SUCCESS: Same results
- Go reset to NULL the itemtypes
> UPDATE statistics SET itemtype = NULL WHERE type='return';
- Run the updatedatabase.pl script:
 $ sudo koha-shell koahdev ; cd kohaclone
 $ perl installer/data/mysql/updatedatabase.pl
=> SUCCESS: No warnings

Note: It is possible that on production sites, if the sysadmin is cleaning the
deleted{items|biblioitems|biblio} tables, there will be warnings. This is expected
as they need to know some data lacks information.

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3fa514133b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 13:48:06 +01:00
Kyle M Hall 5aa4771dd2 Bug 14598 [QA Followup] - Update localuse statistics also
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c042307db3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 13:48:06 +01:00
Tomas Cohen Arazi 95c65c5a89 Bug 14598: (DB update) fix NULL itemtypes in statistics on 'return' rows
This patch introduces an updatedatabase.pl entry that takes care of
updating existing statistics rows.

It does so by looping on the statistics rows, collecting itemnumber occurences
that are have NULL itemtypes.
It then chooses the right itemtype following what is proposed on bug 14651, and
then updates the rows in statistics using the calculated itemtype.

Regards

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2cdec7ff91)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-30 13:48:05 +01:00
Julian Maurice 3daf399cac Bug 17518: Update DB rev (3.22.12.001)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-08 11:34:34 +01:00
Josef Moravec 7f0903847b Bug 17518: Displayed language name for Czech is wrong
It's "Ceština" and should be "Čeština"

Test plan:
1) apply the patch
1.1) update database
2) install Czech translation for Koha
3) note the language name in language switcher (in staff client and
    opac) is right: "Čeština"

Signed-off-by: radiuscz <radek.siman@centrum.cz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit de2ba75c25)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3ea0d7ed99)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-11-08 11:32:21 +01:00
Julian Maurice 3e8a30baaf Increment version for 3.22.12 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 14:11:40 +02:00
Julian Maurice ef74f4c803 Bug 17357: Update DB rev (3.22.11.003)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:52:46 +02:00
Jonathan Druart 3fd0cf36b2 Bug 17357: Replace WTHDRAWN with WITHDRAWN in installer files
Some installer files still use WTHDRAWN instead of WITHDRAWN as an AV
category.

Test plan:
  git grep WTHDRAWN installer
should not return any results

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ce076e0e75)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 78ce2bcb9f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:49:34 +02:00
Jonathan Druart 1b59dc9e58 Bug 17358: Rename COU with COUNTRY and LAN with LANG
Some installer files use COU and LAN instead of COUNTRY and LANG.

To uniformise these AVs, it would be good to use the same code.

Note that I do not think we should update existing installations

Carefully compared code.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 75a900d553)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit aa23153985)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:48:29 +02:00
Mark Tompsett db695c4aed Bug 17324: Deal with branchcode NULL issue
In a database update we alter the letter table, making a column
(branchcode) not be able to contain NULL values.
However if it already does, this SQL fails. So before changing the
column we change the NULL values

[Tue Sep 20 19:08:10 2016] updatedatabase.pl: DBD::mysql::db do failed:
Invalid use of NULL value [for Statement "
[Tue Sep 20 19:08:10 2016] updatedatabase.pl: ALTER TABLE letter MODIFY
COLUMN branchcode varchar(10) NOT NULL DEFAULT ''
[Tue Sep 20 19:08:10 2016] updatedatabase.pl: "] at
/home/mtompset/kohaclone/installer/data/mysql/updatedatabase.pl line
12638.

Reproduce:
on an ubuntu 16.04 LTS machine with MySQL 5.7 install git koha
development environment.
...
git checkout -b my_3.18.x origin/3.18.x
drop database koha_library;
create database koha_library;
quit;
web install all sample data
(ignore some issues with sample data, and one with mandatory)

git checkout -b bug_17234 origin/master
git bz apply 17292
git bz apply 17320
git bz apply 17260
git bz apply 17234
web install
Two warning messages are expected output from upgrade process, but
the above message is not.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Did not follow the test plan, but the changes make sense

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 0599ab0076)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3c2bd4ef3b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:37:40 +02:00
Frédéric Demians ff4d8128f7 Bug 7045: Update DB rev (3.22.11.02)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:10:17 +02:00
Jonathan Druart f53fefb03a Bug 7045: Update default value placeholders for existing installs
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 547b5f95f6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 517e4eb553)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-24 11:08:00 +02:00
Frédéric Demians d2abcdb943 Bug 14707: Update DB rev (3.22.11.001)
(cherry picked from commit c73b60d716)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-14 14:31:08 +02:00
Jonathan Druart 2da7a46881 Bug 14707: Update existing installations and correct wrong values
See http://hea.koha-community.org/, the countries are filled is wrong
values.
If we decide to update the free text with a dropdown list, we need to
handle these wrong data.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 66d669d073)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e09f10a882)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-14 14:26:41 +02:00
Julian FIOL ebfe59ccf3 Bug 14707 : Replace UsageStatsCountry syspref from free text to a dropdown list.
This will avoid syntax problems with Hea when a user will fill this 2 sysprefs

The default choice for UsageStatsLibraryType and UsageStatsCountry is 'empty'

Test Plan
---------

1. Create a new Koha install
2. Go to the 'Administration' page
3. Go to 'Global system preferences'
4. Go to 'Administration'
5. At the end of this page you should see a dropdown menu for
- UsageStatsCountry with all countries
- UsageStatsLibraryType with all type of library
They both should be empty by default.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Not a complete list but is a start
Lots of new strings to translate :)
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 233dfb8c74)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 20db7d6ee6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-14 14:26:40 +02:00
Julian Maurice cd11a12093 Increment version for 3.22.11 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 12:42:16 +02:00
Bernardo Gonzalez Kriegel fe5b80d563 Bug 16554: rewrite mandatory and sample data - de-DE
More changes to de-DE files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9261fb4f5b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f37cbb96f2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel 9e9bbcff27 Bug 16554: rewrite mandatory and sample data - it-IT
More changes to it-IT files

Checked marc21 and unimarc files
unimarc_relatorterms.sql had bad encoding, others minor
errors

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit be4cd79aea)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 6e4dbd3f9b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel e97a0da05a Bug 16554: More i18n changes - en, es, nb and pl files
Mostly fixes bad values in auth files ( '' -> 0 )

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6dc2f1ae7c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 25e314bee5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel 28afac565d Bug 16554: rewrite mandatory and sample data - pl-PL
More changes to pl-PL files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 28191a538b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9d11edefea)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel a487a192c0 Bug 16554: rewrite mandatory and sample data - nb-NO
More changes to nb-NO files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4742f1035b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a05c4d11de)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel d678eb5938 Bug 16554: rewrite mandatory and sample data - es-ES
More changes to es-ES files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8cfa6f633a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fd02ef7fc2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:31 +02:00
Bernardo Gonzalez Kriegel 891b6590de Bug 16554: Fix I18N sample files
Needs Bug 13669

This patch fix web installer for
de-DE, es-ES, fr-CA, nb-NO and pl-PL

To test:
1) Apply patch
2) Try web installer for any/all listed languages.
a) de-DE, es-ES, fr-CA and pl-PL
There must be no problems for marc21 + all sample files
b) nb-NO
There must be no problems for normarc + all sample files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e38cad45e8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 884e877be3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:25:59 +02:00
Bernardo Gonzalez Kriegel fd70020ada Bug 16554: Fix fr-FR sample files
Needs Bug 13669

Rewrite autorites_norme_unimarc.sql to
use only one INSERT IGNORE.

New load method complains about duplicate keys,
and both auth files are mandatory!

Also removed blank space from sample_labels.sql

Tested with unimarc_complet and all sample files.

To test
1) Apply the patch
2) Try fr-FR web installer, unimarc_complet + all sample files
There must be no errors

Don't know if fr-FR marc21 and unimarc_lecture_pub are used,
need a look from french users.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b5ae31e7fd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ad9d0a3beb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:24:58 +02:00
Frédéric Demians f811cb9943 Bug 16311: Update DB rev (3.22.10.001)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:22:27 +02:00
Andreas Roussos ae8d5b3ca5 Bug 16311 - Advanced search language limit typo
In the OPAC -> Advanced Search, the Language drop down menu incorrectly
lists Romanian as "Român (Romanian)" while the correct value (as reported
by Barry Cannon) is "Română (Romanian)".

This patch fixes that:
a) for _new_ installations by modifying
   installer/data/mysql/mandatory/subtag_registry.sql (loaded by the web
   installer when koha is installed), and also
b) for _existing_ installations by adding an atomicupdate file in
   installer/data/mysql/atomicupdate/

Test plan:
1) In the OPAC, go to Advanced search (cgi-bin/koha/opac-search.pl).
2) In the 'Language' drop down menu, observe that the value for Romanian
   is "Român (Romanian)".
3) Apply the patch, and run installer/data/mysql/updatedatabase.pl.
4) Refresh the Advanced search page in the OPAC. Confirm that the patch
   worked, i.e. the Language drop down menu lists Romanian as
   "Română (Romanian)" (notice the added 'ă').

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fc9279774f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit eceb09a8a3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:20:48 +02:00
Julian Maurice 9811be4e63 Increment version for 3.22.10 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-25 10:30:29 +02:00
Frédéric Demians f918724145 Bug 7441: Update DB rev (3.22.09.004)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-23 16:17:25 +02:00
Kyle M Hall 409aecf321 Bug 7441 - search results showing wrong branch?
When you search in the OPAC it shows you the HOME branch on the location
in XSLT, but if you click through to the detail page it shows you the
CURRENT BRANCH in the holdings table which is very confusing to patrons.
I don't know what's the right solution - home or holding branch, but they
should be the same in both places for the patron's sake. If you do the same
search in the staff client you see the right branch info on the search results
and on the detail page.

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Search the catalog, you search should include results with items
   that have different home and holding libraries.
4) The results should look the same as before the patch
5) Change the system preference OPACResultsLibrary to "current location"
6) Refresh your page of search results
7) The results show now show the holding library instead of the home library

Signed-off-by: Barbara Walters <bwalters@ncrl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4db2e745e2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 17a103d8a0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-23 16:13:23 +02:00