git.koha-community.org Git

Merge remote-tracking branch 'bernardo/3.18.03-translate' into 3.18.x

Bug 13609: Cross Site Scripting problem in authority search result list paging

To test:
- Use an installation a reasonable amount of authorities, so that you can
have a search result list with more than one page
- Activate OpacAuthorities
- Create an OPAC link like shown below, verify that an alert is shown
- Apply patch
- Refresh the page and no alert should appear
- Verify the paging still works correctly for 'numbers' and 'arrows'

URL:
.../cgi-bin/koha/opac-authorities-home.pl?and_or=and&marclist=match&op=do_search&operator=contains&orderby=HeadingAsc2"><script>prompt(987898)</script>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Translation updates for 3.18.03 release

Release notes

Bumping version number for 3.18.3 release

Bug 13510 : Fixing the third XSS issue

To test

1/ Make sure you have some items in your database, that have values in items.issue
If nessecary do something like

UPDATE items SET issues = 10 WHERE itemnumber=somenumber

2/ Hit a url like http://localhost:8080/cgi-bin/koha/opac-topissues.pl?do_it=1&timeLimit=3%3Cscript%3Eprompt%28924513%29%3C/script%3E

3/ Notice you will get a prompt
4/ Apply patch
5/ Test again

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13510 - Cross site scripting bug in opac-downloadshelf and opac-shelves

A specially crafted url causes XSS in Koha

To test:

cgi-bin/koha/opac-shelves.pl?viewshelf=2%22%3E%3Cscript%3Eprompt(987898)%3C/script%3E

cgi-bin/koha/opac-downloadshelf.pl?shelfid=2%22%3Cscript%3Eprompt(1)%3C/script%3E&showprivateshelves

These should cause a popup without the patch. With the patch, no popup.

You may need to create these lists, the xss will not be triggered if the list doesn't exist or you don't
have permission to view them.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Fixes the two listed problems

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Confirmed patch fixes the problem.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13526 - Mandatory fields should not be able to be hidden in borrower self-registration

Currently, mandatory fields in the borrower self-registration can be hidden.
This causes problems since the validator rejects the registration,
even though all required fields on the screen have been filled out.

This is especially a problem when using the system preference
"PatronSelfRegistrationVerifyByEmail", since it automatically makes
"email" a mandatory field.

This patch makes it so that a mandatory field cannot be hidden on
the self-registration page.

_TEST PLAN_

Before applying
1) Hide the "email" and the "emailpro" fields using the
"PatronSelfRegistrationBorrowerUnwantedField" system preference.

2) Make the "email" and the "emailpro" fields mandatory using the
"PatronSelfRegistrationBorrowerMandatoryField" system preference.

3) Note that you cannot see "Primary email" or "Secondary email"
on the self registration page.
(The registration page which can be found by turning
on "PatronSelfRegistration" and filling in
"PatronSelfRegistrationDefaultCategory". The link will be on
opac-main.pl on the right side of the screen under the login box.)

4) Note that you cannot submit a self-registration request as
the system tells you that you have not filled in all the mandatory
fields.

5) Apply the patch && refresh the self registration page

6) Note that you can now see "Primary email" and "Secondary email"
on the self-registration screen".

Signed-off-by: Abby <abbyrobnz@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fd6176d0a58e5e5016d5db002578b7a7dee9531c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12702 - Suggestions still accessible in OPAC when deactivated

Added check for suggestions turned off. If off user is redirected to 404 error. If patron suggestions are off guest sugestions will also redirect to 404

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bcbcad897a3f383b38851f8d0fb27017170d181f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 8096 - card number twice on patron search

This patch removes double patron card numbers from patron search results.

To test:

Search patrons
See card number 12345 in first column and in second column like Testman, John (12345)
Apply patch
Patron card number no longer dispays in second colum

Further testing:
Search for other places in intranet where patron-title.inc is used (git grep 'patron-title.inc')
The card number still should display at the other places.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
http://bugs.koha-community.org/show_bug.cgi?id=8096
Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b8989510ec8b6b58249707bf2ddc6cf80fbfef4d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13571: followup to remove some now-unused options

The memcache parameters aren't used by anything (except C4::SQLHelper,
but that's a cancer on the face of the earth) anymore, so they can go.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9db34fe8758e6303246a3347d19f05edc2653a42)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13571: Koha-conf.xml.in has fallen out of sync with koha-conf.xml

To test:
1- Build new koha packages
2- Check that the conflist file contains the changes we have made

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 0a1914963985ad5bb6a0aacb21348ec892f3e590)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13570 - koha-conf.xml mentions win32

Issue existed in koha-conf.xml of /etc.

The following lines were removed from the file:




This section was located on lines 9, 10, 11, 12 and 13 of the koha-conf.xml file.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 752b6dce2ff27bcac57e927b5431f69b4061a1c8)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12889: Updated pod for C4::Members::AddMember

Signed-off-by: Rochelle <Rochelle_healy@hotmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=12889

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 124549b8abad24c5c506ab5962a75782067b2c9a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13537 - Focus should move to barcode after renewing via checkouts table

