]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoMerge branch 'bug_2046' into 3.14-master
Jared Camins-Esakov [Sat, 27 Apr 2013 12:12:18 +0000 (08:12 -0400)]
Merge branch 'bug_2046' into 3.14-master

11 years agoBug 2046: Increment version number
Jared Camins-Esakov [Sat, 27 Apr 2013 12:11:39 +0000 (08:11 -0400)]
Bug 2046: Increment version number

Database update for bug 2046 has been given version 3.11.00.203

11 years agoBug 2046 - Suggestions: Title Field too small
Kristina D.C. Hoeppner [Fri, 29 Mar 2013 02:04:42 +0000 (15:04 +1300)]
Bug 2046 - Suggestions: Title Field too small

Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.

To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10093' into 3.14-master
Jared Camins-Esakov [Sat, 27 Apr 2013 11:21:50 +0000 (07:21 -0400)]
Merge branch 'bug_10093' into 3.14-master

11 years agoAdd Stefano Bargioni to the history
Jared Camins-Esakov [Sat, 27 Apr 2013 11:21:25 +0000 (07:21 -0400)]
Add Stefano Bargioni to the history

Welcome, Stefano, you are the 209th developer with a patch in Koha!

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10093 - Typo in marc21_leader.tt
Stefano Bargioni [Fri, 26 Apr 2013 09:18:52 +0000 (11:18 +0200)]
Bug 10093 - Typo in marc21_leader.tt

fixed a typo in marc 21 leader builder about the value 'b', Serial component part

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10110' into 3.14-master
Jared Camins-Esakov [Sat, 27 Apr 2013 11:15:38 +0000 (07:15 -0400)]
Merge branch 'bug_10110' into 3.14-master

11 years agoBug 10110 Followup for Acquisition.pm
Marcel de Rooy [Thu, 25 Apr 2013 12:48:03 +0000 (14:48 +0200)]
Bug 10110 Followup for Acquisition.pm

Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a comment, no danger from that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10110: Problems with diacritics in saved SQL reports
Marcel de Rooy [Thu, 25 Apr 2013 11:54:31 +0000 (13:54 +0200)]
Bug 10110: Problems with diacritics in saved SQL reports

Adds decoding for cgi params (for completeness).
Apparently, the NAME attribute of DBI statement handle has a UTF8 bug.
Fixing this by decoding the returned column names.
Did this in a shared routine.

http://bugs.koha-community.org/show_bug.cgi?id=10110
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copying test plan from bug report:

Example SQL:
select
branchname as "Bibliothek (üöä)",
branchname "Bibiothek (üäa)",
branchname
from branches where branchcode = <<Bibliothekskürzel|branches>>

1) Create report with given example SQL or your own including
   some diacritics in the columnnames
2) Save the report and run it
3) Verify column names are broken before patch, but fixed after..

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9684' into 3.14-master
Jared Camins-Esakov [Sat, 27 Apr 2013 11:08:15 +0000 (07:08 -0400)]
Merge branch 'bug_9684' into 3.14-master

11 years agoBug 9684 : Correct path to compact.xsl
Colin Campbell [Fri, 26 Apr 2013 16:11:37 +0000 (17:11 +0100)]
Bug 9684 : Correct path to compact.xsl

When try to display card view of retrieved record
error occurred as compact.xsl could not be found
script was constructing path as though it was opac

Also added fallback to en version if no xsl file
found under current lang as done in opac-showmarc.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Test plan:

* Set sys pref to use CCSR
* Do a Z39.50 Search
* Click 'card' on one of the results
* confirm that there is no error.

All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am astonished that opacthemes affects Z39.50 search in
staff so this might be fixing a bigger problem.

Checked that clicking on Card works for both themes now
correctly after I confirmed the bug.
Also all views in OPAC were checked for both themes.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9659 follow-up: correct syntax for older Perl
Jared Camins-Esakov [Sat, 27 Apr 2013 01:32:49 +0000 (21:32 -0400)]
Bug 9659 follow-up: correct syntax for older Perl

A construction that was a syntax error in older versions of Perl was
causing problems for jenkins. This patch fixes it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9886' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 22:37:35 +0000 (18:37 -0400)]
Merge branch 'bug_9886' into 3.14-master

11 years agoBug 9886: ParseLetter removes too often punctuation characters from fields
Marcel de Rooy [Thu, 21 Mar 2013 12:56:01 +0000 (13:56 +0100)]
Bug 9886: ParseLetter removes too often punctuation characters from fields

