Commit Graph

22907 Commits

Author SHA1 Message Date
Chris Cormack e66865142e Merge branch '3.18.x' of git://git.koha-community.org/koha into 3.18.x 2015-04-03 09:50:25 +13:00
Jonathan Druart 8347a82bbf Bug 3873: follow-up for all other pages
This should fix the issue on other pages.

Test plan:
Try to download and export the basket (intranet+opac sides).

Re-tested for errors in comment #5, they do not longer appear.
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 3adddd3410)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-04-03 09:47:45 +13:00
Jonathan Druart 1206d13fd9 Bug 3873: Avoid software error if the cart contains a deleted record
If a record is placed in the basket and deleted, the basket view
exploded with:
Can't use an undefined value as an ARRAY reference at
/home/koha/src/basket/basket.pl line 73.

Test plan:
1/ Add some records to the basket
2/ Delete one of them
3/ Look at your basket
It should not exploded

Note that the number of items in the basket is now wrong.

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 4c4c870dfe)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-04-03 09:47:09 +13:00
Jonathan Druart 5c14b7ba9c Bug 5844: Avoid strings cut on unhighlighing
If a user is searching for several words and that one is contained in
another ( "mag ma" ), some characters are cut (removed from the DOM!).

To reproduce:
1/ search for "mag ma m"
2/ The result page contains "Magazine"
3/ "Mag" is highlighted
4/ Click on the "Unhighlight" link
5/ The "Magazine" words become "azine", "Mag" has been cut.
There is no way to show these characters again.

Test plan:
1/ Confirm the bad behavior without this patch
2/ Apply this patch
3/ search for "mag ma m"
4/ The result page contains "Magazine"
5/ "Mag" is highlighted
6/ Click on the "Unhighlight" link
7/ strings are unhighlighted and still in the DOM :)

Note that the Highlight link won't work very well (only "a" will be
highlighted, but considered as minor since this did not work before the
patch neither).

Followed test plan. Strings are no longer cut when unhiglighted.
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 2e4b574074)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-04-03 09:23:33 +13:00
Jonathan Druart 6d2322138c Bug 3969: Fix funds search
The funds search does not work at all.
On the budget and the budget plan page, the library dropdown list is
empty.

Test plan:
On the budget, the budget plan and the fund pages, confirm that you are
able to search a fund by code (or name) and the library dropdown list is
correctly filled.

Tested with several combinations. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Tested various combinations, no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 934de70eec)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-04-03 09:21:29 +13:00
Katrin Fischer 995cb6fecf Bug 12399: Small change to remove the whole paging
Previous patch only removed the next and previous buttons.
This patch changes it a bit to remove the whole paging from
the print view of the page.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 66db4a64ef)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-04-01 09:22:42 +13:00
Jonathan Druart fce19045ac Bug 9120: Prevent form submission on adding tags - OPAC
At the OPAC, if the user adds tags pressing 'Enter', the page is
reloaded and the tags are not added.
To prevent that, this patch suggests to block the "press enter" event on
the inputs.

Test plan:
0/ Confirm the bad behavior, without this patch.
1/ Apply this patch and confirm nothing happen on pressing enter when
the focus is on the add tag input (At the opac, on the result view).

Patch 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 7fa67b2f83)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:44:10 +13:00
mbeaulieu 624827782d Bug 11982 - Images now display properly in the details section.
If the a cover image exists, it will be displayed on the details page.
Nothing is displayed of there is no cover available.
    modified:   koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
    modified:   koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, passes tests and QA script.
Checked Amazon covers and local covers display correctly
in staff on results and detail pages.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2a4a91aef3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:41:47 +13:00
mbeaulieu 18286f1ec0 Bug 11982 - Fixed the amazon no image icon.
A no image icon will only be displayed if both the amazon and local images are missing.
Added hyperlink to details on the local image in the search result page.
    modified:   koha-tmpl/intranet-tmpl/prog/en/js/localcovers.js
    modified:   koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
    modified:   koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2668cbdc41)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:41:33 +13:00