Koha's checkout screen automatically focuses on the barcode field each
time it is loaded. Since we've moved the checkouts table functions for
renewing and returning items to ajax methods, this page is no longer
refreshed, and thus does not refocus to the barcode after performing
those actions. This should be fixed so that renewing/returning items via
the checkouts page moves the focus to the barcode field.

Test Plan:
1) Find a patron with checkouts.
2) Renew or return a checkout, note the focus does not move to the
barcode.
3) Apply this patch.
4) Renew or return a checkout, note the focus *does* move to the
barcode.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Thomas <tomsStudy@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 91f67dde130c1c5c34174a588696bad1286823ad)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13564: Items search: rename Stock number to Inventory number

To test:
- Go to Advanced search
- Click on link 'go to item search'
- Check the search options in the second section for "Stock number"
- Do a search and note the column name appears as "Stock number"
- Apply patch
- Try the search again and check that "Inventory number" shows

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, thx!

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 62b8f1a830ed28ec4e0d12179b677abf7faa9e21)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13290 - Add better feedback for returns to the checkouts table

The feedback given when returning an item is only to update the "Check
in" column. It would be nice if the entire column was highlighted in
some way so librarians have an easier time spotting which items were
checked in and which ones failed to be checked in.

Test Plan:
1) Apply this patch
2) Browse to a patron with checkouts
3) Return an item using the checkouts table
4) Note if the return was successful, the row is highlighted in
yellow, if the return was not allowed, the row is highlighted
in red.

Signed-off-by: Christopher Brannon <cbrannon@cdalibary.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9fcdb0108217fc746731d2d8736a8765427453a0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13408: Tell librarians they may continue scanning while checkouts table is loading

Some librarians do not realize they can continue scanning items even if
the checkouts table has not loaded. We should have Koha tell them
explicitly that they may continue scanning barcodes.

Test Plan:
1) Apply this patch
2) Load the checkouts table on circulation.pl, note the loading message is now
Loading... you may continue scanning.
3) Load the checkouts table on moremember.pl, note the loading message is still
Loading...

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This one works too!

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 28513edb943c255b191c94e0fbc0fe14368e6985)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13566 - Change translation for 'Rotating collection' in German web installer

This page changes 'Wanderned Sammlungen verwalten' to 'Rotationsbestände verwalten'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 76f4723ba655ae9131f6b09299a040e1a31adaec)

Bug 13579: Open history.txt using utf-8 encoding

Test plan:
Verify about>Timeline is correctly encoded

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Replaced <encoding by <:encoding.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9cf3a2276527585bafe7b903b6d5acabe77c4f7a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13579: Prefer like instead of ok to match a regex

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 178e51cad7ad216d560aa2d203778f4683e89f85)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13579: (regression tests) Encoding issues on about > timeline get tested

This patch introduces two tests for encoding issues on about > timeline

To test:
- Apply the patch and run
$ KOHA_USER=kohaadmin KOHA_PASS=katikoan KOHA_INTRANET_URL=http://koha-dev.biblioadmin prove t/db_dependent/www/history.t
(adjust to your own settings, the user needs to have access to the about page)

Regards

Signed-off-by: Manuel Cohen Arazi <manuelcohenarazi@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 29ebdc3ad5baf6e2d1d9a40118175e399ccd2517)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13530: Typo in bulkmarcimport

GetFrameworkCode was incorrectly spelt as GetFrameworkcode on line 401.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f831176787916bfdd79592d7df2d2578004a07b9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

GRS-1 deprecation leftover used by jenkins

install_misc/environment_Makefile.PL is only used by jenkins to
automate the configuration step. This leftover doesn't affect
anyone but Jenkins so I take the liberty to push this amendment.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 544520d6bdfacada4eba4caefedf42864db4b3a0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Follow up on record files: deleted fields (952/995) with items info

To insert items info you need to use correct code of sublibrary, not always the code is correct. Items info are not important for this test, so the fields are deleted (952 in MARC21, 995 in UNIMARC)

http://bugs.koha-community.org/show_bug.cgi?id=13264
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 021c3695e80237129ca9860ca82d8ccf5f36f796)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: More tests for Latin-1 vs. UTF-8 interpretation

New tests in search_utf8.t, now are tested also records with only utf-8 chars that could see also as latin-1 chars

http://bugs.koha-community.org/show_bug.cgi?id=13264
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 556b15f7258eb63bf57ac9116088aede8c18201d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Update of unimarc and marc21 record to search publisher

http://bugs.koha-community.org/show_bug.cgi?id=13264
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 0f8589483f128efdd1e198524733dae509d4271d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Add Latin-1 vs UTF-8 test specific records

This patch addes two new files .mrc for marc21 and unimarc to test chars in utf8/latin-1 section only, to be sure that perl doesn't switch between utf-8 nad ISO 8859-1 inside itself.

http://bugs.koha-community.org/show_bug.cgi?id=13264
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 4c7de64b3af9130632fb3a4108bd75b403574b07)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Add tests for Latin-1 vs. UTF-8 deduction