This patch makes ParseLetter somewhat more restrictive in removing
punctuation characters from the end of a table field.
Based on the assumption that we want to remove punctuation from fields in
biblio and biblioitems (like ISBD).
ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still
removes e.g. a colon (:) at the end of a title.
Removed an unneeded global and lookahead from the regex.

Test plan:
1) Add a colon (:) to the end of a title.
2) Add a colon to the end of item copynumber.
3) Place a hold on that item. Check it in. Confirm hold.
4) Check the email or print notice generated. There should be no colon at the
end of the title, but the colon in the copynumber should still be there.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I compared checkout notices with lots of different fields before
and after applying the patch. For example the ) at the end of a
field in branches is now longer removed. Other fields looked ok
before and after.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9671' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 22:35:56 +0000 (18:35 -0400)]
Merge branch 'bug_9671' into 3.14-master

11 years agoBug 9671: Make fines.pl help text more accurate
Aaron Wells [Mon, 25 Mar 2013 03:56:24 +0000 (16:56 +1300)]
Bug 9671: Make fines.pl help text more accurate

To test:

run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Documentation change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10040' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 22:33:03 +0000 (18:33 -0400)]
Merge branch 'bug_10040' into 3.14-master

11 years agoBug 10040: Capitalization wrong when deleting subfields from authority
Katrin Fischer [Sun, 14 Apr 2013 18:59:08 +0000 (20:59 +0200)]
Bug 10040: Capitalization wrong when deleting subfields from authority

Confirmation message for deleting subfields from an authority framework
has wrong capitalization.

To reproduce:
1) Go to Administration > Authority types
2) Click on MARC structure for one of the authority types
3) Click on the subfields link for one of the fields
4) Delete one of the subfields

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10073' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 22:31:13 +0000 (18:31 -0400)]
Merge branch 'bug_10073' into 3.14-master

11 years agoBug 10073: Show ccode or location also if not bound to Authorized Values in XSLT
Marcel de Rooy [Thu, 18 Apr 2013 08:03:38 +0000 (10:03 +0200)]
Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT

If you do not have ccode or location governed by authorized value
(you can release this default connection in the marc structure),
these item values are not passed through in the items section,
created by buildKohaItemsNamespace for XSLTParse4Display.

This simple patch checks if the authorized value hash on ccode or
location returns something and passes the original value in otherwise.

Test plan:
Temporarily disconnect ccode and location from authorized values
in MARC structure.
Edit an item, put some values in location and ccode.
Look at this record via opac search (XSLT enabled). Toggle the value of
OPACItemLocation to show ccode or location before call number.
Restore authorized values-connection when applicable.

Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful
to apply these
patches when testing this.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described for the XSLT result list.
The text is shown when OpacItemLocation is set to show collection
or location.

Note: Displaying location and collection without using authorised
values doesn't work in other places like the detail page item table.
So this will need more work to be fully functional.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10103' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 22:17:09 +0000 (18:17 -0400)]
Merge branch 'bug_10103' into 3.14-master

11 years agoBug 10103 UniqueItemFields is missing from sysprefs.sql
Mirko Tietgen [Tue, 23 Apr 2013 16:05:22 +0000 (18:05 +0200)]
Bug 10103 UniqueItemFields is missing from sysprefs.sql

Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql.
Also fixes an unrelated  missing semicolon in sysprefs.sql

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9219' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 12:18:59 +0000 (08:18 -0400)]
Merge branch 'bug_9219' into 3.14-master

11 years agoBug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are...
Kyle M Hall [Wed, 5 Dec 2012 18:55:00 +0000 (13:55 -0500)]
Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl

This patch adds the lost and damaged status for an issued item to the
table of issued items on circulation.pl to make it align more closely to
the same table on moremember.pl

Test Plan:
1) Apply patch
2) Issue an item
3) Set the item's damaged status
4) Verify the status is showing near the date due on circulation.pl
5) Clear the damaged status and set the lost status again
6) Repeat step 4

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could only test this with the DAMAGED value, because
currently lost items are removed from the patron account
when you set the status.
I know there is a patch somewhere
to make it optional and the change looks alright.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9659' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 12:09:23 +0000 (08:09 -0400)]
Merge branch 'bug_9659' into 3.14-master

11 years agoBug 9659: Move new unit test to db-dependent directory
Jared Camins-Esakov [Fri, 26 Apr 2013 12:08:07 +0000 (08:08 -0400)]
Bug 9659: Move new unit test to db-dependent directory

C4::Reports::Guided requires a koha-conf.xml file to be in place in
order to load. This means that any test which uses it has to go in
t/db_dependent

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9659 - QA Follow up: Unit tests
Tomas Cohen Arazi [Wed, 10 Apr 2013 18:50:50 +0000 (15:50 -0300)]
Bug 9659 - QA Follow up: Unit tests