Frédérick 70d9beaed1 Bug 11982 - Show local cover image in the intranet biblio details page
Also, fix useless "No cover image" block when using Amazon and local
cover images at the same time.

http://bugs.koha-community.org/show_bug.cgi?id=11982
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bbb6cf94de)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:41:17 +13:00
Jonathan Druart b10ef9005d Bug 11120: the date input should be in a iso format (YYYY-MM-DD)
Note that it cans also accept a date in the same format defined in the
dateformat system preference.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 39bb5fd43f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:39:10 +13:00
Katrin Fischer 46d8457f04 Bug 11120: Follow-up: adding a hint about the date format
Adding 2 hints about the expected date format to the error
message and the help.

To test:
- Run overdue_notices.pl --date <someinvaliddate>
- Run overdue_notices.pl -man
- Verify hint about date format shows up

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e6d987180f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:38:54 +13:00
Jonathan Druart 891d921408 Bug 11120: FIX the --date option for overdue_notices cronjob
Bug 7447 introduces the --date option for overdue notices.
This option has never worked: the code is waiting for a value but the
option is defined as a boolean.

This patch fixes the option and change the way to calculate the range of
dates.
This range is now managed in Perl instead of in the SQL query. To do it
in Perl allows to build dates simply using the DateTime and
DateTime::Duration modules.

To test this patch you should have a DB with a lot of overdues, (I
tested on a DB with 512 overdues).
A test plan could be:
1/ Dump your message_queue table
2/ Verify the number of overdues in the database before applying the
  patch:
  mysql> DELETE FROM message_queue;
  perl misc/cronjobs/overdue_notices.pl -v -t
  (the triggered option will generate overdue for today)
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 2A

  mysql> DELETE FROM message_queue;
  perl misc/cronjobs/overdue_notices.pl -v
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 2B

2/ Apply the patch
4/ Verify the number of overdues generated by the patched script:
  mysql> DELETE FROM message_queue;
  perl misc/cronjobs/overdue_notices.pl -v -t
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 4A

  mysql> DELETE FROM message_queue;
  perl misc/cronjobs/overdue_notices.pl -v
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 4B

  mysql> DELETE FROM message_queue;
  # The date should be defined depending your dateformat preference
  # and should be the date of the current day
  perl misc/cronjobs/overdue_notices.pl -v -t --date="YYYY-MM-DD"
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 4C

  mysql> DELETE FROM message_queue;
  # The date should be defined depending your dateformat preference
  # and should be the date of the current day
  perl misc/cronjobs/overdue_notices.pl -v --date="YYYY-MM-DD"
  mysql> SELECT COUNT(*) FROM message_queue;
  Note this value 4D

5/ Compare the values: All values generated with the -t options should
be equals. Same for values without the -t options.
=> 2A == 4A == 4C and 2B == 4B == 4D

6/ Go back to a normal activity for 3 days or manually change the
date_due for issues in the DB:
  mysql> update issues SET date_due = DATE_SUB(date_due, INTERVAL 3 DAY);
Do again step 4C and 4D with a date equals to today - 3 days.
Values should be the same as 4C and 4D.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with my own test data, checked generating overdues
with and without the --date option.
All worked as expected.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 0f4a831344)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:38:40 +13:00
Benjamin Rokseth 6a24376001 Bug 12344: QA followup: use next instead of return
Use next instead of return when generating templates.
In case patron has enabled a message type that misses a template,
next message type will be attempted instead of returning at once.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e4d88bcf43)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:33:47 +13:00
Benjamin Rosketh 8c40dfca0b Bug 12344 - Multi transport types for issues and checkins
This small patch corrects the order of generating notices for issues and returns (checkout/checkin) so that borrower's notices are rendered correctly (for sms,email,etc.)

Test plan:

1) Edit SMSSendDriver syspref to use driver 'Test'
2) Edit CHECKOUT template for sms to 'SMS test'
3) select SMS for test patron's messaging prefs for item checkout
4) checkout an item
5) check the table message_queue, verify that template sms is
   not used (message content is not 'SMS test')

6) apply patch, make new checkout
7) check that message_queue table now has a correctly generated
   notice with 'SMS test'

For a real world test use a real SMS::Send driver and run the
cronjob process-message-queue.pl to send messages immediately.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2ab4a4287b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:33:08 +13:00
Mirko Tietgen 43191a61e7 Bug 13855 - Fastadd framework has 2x 100$c, missing 100$a
The fastadd framework ist missing a 100$a subfield, it has two 100$c instead.
This patch corrects English, German, Italian and Spanish .sql files.
Italian and Spanish need translations for the field name.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested running all sql files manually.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 27962ff411)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:27:32 +13:00
Tomas Cohen Arazi 5fc1053c52 Bug 12739: (QA followup) use 'UTF-8' instead of 'utf8'
This patch makes Encode::encode be passed the 'UTF-8' encoding
instead of the discouraged 'utf8'.

Please read:
http://wiki.koha-community.org/wiki/Handling_UTF8_in_development

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit de7e7d3033)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:26:47 +13:00
David Cook 777c2a88de Bug 12739 - SendAlerts function does not take care of "html" format or UTF-8 Pt. 2
The emails sent via SendAlerts don't take into account HTML format.

_TEST PLAN_

Before applying:

1) Change system preference "AutoEmailOpacUser" to "Send"
2) Change "ACCTDETAILS" notice to HTML and add HTML to it
3) Create a new user with your email address
4) Note how the email displays the HTML tags as plain text

Apply patch

5) Create a new user with your email address
6) Note how the email displays the email as an HTML email

For thoroughness:

7) Change "ACCTDETAILS" notice to non-HTML
8) Create a new user with your email address
9) Note how the email displays the HTML as plain text

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 54731a0ce1)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:26:07 +13:00
David Cook ca55332525 Bug 12739 - SendAlerts function does not take care of "html" format or UTF-8 Pt 1
The UTF-8 charset in the content type is written as "utf8" instead of "utf-8"
in SendAlerts(), which causes UTF-8 characters to display incorrectly.

_TEST PLAN_

Before Applying:

1) Edit ACCTDETAILS
2) Add some UTF-8 characters
I recommend using the following website
http://www.ltg.ed.ac.uk/~richard/unicode-sample.html

In my tests, I added the samples from Hebrew, Arabic, Basic Latin,
Latin-1 Supplement, Latin Extended-A, and Latin Extended-B.

3) Set the system preference "AutoEmailOpacUser" to "Send"
4) Create a new user account with your email address

5) Note that the email in your inbox doesn't display the Unicode
characters correctly

Apply the patch

6) Create a new user account with your email address
7) Note that the email in your inbox _does_ display the
Unicode characters correctly.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 63123ff36b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:24:44 +13:00
Matthias Meusburger 461426f750 Bug 12887: User logged out on refresh after CAS authentication
If the user is already logged-in, do not trigger CAS authentication
even if there is a ticket in the parameters.

1) Authenticate to the OPAC through CAS.
2) Once redirected to your account, hit F5 or the refresh button of your browser.
3) You're logged out.

Signed-off-by: Koha Team Lyon 3 <koha@univ-lyon3.fr>
Signed-off-by: Luce Barbey <luce.barbey@cirad.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Added sign of lines according to bug.
Works as described, small change.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 0c6ba2d0c4)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:23:13 +13:00
Dobrica Pavlinusic 408064b800 Bug 10773 - add help for *_description fields
Signed-off-by: Nick <Nick@quechelibrary.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit af9920e2ef)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:21:48 +13:00
Dobrica Pavlinusic e135cba5a5 Bug 10773 - Add item-level descriptions for Label Printing
This patch adds new fields ccode_description, homebranch_description,
holdingbranch_description, location_description and
permanent_location_description which can be used in the Label Creator
to display names/descriptions instead of codes