add a test in auth_values_input_www to check chars that could be Latin-1 or UTF-8

http://bugs.koha-community.org/show_bug.cgi?id=13264
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 6691d273cd371d3dde1602ebb17938551c99834a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Add more records to the marc21 aand unimarc files

Dupliacate record in marc21 and unimarc files, so the search finds always more than one result.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 04ef213dec094fdde08755ad6bb2ed8f809c7fa4)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: (QA followup) prevent double-encoding on the tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 9bba9fb386d5772fb4ebd9edac14eb1532210843)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Refactor search utf8 tests and add some more

t/db_dependent/www/search_utf8.t and
t/db_dependent/www/intranet_search_utf8.t were quite similar, I merged
them into a single file (t/db_dependent/www/search_utf8.t).
On the way, I added some tests for them.

Note that you will need the last patch on branch bug_11944 to see the
tests pass.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 72563473aeeb48f59075e1684a8b283a1ba0c922)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Additional test for search in intranet calatogue

The utf-8 test do: insert a biblio record with tool, search the record in intranet,
delete batch upload and biblio records.

To test: prove intranet_search_utf8.t

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 2e368c14787f6c91be7879b8ab887d65472e3ab3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Follow up: in opac_utf8.t insert also delete of biblio

In previous version of the test opac_utf8.t clears import from resevoir
but it doesn't delete record from biblio table in MySQL.
This the standard work of the feature, see:
http://manual.koha-community.org/3.18/en/catalogtools.html#managestaged

Now the script deletes also record on MySQL level.
No necessary on Zebra level because it uses a temporaney Zebra index that it is
clenaned at the end of the script.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 20a7f1d03871339daeb3c58ad605fe7e92b90bdc)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Make opac_utf8.t launch its own helper processes

This patch makes opac_utf8.t launch its own:
- zebrasrv process
- rebuild_zebra.pl (daemon mode)

It also takes care of killing them when finished. It sets a frecquency
of 5 seconds for the indexer, and waits 10 just in case before looking
for the indexed records.

To test:
- Just launch the tests.

Edit: fixes on the license text.

Regards
Tomas

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 5e43f20a448f86915e64e18d6dccbb6e9ced4be6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: no need to test for MySQL

This patch removes the test for a running MySQL process.
It is already implied by successfuly loading C4::Context.

It also fixes the license text.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 0f44011336ef000484632c2c0de07bcd04babc44)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Test for utf-8 on authorised values input/display/delete

This test check utf-8 support on web intranet interface for authorized values.
It test input, search and delete of utf-8 values.
If all OK it destroy values inserted

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 44ed6c37c579f7a8a2b222647f50073cdf1762d4)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: Test for utf-8 on Opac search

This test need to setup zebraserver and background indexing.
You need to set also KOHA_INTRANET_URL and KOHA_OPAC_URL
in the user enviroment.

It imports sample records and retrieves them on hte OPAC through
Apache.

To run it: prove opac_utf8.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit fb9eb5737bb2fa2025778a1324afb5d9662ef4a9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13264: UNIMARC and MARC21 records to test UTF-8

The records shares enough chars to do the same search ('deuteros') to
find them and check the same utf-8 chars.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 1ded4bfc55fb0f744c7f251859497eb5e1899eea)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12868: Wrong variable used for borrower number

When only the card number is passed to GetMemberDetail, the
value of $borrowernumber is undefined. Even after finding the
correct borrower and providing a nice hash ($borrower), the
GetMemberAccountRecords is called with the wrong borrower number,
even though it is in the hash ($borrower).

This was fixed by changing $borrowernumber to
$borrower->{borrowernumber}, so that the hash's value will always
be used, since it is correct regardless of whether borrowernumber
or cardnumber were used to find the borrower.

TEST PLAN
---------
1) Apply both patches
2) prove -v t/db_dependent/Member.t
-- This time the previously failing test will pass.
3) run koha QA test tools.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 483ad2aee510cb23f2bae61883d6b90de262d13d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12868: Improving t/db_dependent/Member.t

The mock function of GetMemberAccountRecord did not properly
account for the undef case. This was corrected.

Then all 4 combinations of borrower number and card number being
defined or not were called to GetMemberDetail.

The problematic test case is where the borrower number is
undefined and the cardnumber is defined.

TEST PLAN
---------
1) Apply just this first patch.
2) prove -v t/db_dependent/Member.t
-- This should fail!
3) Run koha QA test tools.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e6dbae9dbf8ce506d6692cb7abace9c9b3175e3e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12922 - Do not DIE the advance_notices.pl -cronjob if no letter of type is found!!

We failed to deliver advance_notices because a template for sms's is undefined, because we don't support
sending sms' as advance_notice.
This crashed the cronjob because digests are set to die instead of the warn used in non-digest.
And we get angry customers asking for compensation!

This patch replaces the die with warn.

TEST PREPARATION:

0. Edit the ODUEDGST letter, find an undefined letter for any trasport type.

TEST PLAN:

1. Find a borrower and from the messaging preferences set the "Advance notice" transport type to
   the undefined digest. Set the "Days in Advance" to 1.
2. Check-out something for that borrower and set the due date for tomorrow.
3. Run "misc/cronjobs/advance_notices.pl -c -n -v" from the terminal.
4. BEFORE THIS PATCH: You get an error
   "No circulation PREDUEDGST letter transported by sms at /home/koha/kohaclone/C4/Letters.pm line 609."
   and the script dies.
4. AFTER THIS PATCH: You get an error
   "No circulation PREDUEDGST letter transported by sms at /home/koha/kohaclone/C4/Letters.pm line 609."
   but the script keep on going!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9d53118f55f0f278a22f846af510edb7fa4477be)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13522: Make it explicit that scalar containd a hash ref

Prior to perl 5.12 keys can only operate on a hash. So although
$data[0] ( thats an abysmal variable name! ) will contain a hash ref
the perl compiler cannot deduce that from the context and gives
a syntax error. Add the hash sigil to make the context explicit and
the compiler can generate the correct code.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bdf8627e640827c303259da73e6a1e82f6836fcb)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13378: Add a filter to search suggestions not linked to a fund

This patch adds a "None" option for the fund filter.

Test plan:
1/ Go on the suggestion search page
2/ Search suggestions not linked to a fund using the "None" option.
3/ Search all suggestions (linked or not to a fund) using the "Any" option.

Works as expected.
Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fbfc109777338fce515ae544e9537d5a9a8a7947)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13369: table should been highlighted correctly when row are grouped

The css used to highlight the rows comes from staff-global.css
We need a more specific rule to be used.

Test plan:
Go on the fund list view and confirm that the rows are correctly
highlighted.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 57ac4a126b3e929ab750519e7e521f9e98a80490)

Bug 13407: Bumping required version of PDF::Reuse

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 4958a8a0f67d04c41eb300d9247c915f2346acf0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13407: Removing depricated code included in PDF::Reuse

1. Upgrade PDF::Reuse to 0.35_04. [1]
2. Run Koha's non-DB dependent test suite. You should notice some non-fatal warnings about
the redefinition of one or two subs in PDF::Reuse. This should not affect the
functionality of the tools for the end user.
3. Verify the functionality of the related tools.
4. Apply the attached patch.
5. Re-run Koha's non-DB dependent test suite. You should note no warnings related to PDF::Reuse.
6. Re-verify the functionality of the related tools.

[1] http://search.cpan.org/CPAN/authors/id/C/CN/CNIGHS/PDF-Reuse-0.35_04.tar.gz

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Chris <chris@bigballofwax.co.nz>
http://bugs.koha-community.org/show_bug.cgi?id=13407

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Nice one! I only corrected the bug number in the subject.

(cherry picked from commit 7379f6ee72cb2d22be624c72271ecbb0f3a80d05)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 11872 - Lost overdue items should not generate fines

An item can be marked as lost by longoverdue.pl, but left checked out to
the patron. In this case, the item will continue to accrue fines.

Test Plan:
1) Check out an item and back date it so it is overdue and should
generate fines.
2) Mark the item as lost by either using longoverdue.pl, or just
by setting itemlost to 1 by directly accessing the database
3) Run fines.pl
4) Note the overdue generated a fine
5) Repeat steps 1-2
6) Apply this patch
7) Run fines.pl
8) Note a fine was not generated

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 53923cbd025c163e45680c6fc985f2981e438dae)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13487: Fix pagination for the item search

Test plan:
Go on the catalogue/itemsearch.pl page and verify that the
pagination button (First, Prev, PAGES, Next, Last) is now correctly styled.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e91c39d448668a1771c788966784f6bbbb87737d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13487: Fix pagination for basketgroup

Test plan:
Go on the acqui/basketgroup.pl page and verify that the pagination
button (First, Prev, Next, Last) is now correctly styled.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 779ef7431a3736c7cc70c78cd2673484ff2afd3e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13487: DT pagination contains '...' for the full_numbers form

Since the DT upgrade (bug 12986), the full_numbers pagination adds a
span (containing '...'). It is not managed by the css file and is put at
the end of the page numbers ( "1 2 3 4 5 20 NEXT LAST ...", we expect "1
2 3 4 5 ... 20 NEXT LAST").

Test plan:
1/ Go on the member search and launch a search which will return more than
7 pages
2/ Without this patch, the '...' span is put at the end of the
pagination bar.
3/ With the patch it should be better placed.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2d413ffab1d074ca52bf9afa826e6006ebb7e664)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13459: Fix datatables paging for patron lists

The display of the datatables paging options for the
patron list feature is broken.

To test:
- Go to tools > patron lists
- The paging for the 'list of lists' is broken
- Select a patron list 'Add more patrons'
- Notice the paging on this page is also broken
- Apply patch
- Verify both pages now display the paging correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ad0711ba32c7ad90ad18607e5a27ece97b8ef7cd)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13459: Fix datatables paging for admin > itemtypes