Added some tests against the methods added by this patch.

To test, prove -v
- t/Koha.t
- t/ReportsGuided.t

Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works quite nicely!
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9659 - Better handling of non-existent authorised value categories used in SQL...
Tomas Cohen Arazi [Tue, 19 Feb 2013 18:58:53 +0000 (15:58 -0300)]
Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports

A user might create a SQL report that relies on non-existent authorised value categories.
Because of a typo, or just because they copy&pasted the report from the Wiki.

Use cases are:

- The user creates a report from SQL
  a) Uses bad authorised values
  b) Clicks 'Save Report'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Save Report'

- The user edits an already saved report (Update SQL)
  a) Uses bad authorised values
  b) Clicks 'Update SQL'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Update SQL'

- The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things.

To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'):

SELECT *
FROM itemtypes
WHERE hola=<<Test branch1|branchee>> AND
      hola2=<<Test branch2|brancha>>

Regards
To+

Notes:
- I added several comments on the code.
- Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it).
- Added the following methods
   -  C4::Reports::Guided::GetReservedAuthorisedValues
   -  C4::Reports::Guided::GetParametersFromSQL
   -  C4::Reports::Guided::IsAuthorisedValueValid
   -  C4::Reports::Guided::ValidateSQLParameters
   -  C4::Koha::IsAuthorisedValueCategory
- Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D.
- Fixed some trivial perlcritic -5 errors
- Removed some debugging stuff left by mistake
- Fixed some POD problems
- Optimal SQL-driven IsAuthorisedValueCategory method
- Thanks to Owen and Jared for their patience heh.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No koha-qa errors.

Test:
Tried with examples (from help and test plan) reports, correctly
identifies invalid authorized values, and no problem with
authorized ones.

NOTE: Online help for this does not states that partial values
need to be between '%' in a SQLish way. Perhaps this could be
addressed inserting % in values or adding a checkbox (partial|exact).
Or changing help.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10107' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 11:55:53 +0000 (07:55 -0400)]
Merge branch 'bug_10107' into 3.14-master

11 years agoBug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC
Tomas Cohen Arazi [Wed, 24 Apr 2013 14:40:18 +0000 (11:40 -0300)]
Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC

This bug is present in master and (at least 3.8.x, where we spotted it).
The patch makes adding items, to a list from the results page, not rely
only on opacbookbag syspref but also 'virtualshelves'.

Regards
To+

PS: Thanks Graciela Galli for reporting.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only patch, works nicely.
Test plan copied from bug report:

- Disable the opacbookbag syspref
- Login in the OPAC
- Create a list (I tested a private one)
- Search in your db for some biblios.
- Choose some and add them to the created list
- Go to your users's page, to the my lists tab
- Your list is empty.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10115' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 11:54:13 +0000 (07:54 -0400)]
Merge branch 'bug_10115' into 3.14-master

11 years agoBug 10115 - Hiding advanced search in Orders search tab removes plus button
Owen Leonard [Thu, 25 Apr 2013 12:49:51 +0000 (08:49 -0400)]
Bug 10115 - Hiding advanced search in Orders search tab removes plus button

The logic of the JavaScript for showing and hiding additional options in
the orders search form wasn't quite right, resulting in the +/- control
being hidden incorrectly.

This patch corrects and simplifies the JS in order to fix the problem.

To test:
 - Open any page in Acquisitions which shows the orders search
   form in the header search bar (for instance, Acquisitions home).
 - Open the orders search tab and click on the "+" to show more
   options.
 - Click the "-" to hide the additional options. The additional options
   should now be hidden and the "+" displayed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10006' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 02:14:26 +0000 (22:14 -0400)]
Merge branch 'bug_10006' into 3.14-master

11 years agoBug 10006 - holding branch is not available to XSLT display
Liz Rea [Tue, 9 Apr 2013 01:20:09 +0000 (13:20 +1200)]
Bug 10006 - holding branch is not available to XSLT display

To test:

Use attached XSLT stylesheet for OPAC Results
 * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file.
 * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem.

Verify that the OPAC results now show the holding branch instead of the home branch.

Possible fail states:

* no branch is shown (only call numbers, if given)
* the wrong branch is shown

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9831' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 02:13:28 +0000 (22:13 -0400)]
Merge branch 'bug_9831' into 3.14-master

11 years agoBug 9831: Correct and add authorised values un French UNIMARC installer
Mathieu Saby [Sun, 17 Mar 2013 18:11:29 +0000 (19:11 +0100)]
Bug 9831: Correct and add authorised values un French UNIMARC installer