Test Plan:

1) Edit a layout in the Label Creator so that it includes any of these
fields. I suggest including "homebranch_description" and perhaps
"ccode_description" if you have them in your item data.
2) Add items to a batch in the Label Creator.
3) Export the batch using the layout, and view as PDF
4) Verify that you see descriptions for fields which you added

Signed-off-by: Nick <Nick@quechelibrary.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5c4854a211)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-31 18:21:20 +13:00
Jonathan Druart f15f1336e7 Bug 13801: svc/bib - Set charset to utf-8 on printing header
Test plan:
0/ Add unicode characters on the record biblionumber=X
1/ go on http://<staff-interface>/cgi-bin/koha/svc/bib/X
2/ Confirm you have encoding issues
3/ Apply the patch
4/ Repeat 2
5/ Confirm that all is correctly encoded

Signed-off-by: Josef Moravec <josef.moravec@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 1410422ab6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-29 19:38:36 +13:00
Kyle M Hall f9b3eabab0 Bug 12820: [QA Followup] Tab and whitespace cleanup
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 836a7eba0b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-29 19:37:29 +13:00
Colin Campbell d95e1ce857 Bug 12820: Handle rental fees in Sip issue and renew
Implement correct handling of fees associated with checking out
an item.
This is associated with fee acknowledged field (BO)

To quote from the Sip2 document
" If this field is N in a Checkout message and there is a fee
associated with checking out the item, the ACS should tell the
SC in the Checkout Response that there is a fee, and refuse to
check out the item. If the SC and the patron then interact and the
patron agrees to pay the fee, this field will be set to Y on a second
Checkout message, indicating to the ACS that the patron has acknowledged
the fee and checkout of the item should not be refused just
because there is a fee associated with the item"

So there are two Checkout requests the first with BO not set to Y is
rejected but the fee amount is returned. The Second Checkout with BO set
to Y should succeed.

Added a debug log message indicating why we block a checkout
when we dont otherwise indicate

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

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

Conflicts:
	C4/SIP/ILS.pm
2015-03-29 19:32:52 +13:00
Kyle M Hall 41e49ef6f8 Bug 13818 - Editing and saving a course reserve displays the add item form
If one chooses to edit an existing course reserve for an item, saving it
should go back to the course details, but instead displays the "add
items: scan barcode" form.

Test Plan:
1) Edit a course reserve
2) Save it
3) Note you get the "add items: scan barcode" form
4) Apply this patch
5) Repeat steps 1 and 2
6) Note you are now redirected back to the course details page

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 413a300299)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 13:10:21 +13:00
Katrin Fischer cd518ca5eb Bug 13856: Hard to translate strings on patron search results page
'Add selected patrons to:' at the top of the patron search result
table is hard to translate correctly, because the 'to:' appears
as a separate string from the rest of the sentence.

To test:
- Make sure patron lists are activated
- Do a patron search with more than 1 result
- Look for the text at the top of the search results table
- Verify it looks the same before and after the patch

Bonus:
- run perl translate update <langcode> and verify the
  2 strings are now 1 string with the patch applied

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cc01bfe8e8)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 13:09:15 +13:00
“ByWater ba30458110 Bug 13832 - Missing table header IDs on record holdings table in OPAC
All but two of the table headers in the item holdings table in the opac have identifiers. The remaining two should be added so they can be modified easily with CSS.

Test Plan:
1) Apply this patch
2) View the holdings table for a record
3) Note the new id field for the item holds column
4) Note the new id field for the hold prioirty column ( if enabled )

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 0e8927a5fa)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 13:05:30 +13:00
Hector Eduardo Castro Avalos 52e3cde680 Bug 13878 - Typo in help file (aqbudgets.tt)
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt:15' and check the typo "wan" or go to Administration > Acquisition parameters > Funds > Help
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed.