To test:
- Go to administration > itemtypes
- Verify the display of the paging options is broken
- Apply patch
- Verify the display is now correct and works nicely

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 225432a1f039a9c625e24e3c59643db331fe17b2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT notices

If only 1 item exist in the message, the marker is not removed.
This marker is removed by render_metadata, but this method is only
called on appending.

Test plan:
1/ Enable the CHECKIN and/or CHECKOUT notices for a patron
2/ check and item in or out and verify that the marker is no longer
displayed in the generated notices.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 936a4f22288ff013a2e4269a934df7fa900c7336)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13167: (QA followup) regression tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 3e5ea114523b29bd36688f33d6cb3012756cfd8b)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13167 Stage MARC for Import hangs for biblio containing invalid ISBN-13

If the ISBN of a UNIMARC record begins with 979 then the 'Stage MARC for
import' hangs. If I use the same UNIMARC record and change 979 to 978 in the
ISBN, 'Stage MARC for import' works perfectly.

The patch deals with the fact that converting an ISBN-13 to ISBN-10 with
Business::ISBN as_isbn10() method fails if the ISBN doesn't begin with 978.

TEST PLAN:

(1) Download, and decompress the ZIP file attached to BZ.
(2) On a UNIMARC Koha instance, go in Tools > Stage MARC for import.
(3) Choose the MARC file containing the record with an ISBN begining with 979.
Click on Upload file, then Stage to import.
(4) The Job progress bar stay at 0%.
(5) Apply the patch. Repeat steps 2-3. The upload works.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Tested in a UNIMARC installation, confirmed that the patch fixes the
problem.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 352d9cd2fd0ea7ddc075094e3f9d310abc894ac4)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 12823: Alert about defining the SRU search field mappings

This is a follow-up for report 6536 (SRU search targets).
It will alert a user that saves a SRU server without field mappings.

Test plan:
Add a Z39.50 server. No confirm message.
Add a SRU server without field mappings. Cancel the confirm.
Add one field mapping. No confirm message.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ba2527310866958635d807880d07d8f1b3cb4d0a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12823: Add some hints for Host and Database

When adding or editing a SRU server, this patch adds a hint, positioned
under the Hostname field.
It also moves similar information for SRU options and XSLT into hints.

Test plan:
Add/Edit SRU server. Look at Hostname, SRU options and XSLT.
Add/Edit Z39.50 server. No hints for Hostname and SRU options.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 104fc792f5aab8305de685f743e3e6b1cb64adaa)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 1861: (RM followup) DNIx updates

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cfce425771350912c3cd8e21c8e205d776aaa443)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13502: Add tests to highlight the problem

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13502: Code introcduced in 1861 wrongly assumes a null userid is unique

To test

1/ Create a borrower with '' as their userid, you may have to edit a
   row in the db to do this
2/ Run  perl t/db_dependent/Circulation/CheckIfIssuedToPatron.t
3/ Notice some tests fail and you see
   DBD::mysql::st execute failed: Duplicate entry '' for key 'userid'
   at /home/chrisc/git/catalyst-koha/C4/SQLHelper.pm line 184.
4/ Apply the patch
5/ Run the tests again, notice they now pass

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13341 - Hard-coded "Preview" text in OPAC openlibrary.js

The OpenLibrary JavaScript includes an untranslated string, "Preview."
This patch move the string to the template so that it can be translated.

To test, apply the patch and test that the translator picks up the
string:

1. From misc/translator run 'perl translate update [lang]' (e.g. de-DE)
2. Edit misc/translator/po/[lang]-opac-bootstrap.po and add a
   translation for the updated "Preview" string
3. Remove the "#, fuzzy" marker from that entry
4. From misc/translator run 'perl translate install [lang]'
5. Enable the [lang] translation for the OPAC in system preferences
6. Enable the OpenLibraryCovers system preference.
7. In the OPAC switch to the [lang] translation.
7. View the detail page for a title for which there is an OpenLibrary
   cover image. Below it you should see a preview link with the
   translated string you added in step 2.

Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 049bd2da2312b26d0a63adecdc8331e48e3a0efd)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13447: Fixed HTML Email Reports

A tiny typo made in runreport.pl when updating it for bug 9530 lead to
no body being attached to html emails.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 36f56b81774340a49f3ad137c77d0d74207acbc1)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 12895 repair dropbox mode

One day late patrons were restricted even with dropbox mode activated

1) Check in the calendar (Tools/Calendar), that the
   previous days you are about to use as date due are
   really entered as opening day (never know).
2) Add a suspension in the suspension days parameter
   of the circulation rules (Administration/Circulation
   and fine rules) to the MOST specific category of
   borrower and MOST specific type of document among the
   existing rules of the LOGGED IN Site(cf explications
   in the circ-rules page).
3) Choose a borrower using the search by category and an
   item through the advanced search using the limit by type.
4) Checkout the item selecting the previous opening date
   in the Specify-due-date box.
5) Click on Circulation in the upper menu, then on Checkin
   and check the Book drop mode. The Book drop date showed
   should be the previous opening date.