2d version, Correcting a typo

In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong.
A lot of unimarc function codes and language codes are missing.
Reference for country codes is ISO 3166-1 standard
Reference for language codes is ISO 632-2 standard
Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website)

This patch correct wrong values and add new ones.
For the moment I keep some wrong codes, because they may be used by some librairies :
- language codes deu, lan, mla, sam
- function codes 571, 573, 574, 575

To test :
1) take a fresh new koha
2) apply patch
3) install Koha, choosing French UNIMARC settings
4) look if values are OK in authorised values and if you can use them in cataloguing module

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL change only, French installer installs authorised values
without problems.

Note: There is a problem loading sample labels unrelated to this
patch:

sample_labels.sql
ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10045' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 02:11:23 +0000 (22:11 -0400)]
Merge branch 'bug_10045' into 3.14-master

11 years agoBug 10045: Switch budget to fund in suggestions
Katrin Fischer [Sun, 14 Apr 2013 16:02:43 +0000 (18:02 +0200)]
Bug 10045: Switch budget to fund in suggestions

Labels are budget, but should be fund.

To test:
1) Check the table on the suggestions page.
2) Check the suggestion edit form.
3) Check the suggestion display.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10106' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 02:08:33 +0000 (22:08 -0400)]
Merge branch 'bug_10106' into 3.14-master

11 years agoBug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit...
Owen Leonard [Wed, 24 Apr 2013 12:52:12 +0000 (08:52 -0400)]
Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen

A misplaced closing </li> causes the "reopen" checkbox to be misplaced
if you're editing the a closed invoice. This patch puts the </li> in its
proper place.

To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and
confirm that the "reopen" checkbox is correctly placed.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problem easy to spot, patch fixes it perfectly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8068' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 02:06:12 +0000 (22:06 -0400)]
Merge branch 'bug_8068' into 3.14-master

11 years agoBug 8068: Standardize terms used on acquisitions statistics
Katrin Fischer [Sun, 14 Apr 2013 15:44:43 +0000 (17:44 +0200)]
Bug 8068: Standardize terms used on acquisitions statistics

branch > library
budget > fund
bookseller, supplier > vendor
and capitalization

To test:
1) Go to Reports > Acquisitions statistics
2) Check the labels and options of the form for correctness.
3) Run a few test searches to make sure functionality is
   unchanged.

Unfortunately, some strings are from the .pl file, so a follow
up moving those to the templates is needed.
To make the changes consistent I have changed them in the .pl file.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9766' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:56:51 +0000 (21:56 -0400)]
Merge branch 'bug_9766' into 3.14-master

11 years agoBug 9766 - Remove YUI menu on budget planning page in favor of different column-hidin...
Owen Leonard [Thu, 7 Mar 2013 21:07:16 +0000 (16:07 -0500)]
Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system

The budget planning table previously used a YUI menu as part of a
system for hiding and showing table columns. Instead of trying
to convert that sytem to Bootstrap I have used code from the
batch modification/deletion pages which uses a list of checkboxes
to show and hide table columns. This has the advantage of giving
the user visual feedback of what columns are hidden and of offering the
user an interface which is familiar from other pages.

This patch also moves CSS from a batch-operations-specific
CSS file into the main CSS file. Batch modification templates have been
modified accordingly.

To test, view the budget planning page and choose different
"plan by" options (by month, by library, by item type). Test
the show/hide action on each individual column and using the
"show all" and "hide all" checkboxes.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.

This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9818' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:53:43 +0000 (21:53 -0400)]
Merge branch 'bug_9818' into 3.14-master

11 years agoBug 9818: Fixing capitalization and remove dollar sign
Katrin Fischer [Mon, 15 Apr 2013 04:21:55 +0000 (06:21 +0200)]
Bug 9818: Fixing capitalization and remove dollar sign

Overdue Fines Cap ($) > Overdue fines cap (amount)

To test:
Go to administration > circulation and fine rules
Check column label Overdue fines cap now follows capitalization rules
and has no dollar sign.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9850' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:49:41 +0000 (21:49 -0400)]
Merge branch 'bug_9850' into 3.14-master

11 years agoBug 9850: Fix Patron statistics link
Jared Camins-Esakov [Fri, 26 Apr 2013 01:49:15 +0000 (21:49 -0400)]
Bug 9850: Fix Patron statistics link

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Fix patron routing lists link
Jared Camins-Esakov [Fri, 26 Apr 2013 01:48:03 +0000 (21:48 -0400)]
Bug 9850: Fix patron routing lists link

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Fix patron files link
Jared Camins-Esakov [Fri, 26 Apr 2013 01:47:01 +0000 (21:47 -0400)]
Bug 9850: Fix patron files link

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Lists Help
Nicole C. Engard [Thu, 28 Mar 2013 03:16:42 +0000 (23:16 -0400)]
Bug 9850: Update Lists Help