Sponsored-by: Universidad de El Salvador

Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx@gmail.com>

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e044995d8a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 13:01:39 +13:00
Hector Eduardo Castro Avalos 9eeb90694a Bug 13872 - Typographical error on columns_settings.tt
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/columns_settings.tt' line 9 and check the typo "columsn" and change for columns.
2) See also changes for Column settings to Columns settings at lines 3 and 15
3) Apply the patch
4) Repeat step 1 and chek if the typo is fixed or go to Administration > Additional parameters > Configure columns and go to Help page.

Sponsored-by: Universidad de El Salvador

Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx@gmail.com>

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7f893f9e1c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 13:00:43 +13:00
Jonathan Druart 729906d747 Bug 13863: Fix Datatables paging on the cities and search history pages
Test plan:
Go on admin/cities.pl and catalogue/search-history.pl and confirm the
pagination is not broken anymore.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixed conflict so patch applies on 3.18.x

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 12:59:20 +13:00
Marc Véron 23f46375f5 Bug 13826 - OPAC: Display RSS icon on list of recent comments
This patch adds RSS icon to OPAC page 'Recent comments'

To test:
1)
Enable display of 'Recent comments' in OPAC (Syspref OpacShowRecentComments)
2)
In OPAC, go to Home > Recent comments
3)
Verify that there is a link in the head part of the HTML source code (<link rel="alternate" type="application/rss+xml"....), but no RSS icon on the pate itself (like in search results).
4)
Apply patch
Result: Icon with link to RSS feed is displayed  next to title.

Bug 13826 - Follow-Up: Close </h3>

There was a slash missing.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by for the Follow Up: 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 e043b5563f)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 12:56:43 +13:00
Christophe Croullebois a3c8f2a838 Bug 13768: Correction of double quotes escaped into double quotes
Without the patch the translated pages for quotes.tt may have the problematic line broken.
So the js is broken too. The line with bad usage of double quotes escaped :
var sEmptyTable = _("No quotes available. Please use the \"Add quote\" button to add a quote.");

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

diff on staff PO file

-msgid ""
-"No quotes available. Please use the \\\"Add quote\\\" button to add a quote."
+#, fuzzy
+msgid "No quotes available. Please use the 'Add quote' button to add a quote."

No koha-qa errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7e14824009)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 12:54:55 +13:00
Katrin Fischer 8d3c58171c Bug 13861: \n in confirmation message on closing a budget
\n in strings doesn't translate well, so we move it outside
the translated string.

To test:
- create at least 2 budgets
- close one of the budgets (moving orders from one budget to the other)
- after selecting the budget to move your orders to, save
- the confirmation message shown should read:

You have chosen to move all unreceived orders from 'budget 1' to 'budget 2'.
This action cannot be reversed. Do you wish to continue?

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b4a9b23ab7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 12:54:07 +13:00
Bernardo Gonzalez Kriegel 28fbce8807 Bug 13748: Acquisition wizard: some strings not translatable
This patch removes all instances of CGI::scrolling_list from
reports/acquisitions_stats.pl, which prevented proper translation

To test:
1) Install and enable a language (es-ES or de-DE are good choices)
2) On Acquisitons wizard, some pulldown labels are not translated
3) Apply the patch
4) Update and install again the language
5) Check labels are translated and all pulldown works

This does not solve the 'Collection code' problem,
is more strange

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

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a7d4d05a7c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-28 12:52:57 +13:00
Chris Cormack 58e10601ce Merge branch '3.18.x' of git://git.koha-community.org/koha into 3.18.x 2015-03-28 12:51:08 +13:00
Galen Charlton 8a56c41073 Update release notes for 3.18.5.1
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2015-03-23 23:22:22 +00:00
Galen Charlton bf07d828d0 Increment DB revision for 3.18.5.1 release
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2015-03-23 23:06:32 +00:00
Jonathan Druart 6182dc3b48 Bug 13380: 3.18.x Fix previous DB entry
The DB entry from bug 13379 should have been executed before bug 13380.