6) Check in the item : you can see that the patron is restricted
7) apply the patch
8) Redo 1 to 5 : Now, you can see that the patron is not restricted.
9) If you redo the test with two day late, you will see that
   the patron is not restricted : that's ok because his
   restriction of one day is already finished.
10) If you redo the test with more than two day late, you see
    that the patron restriction is, as expected, one day shorter
    than it were if the item had been returned without dropbox mode.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c1621de8a503d5505d0bd697a4b64eacf50c095d)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13458: Display the correct patron categories

Bug 9811 removes useful code.
Actually the AddPatronLists pref is not sent to the template from
members/member.pl.

To fix this issue, we can use the existing not clean way, or compare the
syspref value directly in the template. This second solution is
implemented in this patch.

Test plan:
1/ Set the AddPatronLists pref to 'specific'
2/ On the patron home page (members/members-home/pl), the patron search
result page (members/member.pl after launching a search) and on the
checkouts page/patron search result (circ/circulation.pl after searching
a patron using the check out), verify that the patron category list is
the specific ones.
3/ Test there are no regression with the AddPatronLists pref set to
'general'.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described and fixes the problem.

Note: I am not sure if AddPatronLists makes sense -
if you set it to general patron types, it still preselects the
wrong category type (tried organization, a child patron category
was selected). Also the name is confusiong nowadays with the
Patron list feature.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2b39823c0f4cec1607078de1f2547afc95ae87cd)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 9958: Improve RoutingSerials sys pref description

The RoutingSerials preference controls if the routing
list related functionality is visible in the serials
module.

To test:
- Go to the system preference editor - RoutingSerials
- Check the current description
- Apply patch
- Check the new description
- Verify functionality matches description

NOTE: The preference change is merely cosmetic. The value is
still YesNo. A few git reset --hard origin/master
and page refreshes confirmed expected values.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 90ebffcffae59b5ded2db3dce875be0293b845e1)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13285 Do the right thing if opacthemes is not set

If opacthemes is not defined updatedatabase reports the
subsequent warnings as an error. Take account of the case where
it is not set and default that to bootstrap.

This is probably a rare occurence, but should be handled

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 90c32e88561530143ced5d190445850291f6851e)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13124 - Record titles with parentheses causing label weirdness

Test Plan ( using sample data included with Koha )
1) Catalog a record and item with the title "Oh no! or, (How my
   science project destroyed the world) /"
2) Edit the DEFAULT template
   a) Set layout type to Biblio
   b) Set data fields to "title, author, isbn, issn, itemtype,
      barcode, itemcallnumber"
   c) Set font size to 10
3) Create a batch with just the one item you created
4) Export the PDF with the Avery template and the DEFAULT layout
5) Note the weirdness
6) Apply this patch
7) Re-export the PDF, note it's no longer weird ; )

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fe4da2f721c371540fe88d0014a49a866b403ca4)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13357: Untranslatable strings on itemsearch.tt

This patch enable translation of labels on itemsearch.tt

To test:
1) Translate for a fairly complete language (es-ES de-DE)
2) On staff, go to Search > Item search
3) Check there are many untranslated strings
e.g. Text before pulldowns on first and second box
All options on third box

4) Apply the patch

5) Repeat 1 & 2
6) Check there are now some strings translated
7) Update translation file, check there are some
new strings to translate (may be they are fuzzy)
e.g. "All statuses", "All collection codes"

Patch works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1eb85ad7578410354668ff81f9f35bbc2f6b9734)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 1861: Add 1 test to AddMember

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 5b165a2420bf4f024d7936477c214b6261b4e567)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 1861: There is a problem introduced with an earlier patch, on this patchset

-    $data{'userid'} = Generate_Userid($data{'borrowernumber'},
$data{'firstname'}, $data{'surname'}) if $data{'userid'} eq '';
+    $data{'userid'} = Generate_Userid( $data{'borrowernumber'},
$data{'firstname'}, $data{'surname'} )
+      if ( $data{'userid'} eq '' || Check_Userid( $data{'userid'} ) );

Check_Userid returns 1 if it is unique.  So this means unique userids
will always be discarded and new ones created.

This is why all the tests depending on a userid are now failing

To test

1/ run perl t/db_dependent/Serials_2.t
2/ Notice lots of tests fail
3/ OR Add a borrower with a userid set, notice the userid is ignored
and one is generated instead
4/ Apply patch
5/ Add a new borrower, notice the userid sticks (if it is unique)
6/ Run perl t/db_dependent/Serials_2.t notice tests pass
7/ Run perl t/db_dependent/Members.t notice tests still pass

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit f326488f9afb9752b93d07858b6ac9d525838ff0)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13360: C4::Ris assumes that hash keys are ordered - KW

This patch only fixes the KW order.

Test plan:
1/ Choose/create a record with several 6XX (for KW), see the code source
to know which fields you can use
2/ Export this record in RIS format
3/ Verify that the KW lines are ordered following the marc record fields
order.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
We really should refactor this whole thing into Koha::RIS sometime, it's
a horrible module at the moment.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 801ba4a9204254fb2c24726495370ce813b1b22b)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13453: Koha.t daily quote tests assume sample data