This updates the manual link in the lists help file.

To test:

Visit lists pages in the staff client, view the help and confirm link goes
to the right place.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update holds help file
Nicole C. Engard [Thu, 28 Mar 2013 03:14:16 +0000 (23:14 -0400)]
Bug 9850: Update holds help file

This updates the manual link on the holds help file.

To test:

Visit the holds tab on any bib record and click the Help link. Make sure it
goes to the right place.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Add missing tags help file
Nicole C. Engard [Thu, 28 Mar 2013 02:35:30 +0000 (22:35 -0400)]
Bug 9850: Add missing tags help file

This patch adds a help file to the listing of titles that use a tag in the
tag moderation tool.

To test:

* Visit the Tag Moderation Tool
* Click on a accepted tag
* Check that the help file loads on the list and that the text and
links are right.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Tags & Comments Help
Nicole C. Engard [Thu, 28 Mar 2013 02:31:57 +0000 (22:31 -0400)]
Bug 9850: Update Tags & Comments Help

This patch updates the text and links for the Tag and Comment
moderation tools.

To test:

Visit the help on the tags and comments tools and confirm that text and
links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Catalogue help files
Nicole C. Engard [Wed, 27 Mar 2013 18:41:05 +0000 (14:41 -0400)]
Bug 9850: Catalogue help files

This patch updates the help files in the catalogue folder.

To test:

Visit the help on the search, detail pages, item details and
item history pages and confirm text and links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Acq Help Files for 3.12
Nicole C. Engard [Wed, 27 Mar 2013 16:49:05 +0000 (12:49 -0400)]
Bug 9850: Acq Help Files for 3.12

This patch updates the manual links and some text in the acq
help files.

To test:

Visit help on all acq pages and make sure links and text are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Admin Help Files for 3.12
Nicole C. Engard [Sun, 24 Mar 2013 05:14:58 +0000 (01:14 -0400)]
Bug 9850: Update Admin Help Files for 3.12

This patch updates the links to the manual and the text of the
admin help files.

To test:

Visit the help files on all admin pages and make sure the links and text
are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Patron Help Files for 3.12
Nicole C. Engard [Sat, 23 Mar 2013 23:53:14 +0000 (19:53 -0400)]
Bug 9850: Update Patron Help Files for 3.12

This patch updates all the help files in the members folder. It also
adds a missing help file for approving patron account changes.

To Test:

Visit the help on every patron page and make sure the text and
manual links are all right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed 2 obvious typos mentioned on the bug report.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Patron Card Help Files
Nicole C. Engard [Sat, 23 Mar 2013 13:46:38 +0000 (09:46 -0400)]
Bug 9850: Update Patron Card Help Files

This patch updates the links to the manual in the patron card
creator help files. There were no other changes.

To test:

Visit help on the patron card creator tool and make sure the links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Label Help Files
Nicole C. Engard [Sat, 23 Mar 2013 13:42:12 +0000 (09:42 -0400)]
Bug 9850: Update Label Help Files

This patch updates the manual links in the label creator
help files. There were not other string changes.

To test:

Visit the help on the label creator and make sure that the
links go to the 3.12 manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Authority Help Files
Nicole C. Engard [Sat, 23 Mar 2013 13:17:00 +0000 (09:17 -0400)]
Bug 9850: Update Authority Help Files

This patch just updates the links to the manual in the
Authority help files.

To Test:

Visit the help on all authority pages and click the manual link
in the help pop up. It should go to the 3.12 manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9850: Update Stray Help Files
Nicole C. Engard [Sat, 23 Mar 2013 13:09:39 +0000 (09:09 -0400)]
Bug 9850: Update Stray Help Files

This patch updates the help files which do not have a module
folder.

To test:

Visit About Koha, Koha Home, and the No Help Found pages and
check links to the manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9925' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:33:37 +0000 (21:33 -0400)]
Merge branch 'bug_9925' into 3.14-master

11 years agoBug 9925 - Remove unused table-pager include
Owen Leonard [Tue, 9 Apr 2013 13:29:32 +0000 (09:29 -0400)]
Bug 9925 - Remove unused table-pager include

While the tablesorter plugin has not been completely eliminated from the
staff client yet, there are no more instances where it requires the
include file for showing paging controls. table-pager.inc can be safely
removed.

