Commit Graph

22654 Commits

Author SHA1 Message Date
Chris Cormack 05f2fa17eb 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>
2015-01-01 08:34:01 +13:00
Owen Leonard 5311ae87f5 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 049bd2da23)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:23:26 +13:00
Martin Renvoize 7eb558531e 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 36f56b8177)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:22:27 +13:00
Lyon3 Team 1c5919bb40 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 c1621de8a5)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:20:53 +13:00
Jonathan Druart 8a81476a07 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 2b39823c0f)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:20:32 +13:00
Katrin Fischer 86886ece19 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 90ebffcffa)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:15:16 +13:00
Colin Campbell e356c60214 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 90c32e8856)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:14:37 +13:00
Kyle M Hall b3a20835dd 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 fe4da2f721)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:12:31 +13:00
Bernardo Gonzalez Kriegel c68c944544 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 1eb85ad757)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-31 08:05:27 +13:00
Jonathan Druart 1312416b0a 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>
2014-12-31 07:56:24 +13:00
Chris Cormack 2190b9b67c 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>
2014-12-31 07:56:06 +13:00
Jonathan Druart 33125c05ac 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 801ba4a920)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 10:37:18 +13:00
Mark Tompsett 6daf2b7c43 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 7aec3a9aa4)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 10:32:36 +13:00
Chris Cormack ec9766e8a6 Bumping database version to 3.18.02.003 2014-12-30 10:19:49 +13:00
Kyle M Hall 903a08a4f8 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 179ef0f28f)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 08:20:37 +13:00
Kyle M Hall 5296fe9545 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 7135364dd2)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 08:20:10 +13:00
Kyle M Hall 5e707555f8 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 df4297621d)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 08:19:45 +13:00
Owen Leonard 54a37c8fc1 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 87a0b79a65)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-30 08:15:10 +13:00
Chris Cormack 71f1c5ef82 Database version 3.18.02.002 2014-12-26 08:06:38 +13:00
Jonathan Druart 190ee0ac2e 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 67c3217238)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-26 08:04:26 +13:00
Tomas Cohen Arazi cda70e0c81 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 cbf784bb9d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-26 08:00:45 +13:00
Tomas Cohen Arazi ef22b8bf23 Bug 13436: (RM followup) university -> academic DB update
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 281b3225fc)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	installer/data/mysql/updatedatabase.pl
2014-12-26 07:58:13 +13:00
Aleisha 9fe068bfd7 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 30e40bd884)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-26 07:57:08 +13:00
Katrin Fischer 58951f0744 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 e04b3ef068)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-26 07:55:28 +13:00
Marc Véron 30bbf8b888 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 dd6fbe04d1)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:26:03 +13:00
Marcel de Rooy cb4933ce1c 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 7ef33d19a1)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:23:38 +13:00
Tomas Cohen Arazi fd8d46c582 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 c63003dd5a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:22:00 +13:00
Jonathan Druart 2dfed6f9a9 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 c102f6bd7f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:21:41 +13:00
Liz 2c779161f7 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 ef05a256ab)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:21:24 +13:00
Liz 3e3a2f6b1d 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 edfc80268c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:20:43 +13:00
Kyle M Hall 528fe8fe12 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 5d6d9de5e7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:18:55 +13:00
Marc Véron 5433d607f4 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 8523f208f3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:18:20 +13:00
Jonathan Druart 3666204475 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 bf681e28ba)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:15:30 +13:00
Katrin Fischer b970d1ef11 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 d9c99b6f5e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:15:10 +13:00
Kyle M Hall 2edde60ffb Bug 13410 [QA Followup]
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c7081a0852)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:13:44 +13:00
Marc Véron 3f49f2d7f8 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 6d37e83e4d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-23 20:12:38 +13:00
Chris Cormack 5ada5a2fb4 Merge commit '21708c9c8c34eab7073a7b634465aa377e64dcec' as 'misc/translator/po' 2014-12-23 17:29:22 +13:00
Chris Cormack 21708c9c8c Squashed 'misc/translator/po/' content from commit b643202
git-subtree-dir: misc/translator/po
git-subtree-split: b643202628b82ad727a8a4d1f0d04bf69595b715
2014-12-23 17:29:22 +13:00
Chris Cormack ff43970428 Remove po files, now in a subtree 2014-12-23 17:24:45 +13:00
Chris Cormack fffdd5f7f9 Gah, typo 2014-12-23 08:09:22 +13:00
Bernardo Gonzalez Kriegel b20c296feb Translation updates for Koha 3.18.02 release
New language Esperanto
2014-12-21 22:52:00 -03:00
Chris Cormack ab1db92e83 Bumping for 3.18.2 release 2014-12-22 10:09:01 +13:00
Chris Cormack 0c8ede31df Bug 13425 - XSS in intranet facets - Patch for 3.18 and master
To Test
1/ Craft a url like /cgi-bin/koha/catalogue/search.pl?q=smith&sort_by='"><script>prompt('Happy_Holidays')</script>