By adding quotes 3 and 25 from the sample data, this test can
pass without having the sample quote data loaded.

TEST PLAN
---------
1) Ensure there is no quote id=3 or that it is NOT
   Abraham Lincoln.
2) prove t/db_dependent/Koha.t
   -- this should fail the daily quote test.
3) apply patch
4) prove t/db_dependent/Koha.t
   -- this should *NOT* fail the daily quote test.
5) run koha qa test tools

Followed test plan 1)-4). Without patch, daily quote test failed. With patch, test passed OK.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, leaves actual data unchanged.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7aec3a9aa4ed826767fb02c2b4b3acf90b5f0e54)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bumping database version to 3.18.02.003

Bug 1861 [QA Followup] - Don't modify userids, warn if we can't modify the index automatically

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 179ef0f28f7216231a07adb69fc0f3e1e4858d1a)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 1861 [QA Followup] - Fix Check_Userid and unit tests

Check_Userid assumes that a borrowernumber will always be passed in
and thus fails to to return 0 for an already used userid when creating
a new patron.

Unit tests must now also me modified to no longer assume it is possible
to create multiple patrons with the same userid.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7135364dd23442c38bed986b2540ab63cfd06ce1)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 1861 - Unique patrons logins not (totally) enforced

The Koha 3.0 patron admin page will prevent you from creating a user who
has an identical OPAC login as someone else (though I would change the
error message from "Login/password already exists." to "Login
already exists.", since it's not the password that's the
problem).

However, there's nothing enforced in the MySQL database to prevent
patrons from being imported or manually inserted with duplicate logins.
Would it be better to change the MySQL spec from this:
KEY `userid` (`userid`)
to this:
UNIQUE KEY `userid` (`userid`)

Test plan:
1) Enter mysql console
2) Attempt to create two borrowers with identical user id's
3) Note you are able to do so
4) Delete these bororwers
5) Apply this patch
6) Run updatedatabase.pl
7) Repeat step 2
8) Note you are now unable to do so

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Leaves deletedborrowers as it is, deleting patrons still works ok.
Works according to test plan.
Database update will only be successful, when no duplicate entries
exist in the database.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit df4297621d285dbdbe13eaff04dae2a9419ed824)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 13017 - Login page image replacement technique fails when browser width exceeds 2000 pixels

This patch updates the image replacement technique used for Koha's login
page. The old technique used a negative text-indent value to move the
text offscreen, but that begins to fail more and more often as screens
get larger.

The new technqiue is described here:
http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/

Note: This patch has not been tested in any Internet Explorer version!

To test you must have a screen which is wider than 2000 pixels. Apply
the patch, clear your browser cache and view the staff client login
page. The logo on the login form should look correct with no
corresponding text appearing anywhere on the screen.

Signed-off-by: Christopher Brannon <cbrannon@debian.localdomain>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 87a0b79a65f179fdef5aee98701660cca00a273e)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Database version 3.18.02.002

Bug 10753: Any library is represented by an empty string

And not with "__ANY__"

Test plan:
0/ Don't apply this patch
1/ Create a suggestion for "any library"
2/ Verify suggestions.branchcode contain "__ANY__"
3/ Apply this patch and execute the updatedb entry
4/ Create a suggestion for "any library"
5/ Verify suggestions.branchcode contain "" (for both suggestions).

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 67c3217238d6193d953914e9f2eaf816683306d7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13436: DBRev 3.18.02.001

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Note: it also fixes a minor POD error.
(cherry picked from commit cbf784bb9d8c01d1c05cae00d046d3799a1d7ed9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13436: (RM followup) university -> academic DB update

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 281b3225fcbafbb26568f57c2547c4fe13bde017)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Conflicts:
installer/data/mysql/updatedatabase.pl

Bug 13436: Adding more options to UsageStatsLibraryType syspref

Added options:
- research
- private
- society or association
- corporate
- government
- religious organization
- subscription
- school

Also changed 'university' to 'academic'

To test:
1) Go on to Global System Preferences and find UsageStatsLibraryType under Administration
2) Click drop-down menu and see all new options described above, as well as 'academic' instead of 'university'

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace tab with spaces

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 30e40bd8847d3b015477bae50f6a40358d9f70ca)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12565: Acq: Fix broken link in breadcrumbs

The link back to the basket when creating an order by
searching for an existing record in the catalog is
broken.

To test:
- Start a new basket
- Create a new order line by searching for an existing
record in your catalog
- Try the link back to the basket from the breadcrumbs
at the result list page
- Verify that the link is broken
- Apply patch and retest

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e04b3ef0685f2bbe8a25b65181c937b8eb5e34d3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13422 - SCO: "Would you like to print a receipt" not translatable

To test:

Set syspref SelfCheckReceiptPrompt to "Show"
Select non English language
Go to Self Checkout and check out an item
Hit "Finish"
Make sure that confirm dialog "Would you like to print a receipt" still
appears

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit dd6fbe04d12a50523c8d950422ef8182cdd1ba82)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13416: Typo in marc21_leader.pl position 5 (record status)