To test, apply the patch and confirm that the file is gone. A search of
Koha templates for references to table-pager.inc should return no
results.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10050' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:22:16 +0000 (21:22 -0400)]
Merge branch 'bug_10050' into 3.14-master

11 years agoBug 10050: Update German web installer files for 3.12 - Language settings
Katrin Fischer [Sun, 14 Apr 2013 21:28:41 +0000 (23:28 +0200)]
Bug 10050: Update German web installer files for 3.12 - Language settings

Activate German and English for OPAC and intranet by default.

To test:
- Run the German web installer
- Check that when logging into Koha the German interface is shown
  and you can switch between English and German using the links
  at the bottom of the page
- Check language relevant settings in the system preferences
  are correctly set

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10050: Update German web installer files for 3.12 - Optional
Katrin Fischer [Sun, 14 Apr 2013 20:56:30 +0000 (22:56 +0200)]
Bug 10050: Update German web installer files for 3.12 - Optional

This patch updates the German web installer files from the
optional directory.

This includes:
- Adding the bridge/reference.gif to the REF itemtype
- Updating currency rates and setting EUR to active
- Adding branchcode MPL to the sample holidays
- Updating a few strings on the patroncard samples
- Fixing typos and rephrasing

To test:
- Run the web installer with German installed
- Verify all optional SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10050: Update German web installer files for 3.12 - Mandatory
Katrin Fischer [Sun, 14 Apr 2013 20:14:50 +0000 (22:14 +0200)]
Bug 10050: Update German web installer files for 3.12 - Mandatory

This patch updates the German web installer files from the
mandatory directory.

This includes:
- CalendarFirstDayOfWeek defaults to Monday
- gist rates default to 0.07|0.19|0.00
- RoutlingListNote default text translation
- uniqueitemfields default set to barcode stocknumber
- Translation of new user flags and permissions
- Corrections to existing translations and typo corrections

To test:
- Run the web installer with German installed
- Verify all mandatory SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10070' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 00:35:25 +0000 (20:35 -0400)]
Merge branch 'bug_10070' into 3.14-master

11 years agoBug 10070: Anonymous search history is not being set in the cookie
Jonathan Druart [Wed, 17 Apr 2013 13:37:57 +0000 (15:37 +0200)]
Bug 10070: Anonymous search history is not being set in the cookie

Test plan:
1 - turn on EnableOpacSearchHistory
2 - launch some searches at the opac
3 - go to your search history
4 - there is no history!
5 - apply this patch
6 - retry steps 1 to 3
7 - your history search is available!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This does fix the bug, but does undo the change to make the cookie
utf-8 safe, however I think that change was done in the wrong way so
I am happy to sign this off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Wondering if the comment line should be deleted now too.
Patch fixes the problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9804' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 13:16:20 +0000 (09:16 -0400)]
Merge branch 'bug_9804' into 3.14-master

11 years agoBug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml
Magnus Enger [Mon, 15 Apr 2013 18:24:08 +0000 (20:24 +0200)]
Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml

When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the
wrong name, and called it biblio-zebra-indexdefs.xml. This patch
fixes that.

To reproduce:
- Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra-
  indexdefs.xml exists

To test:
- Apply the patch and check that etc/zebradb/marc_defs/normarc/
  biblios/biblio-zebra-indexdefs.xml no longer exists, but that
  etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
  does exist.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9903' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 13:11:22 +0000 (09:11 -0400)]
Merge branch 'bug_9903' into 3.14-master

11 years agoBug 9903: Followup: use the KohaDates T::T plugin to display dates.
Jonathan Druart [Wed, 24 Apr 2013 08:31:19 +0000 (10:31 +0200)]
Bug 9903: Followup: use the KohaDates T::T plugin to display dates.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9903 - Sort by date broken on patron detail page
Owen Leonard [Tue, 9 Apr 2013 12:55:45 +0000 (08:55 -0400)]
Bug 9903 - Sort by date broken on patron detail page

When the patron detail page switched to DataTables no accommodation was
made for metric date formats in sorting.

This patch adds sorting based on data in a span's title attribute, and
thus requires that the patch for Bug 9887 be applied.

To test, view the detail page for a patron who has assorted checkouts,
relatives' checkouts, and holds. Sorting of date columns should be
correct with the dateformat preference set to any value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Nice improvement.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10023' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 12:57:42 +0000 (08:57 -0400)]
Merge branch 'bug_10023' into 3.14-master

11 years agoBug 10023 follow-up: Remove the last occurrences of N[degree sign]
Jared Camins-Esakov [Wed, 24 Apr 2013 12:48:30 +0000 (08:48 -0400)]
Bug 10023 follow-up: Remove the last occurrences of N[degree sign]