The AV category now contain truncated values.

This patch restores the correct category values.
The DB entry from bug 13379 should have been pushed before.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-24 08:08:22 +13:00
Jonathan Druart 38d15bb20e Bug 13379: Extends authorised_values.category to varchar(32)
This patch does 2 things:
1/ It fixes a bug caused by the different data fields used for
authorised_values.category and
borrower_attribute_types.authorised_value_category (varchar(16) vs
varchar(10)).
To reproduce:
- Create a AV category with a length > 10
- Try to link a patron attribute type with this AV, it won't work.

2/ Extends this field to varchar(32): sometime 16 is not enough to
describe something

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors. Error reproduced, fixed by patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-24 08:06:38 +13:00
mxbeaulieu a0a2cea1c4 Bug 13794: Text input field values not translated
I left the code logic intact, and simply removed "text" from the regex.
Text input field values are now translated, no other logical changes are introduced.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Test:
1) Update, install and enable es-ES language
2) Go to Reports > Acquisition wizard
3) On page bottom, there is a text field with the word 'Export'
4) Switch language, the word is not translated
5) Apply the patch
6) Update and install again es-ES language
7) Reload page, text now reads 'Exportar'

No koha-qa errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c9a52f739c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-23 20:34:35 +13:00
Marc Véron 1b92f5c21c Bug 12399 - opaccredits printing at top on printable version
This patch introduces a new class "noprint" in koha-tmpl/opac-tmpl/bootstrap/css/print.css
With this class, unwanted elements can be hidden when printing.

To test:
In OPAC, do a search with many results (> 1 Page)
Print page or do a print preview
See that footer elements are not displayed correctly (as of screenshot in comment #1) and that on top of page 2 the language selector overlays the list
Apply patch
Repeat steps above.
Verify that printed page looks much nicer now by hiding unwanted elements (including e.g. RSS icon, toolbar etc.)

This mechanism can be used on other pages as well.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 21d05006c0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
2015-03-23 20:32:53 +13:00
Chris Cormack 2be314d9f0 Plaintext release notes 2015-03-22 18:52:57 +13:00
Chris Cormack 0d69c03530 Release notes 2015-03-22 18:51:02 +13:00
Chris Cormack f851a35af6 Bumping db version for 3.18.5 release 2015-03-22 18:41:24 +13:00
Chris Cormack 12eda938a1 Merge remote-tracking branch 'bernardo/3.18.05-translate' into 3.18.x 2015-03-22 18:32:45 +13:00
Dobrica Pavlinusic ab60b4a60b Bug 13709 - Patron cards creator utf-8 encoding and ttf fonts broken
This change is similar to Bug 8375 which introduced ttf fonts for
labels printing in order to support diacritics and utf-8 encoding,
but this change was never implemented for patron cards.

Test scenario:

1. make sure that you have <ttf> font mapping in koha-conf.xml
2. define partron card layout, template, profile and batch
   (with utf-8 chars, probably in patron firstname or surname)
3. verify that without this patch pdf export file is error message
   Wide character in compress at /usr/share/perl5/PDF/Reuse.pm line 820
4. apply this patch and verify that generated pdf has correct encoding

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d149cd1d97)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:25:05 +13:00
Jonathan Druart 5168af2c23 Bug 13586: Remove some other occurrences
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6b3fd48f3f)
2015-03-22 18:16:05 +13:00
Jonathan Druart eae219c19e Bug 13586: Remove the entire block
Previous patch remove the condition but not the block tested.
The entire block should be removed.

Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a5290b2f9d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:15:45 +13:00
Rochelle 82f30ad218 Bug 13586: Makefile.PL mentions win32
Edited Makefile.PL to remove mentions of win32
To test: Run Makefile.PL

Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 4c196e62c6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:14:55 +13:00