Instead of a space in the leader on this position, it should be an a.

Test plan:
1) Log in to staff client
2) Find a record in the catalog
3) Edit the record
4) Click the on builder popup icon.
5) View the page source
   -- the option is " " for the 'a- Increase in encoding level'
      entry. It really should be 'a'.
6) Apply patch.
7) Repeat steps 1-5
   -- the option should be 'a' this time.
8) Run koha qa test tools.
   -- Discovered it failed. Provided a patch to fix this.
      It does, however, solve the major problem of ' ' vs. 'a'.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7ef33d19a157c1535327feb6b6c6e3ea17e27764)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13218: (RM followup) only scroll on actually variable stuff

Most of the page contents have fixed size. The only exception is the
targets list. If the target list grows, then the whole page needs to be scrolled
in order to reach the buttons.

We should make the z3950 targets area scrollable, and remove scrolbars from all
over the place.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c63003dd5a73f1276d7e1191bef30822326f2994)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13218: (qa-follow-up) replace tab with spaces

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c102f6bd7f6f4d0073a0da8c5ea84e8ad4c39da1)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13218: fixing acquisitions z39.50 interface to be consistent with the others.

Changes:
* Two columns of search fields into one
* moves targets from below search fields to the right of them

To test:
* Create a basket in acquisitions
* attempt to add a record to the order from an external source
* note the changes to the layout
* complete a couple of additions to the basket - functionality should be unchanged.

If you like the changes, sign off :)

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Ok. Consistency welcomed!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ef05a256ab9333a42e9add98ea9c502c3459de9a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13218: usability enhancements for z39.50 searches

This patch rearranges the layout of the z39.50 search pages in cataloguing and
authorities.  There should be no functional change to z-target searching, all
functions should remain the same.

Changes:
* 2 columns of search fields condensed into one
* zTargets moved from below the search fields to beside them
* rearranged search fields into perceived frequency of usage, from most used to
  least
* changed label of Raw (any) to Keyword (any)

To test:
* click cataloguing -> new from z39.50/SRU
* observe how the layout has changed
* import a record or two using the search - there has been no change to the
  function, it should all be working.

* Click Authorities -> new from z39.50
* observe how the layout has changed
* import an authority or two using the search - there has been no change to the
  function, it should all be working.

* sign off if you think these changes are nice. Comments and suggestions are
  also welcome regarding this change.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Nice evolution of the z3950 search/result pages.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit edfc80268c3936fe68f31bf0fff0760ea6cb62e0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13400 [QA Followup] - Fix tabs and quotes

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5d6d9de5e7a9c682c835c2522e21d9878786fd51)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13400: Untranslatable "Are you sure you want to delete this authority?"

This patch makes the string "Are you sure you want to delete this
authority?" translatable using the function _(...)

To test, apply patch and check that deleting authorities still works.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with the following procedure:

1. Applied the patch.
2. Ran perl translate update de-DE
3. Edited de-DE-i-staff-t-prog-v-3006000.po to add a "translation"
4. Removed "#, fuzzy" marker from po entry.
5. perl translate -v install de-DE
6. Testing deleting an authority from the authority search results page
and from the detail page. My translated string appeared correctly.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8523f208f30b204a2a6cffb8dd4088935bdd2343)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12059: Prefer to list fields in the query

To avoir further issue, it's better to explicitely list the fields we
want to retrieve.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bf681e28bab3d6c5b3a190dd7fe453369d600696)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 12059: Publisher column on invoice page always empty

This patch moves the publisher information out of its own
always empty column into the Summary column below the title,
as it is on other acq pages.

The information was never displaying, as publishercode is in
biblioitems and that table was not selected by GetInvoiceDetails.

Also modified the code to take into account that UNIMARC uses
biblioitems.publicationyear and MARC21/NORMARC use bibio.copyrightdate
for the copyright year.

To test:
- create an invoice for records that
  - have a publication year
  - have no publication year
  - have a publisher...
- 'finish receiving' and check the invoice summary page
   ...acqui/invoice.pl?invoiceid=?
- Make sure all the information displays now but didn't witout the patch.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d9c99b6f5ef40bb546231cf35581d4308f1ae3bc)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13410 [QA Followup]

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c7081a0852b8d627328e503cfe53b8f32e6d623a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Bug 13410 - Untranslatable "Change messaging preferences to default for this category?"

To test:
In staff client, go to Home > Patrons
Click button "New patron" and choose a category
Change Patron messaging preferences
Now change Category
Make sure that following message box still appears: "Change messaging
preferences to default for this category?"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6d37e83e4dc98d4e5a061428386eb4ce0c05ef33)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Merge commit '21708c9c8c34eab7073a7b634465aa377e64dcec' as 'misc/translator/po'

Squashed 'misc/translator/po/' content from commit b643202

git-subtree-dir: misc/translator/po
git-subtree-split: b643202628b82ad727a8a4d1f0d04bf69595b715

Remove po files, now in a subtree

Gah, typo