11 years agoBug 10023: Change degree notation for number to No.
Katrin Fischer [Sun, 14 Apr 2013 14:29:40 +0000 (16:29 +0200)]
Bug 10023: Change degree notation for number to No.

This patch changes N<little circle> to No. in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled No.

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I prefer "No." over "#" and my survey of the templates shows that "No."
appears more often. Looks like something to add to our style guide.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10023: Change degree notation for number to #
Katrin Fischer [Sun, 14 Apr 2013 14:57:03 +0000 (16:57 +0200)]
Bug 10023: Change degree notation for number to #

This patch changes N<little circle> to # in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled #

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9358' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 13:04:19 +0000 (09:04 -0400)]
Merge branch 'bug_9358' into 3.14-master

11 years agoBug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21...
Bernardo Gonzalez Kriegel [Tue, 26 Mar 2013 23:50:05 +0000 (20:50 -0300)]
Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This little patch adds a few values and descriptions to complete
value builder for marc21 008.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Follow-up works as described.
XML change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15
Bernardo Gonzalez Kriegel [Mon, 7 Jan 2013 22:10:56 +0000 (19:10 -0300)]
Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields

Leader18 c and i is fixed on Bug 9357

Added missing/renamed fields on 007

Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.

To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
   on 008, BKS, check for example 33- Literary form,
   i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
   On 008/6 descriptions are absent

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10026' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:44:07 +0000 (08:44 -0400)]
Merge branch 'bug_10026' into 3.14-master

11 years agoBug 10026 - OPAC cart not showing location anymore
Owen Leonard [Wed, 10 Apr 2013 18:24:16 +0000 (14:24 -0400)]
Bug 10026 - OPAC cart not showing location anymore

When Bug 7570 added availability information to the cart it switched
which subroutine was used to get item information, and thus changed how
the information was being returned.

This patch makes accommodations for this change by adding processing of
item location information to the script in a way that will match the
existing template variables.

To test, add items to the cart in the OPAC some of which include
shelving location information. When you view the cart you should see the
shelving location displayed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8294' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:39:11 +0000 (08:39 -0400)]
Merge branch 'bug_8294' into 3.14-master

11 years agoBug 8294: Fix display of serial enumeration for OPAC holds
Katrin Fischer [Sun, 14 Apr 2013 17:29:13 +0000 (19:29 +0200)]
Bug 8294: Fix display of serial enumeration for OPAC holds

It turns out that this was not a missing but a broken feature.
This patch corrects the template variables to make enumchron
show up on the item table for item level holds in the OPAC.

To test:
Try to place item level holds on
1) a record where at least one item
2) a record where none of the items
has items.enumchron information.

The column with enumchron should only show for 1), but not
for 2).

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10085' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:34:02 +0000 (08:34 -0400)]
Merge branch 'bug_10085' into 3.14-master

11 years agoBug 10085: unapi does not function under Plack
Jared Camins-Esakov [Sat, 20 Apr 2013 02:52:07 +0000 (22:52 -0400)]
Bug 10085: unapi does not function under Plack

The following errors appear when trying to use unapi under Plack (among
others):
Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173.
Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185.

To test:
1) Try to view /cgi-bin/koha/unapi under Plack
2) There is no step 2. Plack crashes.
3) Apply patch.
4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I'm puzzled how this ever worked anyway, accidentally i'm guessing,
this tidies up some lazy coding

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9523' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 01:06:56 +0000 (21:06 -0400)]
Merge branch 'bug_9523' into 3.14-master

11 years agoBug 9523: importing staged bib records hangs if a matched bib has been deleted
Kyle M Hall [Thu, 7 Feb 2013 14:57:47 +0000 (09:57 -0500)]
Bug 9523: importing staged bib records hangs if a matched bib has been deleted

Test Plan:
1) Stage a MARC record file that will have matches with existing records
2) Delete the bib from Koha that was matched on
3) Attempt to import the records into Koha, the import will hang
4) Apply the patch
5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9588' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 00:54:25 +0000 (20:54 -0400)]
Merge branch 'bug_9588' into 3.14-master

11 years agoBug 9588: weighted search query with index
Fridolyn SOMERS [Mon, 11 Feb 2013 13:47:09 +0000 (14:47 +0100)]
Bug 9588: weighted search query with index

When QueryWeightFields is enabled, the searching query is created with several options.
In C4::Search::_build_weighted_query, when no index is defined, the query is build with fuzzy and stemming options. When an index is defined, theses options are missing, only unconditional right truncation is used.
The consequence is that when QueryStemming is disabled, a search with index can give more results (due to right truncation) that a search without.