It is important it must return results and facets

2/ Notice the js is executed
3/ Apply the patch test again

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No prompts, no functional regressions found.
Checked selecting and undoing facets, show more links and paging.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2014-12-22 10:02:30 +13:00
Mark Tompsett ad2c8ef43f Bug 13456: Serials/Claims.t expects no subscriptions
However, this is an unreasonable assumption for a system which
is in use (either lots of testing or production).

TEST PLAN
---------
1) Have a supplier with a late subscription.
2) prove t/db_dependent/Serials/Claims.t
   -- will fail
3) apply patch
4) prove t/db_dependent/Serials/Claims.t
   -- success
5) run koha qa test tools

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 9412b90599)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:55:01 +13:00
Jonathan Druart a98aa005a8 Bug 13476: Fix DataTables for the search items form
This items form is broken since the upgrade to DataTables 1.10.2 (commit
954c2874d0).
The fnServerParams does not work anymore.

Test plan:
Go on catalogue/itemsearch.pl, launch a search and verify the data are
correctly displayed in the table.

Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The paging seems still a bit buggy, but this makes the
feature usable again!

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6114c5fd6f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:49:58 +13:00
Katrin Fischer 4225278c87 Bug 13461 - Circ always asking for confirmation if RentalFeesCheckoutConfirmation is used
To test:
- Check RentalFeesCheckoutConfirmation is activated
- Try to check out an item without rental fine
- Verify confirmation message without explanation
  is shown
- Apply patch
- Verify confirmation message is no longer shown
- Configure itemtype to have rental fee
- Veirfy now the confirmation message appears as
  it should

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 22b8d559f9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:48:10 +13:00
David Cook fe3673221d Bug 13469 - Unapi path to XSLTs is wrong in OPAC
The Unapi path to XSLTs is wrong in the OPAC.

Unfortunately, it's coded to work just for Git installs, which makes it
tough to test.

_TEST PLAN_

Before applying:
1) Go to
http://GIT-INSTALL/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
2) If the biblionumber exists, it should show you the record in OAI_DC format.
3) Go to
http://REGULAR-INSTALL/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
4) You should get a software error

Apply the patch.

After applying:
1) Refresh the page for
http://yourgitinstall/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
2) It should work exactly the same as before.

Thorough testers:
1) Push the code to that regular test install
2) Try the link again. It will properly show the converted record now.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Verified that single install
intrahtdocs==/usr/share/koha/clone1712/intranet/htdocs/intranet-tmpl plus
"/prog/en/xslt/" is the location for the required xslt files.
Script unapi in git install is still fine.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f1323e60a2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:43:03 +13:00
Dobrica Pavlinusic 08e664e563 Bug 13470 - pay fines with extended borrower attributes result in application error
Test scenario:

1. ensure that extended patron attributes are turned on in system preferences
2. find borrower which has fine to pay, and click on pay button
3. verify application error
4. apply patch and verify that application error is gone

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cc06e22de7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:36:22 +13:00
Jonathan Druart 6adb84cd20 Bug 13296: (follow-up) permit grep on AUTHUNIMARC
I would prefer not to hide this "stuff".

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fab96202fd)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:32:42 +13:00
Fridolin Somers bb2dcc53dc Bug 13296 - error when using z3950 with UNIMARC authorities
When using a z3950 connexion with UNIMARC authorities, you get an error :
Unsupported UNIMARC character encoding [ ] for XML output for UNIMARCAUTH; 100$a -> 20141119

I've seen thant Bug 2060 when adds authorities import adds a special behavior for UNIMARC : marc flavor must be UNIMARCAUTH instead of just UNIMARC.

This patch adds the same behavior when using z3950 connexion and import.

Test plan :
 - Use a UNIMARC install
 - Define a z3950 connexion for UNIMARC authorities
 - Go to Authorities module
 - Click on "New from Z39.50"
 - Perform a search
=> Without patch : you get the error
=> With patch : you get results
 - Import one result
=> You get the authoritie creation form with all datas
You may check same plan with MARC21 install

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
NOTE: depending on the target, the syntax in the configuration
might not be UNIMARC, but MARC21/USMARC instead!

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9ccdbc49c7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2014-12-20 12:32:18 +13:00