This patch adds stemming and fuzzy on search with index, conditioned with QueryFuzzy and QuerryStemming sysprefs.
Also changes world list search (wrld) weight to r6 in order to set fuzzy search to r8 and stemming search to r9 (like search without index).

Test plan :
- Go to searching preferences (admin/preferences.pl?tab=searching)
- Set QueryAutoTruncate to "only if * is added"
- Set QueryFuzzy and QuerryStemming to "Don't try"
- Set QueryWeightFields to "Enable"
- Go to advanced search page
- Select an indexe (ie Title) and perform a search on a short word
=> Look at zebrarv log and see that query does not contain right truncation : @attr 5=1
- Set QueryFuzzy to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains fuzzy : @attr 5=103
- Set QueryFuzzy to "Don't try" and QuerryStemming to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains rigth truncation on stemmed word : @attr 5=1

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch makes Fuzzy and Stemming influence search results on weighted
queries when using an index. Side-effect is however that the results for a
search like index=term* (add truncation manually too) could be LOWER than the
the number of hits for index=term. Further comments on Bugzilla.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9984' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 00:44:05 +0000 (20:44 -0400)]
Merge branch 'bug_9984' into 3.14-master

11 years agoBug 9984: Remove server-side sort on the hold ratios table
Jonathan Druart [Wed, 3 Apr 2013 13:31:08 +0000 (15:31 +0200)]
Bug 9984: Remove server-side sort on the hold ratios table

JS is a requirement for the staff client, so the sort link on header is
useless.

Test plan:
Check that there is no regression (sort, data, etc.) on the hold ratios
table.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on top of patch for bug 9459.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10049' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 14:00:43 +0000 (10:00 -0400)]
Merge branch 'bug_10049' into 3.14-master

11 years agoBug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates
Owen Leonard [Mon, 15 Apr 2013 13:23:58 +0000 (09:23 -0400)]
Bug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates

This patch is an alternate solution to the problem of "0" not appearing
on the comment tab in translated templates. It uses the Template Toolkit
option of specifying a default value for a variable:

[% reviews.size || 0 %]

This syntax is already in use elsewhere in the template.

Same test plan:

1) Make sure comments/reviews are activated
2) Find a record with 0 comments/reviews in the opac
3) The tab shows: Comments ( 0 )
4) Switch to any other languages.
5) Tab now shows: <translation of Comments> ( )
6) Apply patch
7) Check English templates stil work correctly
8) Rerun 'perl translate install <langcode>
9) Check display is now correct.
10) Also check that number shows correctly for records
    with comments.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Tested with nb-NO. English still works after the patch. Norwegian
was showing "Comments" untranslated, which had me a bit unnerved.
Turns out the string to be translated changed from "Comments ( %s%s%s%s )"
to "Comments ( %s )", so to make sure all was well, I had to update
the nb-NO translation, fix the number of %s's in the Norwegian string,
make sure it was not marked as fuzzy and then install nb-NO. And it
works!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9839' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:57:10 +0000 (09:57 -0400)]
Merge branch 'bug_9839' into 3.14-master

11 years agoBug 9839 - when importing MARC records, item record not created even when set to...
Kyle M Hall [Wed, 27 Mar 2013 17:57:01 +0000 (13:57 -0400)]
Bug 9839 - when importing MARC records, item record not created even when set to "always add"

Test Plan:
1) Catalog a new record with an ISBN
2) Add some items to the record
3) Download the record as MARCXML
4) Delete the itemnumbers from the 952 fields in the record,
   Change the barcode fields to unused barcodes
5) Use xml2marc to save as a standard MARC file
6) Import the record using the 'Stage MARC for import' tool
   Use the settings:
       Record matching rule: ISBN
       Action if matching record found: ignore
       Action if no match found: ignore
       Item processing: always_add
       Check for embedded item record data?: Yes
       How to process items: Always add items
7) Import, note the bib is ignored, and the items are not processed
8) Undo import into catalog
8) Apply this patch
9) Import this batch into the catalog
10) Note the items were processed and are now added to the matching
record

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Tested with UNIMARC record. I followed the test plan, just changing 952 by 995
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9995' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:54:56 +0000 (09:54 -0400)]
Merge branch 'bug_9995' into 3.14-master

11 years agoBug 9995 - For reference items no longer listed in XSLT result lists
Kyle M Hall [Mon, 8 Apr 2013 13:07:43 +0000 (09:07 -0400)]
Bug 9995 - For reference items no longer listed in XSLT result lists

Re-added the xsl that shouldn't have been removed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with different settings for OpacItemLocation
and not for loan set in the item and for the item type.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>