]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 8933: Update transport cost matrix styles
Nicole C. Engard [Sat, 13 Oct 2012 11:11:10 +0000 (07:11 -0400)]
Bug 8933: Update transport cost matrix styles

The transport cost matrix is capitlized wrong (based on our
rules). This patch fixes capitalization errors and adds the
matrix to the admin menu where it was missing before.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8916 follow-up adding Mathieu Saby to contributors list
Paul Poulain [Mon, 22 Oct 2012 15:30:41 +0000 (17:30 +0200)]
Bug 8916 follow-up adding Mathieu Saby to contributors list

Also adding 3.8.6 release

12 years agoBug 8916: Hide Curriculum index in advanced search if marcflavor = unimarc
Mathieu Saby [Sat, 13 Oct 2012 08:36:37 +0000 (10:36 +0200)]
Bug 8916: Hide Curriculum index in advanced search if marcflavor = unimarc

This patch hides curriculum option value in koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc and koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt if marcflavor = UNIMARC

To test
- set marcflavour to UNIMARC, this option should be hidden in the index list in opac and staff interface advanced search
- set marcflavour to MARC21, this option should be visible, as before

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8898 - Remove unused mainmenu include and related styles in the staff client
Owen Leonard [Wed, 10 Oct 2012 18:33:04 +0000 (14:33 -0400)]
Bug 8898 - Remove unused mainmenu include and related styles in the staff client

This patch removes the mainmenu and additem-menu includes and #navigation
references in staff-global.css which were used by those includes.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBabeltheque: Remove the unused tab on the opac detail page
Jonathan Druart [Wed, 19 Sep 2012 13:05:03 +0000 (15:05 +0200)]
Babeltheque: Remove the unused tab on the opac detail page

http://bugs.koha-community.org/show_bug.cgi?id=8792
Signed-off-by: Marc Veron <veron@veron.ch>
Babeltheque tab is removed as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7483 follow-up replacing tabs by 4 spaces in both templates
Paul Poulain [Mon, 22 Oct 2012 15:07:37 +0000 (17:07 +0200)]
Bug 7483 follow-up replacing tabs by 4 spaces in both templates

12 years agoBug 7483: fixes on breadcrumbs in Authority administration
Adrien Saurat [Tue, 18 Sep 2012 12:51:28 +0000 (14:51 +0200)]
Bug 7483: fixes on breadcrumbs in Authority administration

Better breadcrumbs for the following pages:
- auth_tag_structure.pl
- auth_subfields_structure.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8724 follow-up DBRev number
Paul Poulain [Mon, 22 Oct 2012 13:00:25 +0000 (15:00 +0200)]
Bug 8724 follow-up DBRev number

12 years agoBug 8724 - Upgrade from NoZebra installs is broken
Tomas Cohen Arazi [Tue, 4 Sep 2012 18:02:51 +0000 (15:02 -0300)]
Bug 8724 - Upgrade from NoZebra installs is broken

Properly set the relevant NoZebra and QueryRemoveStopwords sysprefs to 0 to fix issues on upgrades.
Also removes the sysprefs from preferences/searching.pref

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 3087 Fix Z39.50 server to return the correct record syntax
Frédéric Demians [Wed, 11 Apr 2012 15:36:40 +0000 (17:36 +0200)]
Bug 3087 Fix Z39.50 server to return the correct record syntax

Modify Makefile.PL and Zebra configuration files in order to parametrized
biblio record type returned by Zebra Z39.50 server.

How to test:

- Test with a MARC21 and a UNIMARC DB
- Do a new installation
- Search from OPAC
- Search from a Z39.50 client like yaz-client: syntax = MARC21/UNIMARC must be
  choosed
- It was working for MARC21: it continues to work
- It wasn't working for UNIMARC: it works now, both in OPAC and from a Z39.50
  client

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works fine for MARC21. Frederic looked at UNIMARC. Magnus looked at NORMARC.
GRS1 works okay for me. I still have issues with DOM, but they are not directly related to changes in this patch.
A followup is still needed for packaging (debian/templates).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8525'
Paul Poulain [Fri, 19 Oct 2012 16:03:36 +0000 (18:03 +0200)]
Merge remote-tracking branch 'origin/new/bug_8525'

12 years agoFollow up: Bug 8525: Update preference description
Nicole C. Engard [Thu, 27 Sep 2012 19:05:18 +0000 (15:05 -0400)]
Follow up: Bug 8525: Update preference description

The feature in bug 8525 added highlighting to the detail
pages in the opac. This patch updates the preference to
note this change.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7986'
Paul Poulain [Fri, 19 Oct 2012 16:03:02 +0000 (18:03 +0200)]
Merge remote-tracking branch 'origin/new/bug_7986'

12 years agoBug 7986 Follow Up: Fix ExportRemoveFields
Nicole C. Engard [Sat, 13 Oct 2012 06:48:01 +0000 (02:48 -0400)]
Bug 7986 Follow Up: Fix ExportRemoveFields

This preference was in the code as a choice but should be a list
of fields to exclude. This patch makes that change and updates
the description to fit more with the standard set by other
preferences.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7986 Follow Up: Update ExportWithCsvProfile
Nicole C. Engard [Fri, 12 Oct 2012 20:55:54 +0000 (16:55 -0400)]
Bug 7986 Follow Up: Update ExportWithCsvProfile

The ExportWithCsvProfile preference was on its own file
(tools.pref) when in reality it belonged on the circulation
tab. This patch removes the tools.pref file and moves the
ExportWithCsvProfile preference and updates the text
around it to make it clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
12 years agoBug 4177 opaccloud missing from the system preferences interface
Mirko Tietgen [Thu, 4 Oct 2012 11:26:26 +0000 (13:26 +0200)]
Bug 4177 opaccloud missing from the system preferences interface

There is no option to toggle the (existing) syspref OpacCloud. This patch adds one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Inserted tags manually, enabled system preference, tag subject cloud displays nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8861 - Undefined variables in batchMod.pl trigger error logs
Mark Tompsett [Tue, 2 Oct 2012 13:07:18 +0000 (21:07 +0800)]
Bug 8861 - Undefined variables in batchMod.pl trigger error logs

Initialized $op, and changed lines like "$op => 1" and
"$error => 1" into separate, conditional template param calls.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 1963 Problem with deleted biblio in a virtual shelf
Frédéric Demians [Fri, 5 Oct 2012 08:45:18 +0000 (10:45 +0200)]
Bug 1963 Problem with deleted biblio in a virtual shelf

This bug reappear in HEAD/3.8. When trying to display a virtual shelf
(list) containing a deleted biblio, this error message is displayed:

Software error:

Can't call method "field" on an undefined value at ....C4/Koha.pm line
1231.

This fix modify SQL query retrieving biblios, just skipping records from
virtual shelf table with no linked record in biblio table: LEFT JOIN
replace with JOIN.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_4118'
Paul Poulain [Wed, 17 Oct 2012 16:04:30 +0000 (18:04 +0200)]
Merge remote-tracking branch 'origin/new/bug_4118'

12 years agoBug 4118: Follow up: Add ccode to kohastructure for stats
Nicole C. Engard [Fri, 12 Oct 2012 00:45:31 +0000 (20:45 -0400)]
Bug 4118: Follow up: Add ccode to kohastructure for stats

CCode was added to the statistics table in this bug, but
was not added to kohastructure.sql. This patch adds it
with comment to the kohastructure.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_5356'
Paul Poulain [Wed, 17 Oct 2012 16:01:06 +0000 (18:01 +0200)]
Merge remote-tracking branch 'origin/new/bug_5356'

12 years agoBug 5356: Followup Change font in the layout3pages pdf
Jonathan Druart [Tue, 16 Oct 2012 07:31:08 +0000 (09:31 +0200)]
Bug 5356: Followup Change font in the layout3pages pdf

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 3652: [SIGNED-OFF] XSS fixes - follow up
Katrin Fischer [Mon, 15 Oct 2012 07:07:50 +0000 (09:07 +0200)]
Bug 3652: [SIGNED-OFF] XSS fixes - follow up

Fixes a typo in the html filter that causes a problem when using the
paging in the OPAC result lists.

(forgot to commit my change when testing the original XSS patches)

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I triggered the error with this query string:
/cgi-bin/koha/opac-search.pl?idx=kw&q=o'reilly&offset=40&sort_by=author_az
After applying the patch the error is gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8585'
Paul Poulain [Wed, 17 Oct 2012 15:31:09 +0000 (17:31 +0200)]
Merge remote-tracking branch 'origin/new/bug_8585'

12 years agoFollow up to Bug 8585: add missing word to preference
Nicole C. Engard [Fri, 12 Oct 2012 01:23:48 +0000 (21:23 -0400)]
Follow up to Bug 8585: add missing word to preference

The preference added in this bug is missing the word
'day(s)'. This patch adds it in.

http://bugs.koha-community.org/show_bug.cgi?id=4118
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7143 follow-up replace tabs by 4 spaces
Paul Poulain [Tue, 16 Oct 2012 16:18:13 +0000 (18:18 +0200)]
Bug 7143 follow-up replace tabs by 4 spaces

12 years agoBug 7143 : New committer to history
Chris Cormack [Sun, 14 Oct 2012 19:52:27 +0000 (08:52 +1300)]
Bug 7143 : New committer to history

12 years agoBug 7143: Adding new developers to the history file
Chris Cormack [Tue, 9 Oct 2012 21:13:48 +0000 (10:13 +1300)]
Bug 7143: Adding new developers to the history file

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7751'
Paul Poulain [Tue, 16 Oct 2012 16:13:51 +0000 (18:13 +0200)]
Merge remote-tracking branch 'origin/new/bug_7751'

12 years ago:x
Nicole C. Engard [Thu, 11 Oct 2012 23:52:21 +0000 (19:52 -0400)]
:x

The preference used to read 'loan period by' but it's
actually reducing the checkout period 'to' the number
of days entered in the preference.  This patch changes
'by' to 'to'.

Signed-off-by: Marc Veron <veron@veron.ch>
Tiny patch, text change only, text apears as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8791: OPAC UNIMARC XSLT details: subject with subfield 3
Fridolyn SOMERS [Wed, 19 Sep 2012 09:45:19 +0000 (11:45 +0200)]
Bug 8791: OPAC UNIMARC XSLT details: subject with subfield 3

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I can reproduce the bug, and confirm that this patch fix it. The issue arises
when $9 come first, and then $3, which is not that usual.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8873 - JavaScript error in Opac displaying tag cloud
Marc Veron [Thu, 4 Oct 2012 09:34:42 +0000 (11:34 +0200)]
Bug 8873 - JavaScript error in Opac displaying tag cloud

On master (3.09.00.060), I get a JavaScript error on line 126 in opac-tags.pl while displaying tags cloud.

Reason: There are two lines with closing });

Patch removes one line.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
Magnus Enger [Sun, 23 Sep 2012 10:28:49 +0000 (12:28 +0200)]
Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT

This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8862 follow-up s/\t/4spaces/g
Paul Poulain [Fri, 12 Oct 2012 20:19:25 +0000 (22:19 +0200)]
Bug 8862 follow-up s/\t/4spaces/g

12 years agoBug 8862 - merge.pl contains untranslatable strings
Kyle M Hall [Tue, 2 Oct 2012 12:58:40 +0000 (08:58 -0400)]
Bug 8862 - merge.pl contains untranslatable strings

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8869 - Duplicate member check doesn't disable submit button on bottom.
Kyle M Hall [Wed, 3 Oct 2012 14:49:13 +0000 (10:49 -0400)]
Bug 8869 - Duplicate member check doesn't disable submit button on bottom.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8863: When clearing a patron attribute, they are all cleared
Fridolyn SOMERS [Tue, 2 Oct 2012 14:30:48 +0000 (16:30 +0200)]
Bug 8863: When clearing a patron attribute, they are all cleared

Signed-off-by: Marc Veron <veron@veron.ch>
Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8851 - strange blue bar above serials results
Owen Leonard [Tue, 2 Oct 2012 18:25:26 +0000 (14:25 -0400)]
Bug 8851 - strange blue bar above serials results

Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.

I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.

This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8175 - check logs error or displays incorrectly in details.pl
Mark Tompsett [Sun, 2 Sep 2012 12:46:03 +0000 (20:46 +0800)]
Bug 8175 - check logs error or displays incorrectly in details.pl

Changed "$item->{'materials'} ne ''" to
"defined($item->{'materials'}) && $item->{'materials'} =~ /\S/"
in if condition to prevent error when it is NULL, and to
properly capture the intent of printing if there is something
visible.

Cases tested include NULL, '0', '', ' ', and 'blah' by using
 UPDATE items SET materials=NULL where biblionumber=19158;
where the biblionumber was chosen randomly, because only NULL
was in the items.materials field. The NULL case triggers an
error, but it does display correctly.

The ' ' case displays an apparently empty column, which does not
seem to be the intent of the flag that is being set. This is why
a simple $var check is not sufficient.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8843 - Cannot export bibliographic records by call number
Owen Leonard [Fri, 28 Sep 2012 14:48:16 +0000 (10:48 -0400)]
Bug 8843 - Cannot export bibliographic records by call number

When building the query for exports by call number the script
has the logic reversed. It tries to select records with call
numbers less than the starting call number and greater than
the ending call number. This should be reversed.

To test, test an export in an unpatched system. An export by
call number will return an empty file. After applying the patch
an export by call number should give valid results.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8718 - Normal catalogue detail view in staff client doesn't show missing serials...
David Cook [Tue, 4 Sep 2012 02:43:28 +0000 (12:43 +1000)]
Bug 8718 - Normal catalogue detail view in staff client doesn't show missing serials or subscription history note

Adds librariannote (staff subscription history note) and missing list to the normal catalogue detail view in staff client.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8766 - OPACBaseURL still called as OPACBaseurl in many files
Owen Leonard [Mon, 24 Sep 2012 19:56:05 +0000 (15:56 -0400)]
Bug 8766 - OPACBaseURL still called as OPACBaseurl in many files

This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7643 - Can't upload and import zipped file of patron images
Ivan Brown [Tue, 25 Sep 2012 14:57:43 +0000 (15:57 +0100)]
Bug 7643 - Can't upload and import zipped file of patron images

Fixed problem with re-declaration of $filesuffix

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
patch pushed onto master directly, doesn't merge properly from
new/bug_7643 branch

12 years agoMerge remote-tracking branch 'origin/new/bug_7412'
Paul Poulain [Fri, 12 Oct 2012 10:28:54 +0000 (12:28 +0200)]
Merge remote-tracking branch 'origin/new/bug_7412'

12 years agoBug 7412: Follow up: Update preference to sentence
Nicole C. Engard [Tue, 25 Sep 2012 15:50:52 +0000 (11:50 -0400)]
Bug 7412: Follow up: Update preference to sentence

This patch updates the preference question to a sentence
to follow the standard set with previous preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7751'
Paul Poulain [Fri, 12 Oct 2012 10:23:08 +0000 (12:23 +0200)]
Merge remote-tracking branch 'origin/new/bug_7751'

12 years agoBug 7751: Decrease loan length with many holds
Nicole C. Engard [Wed, 26 Sep 2012 01:30:29 +0000 (21:30 -0400)]
Bug 7751: Decrease loan length with many holds

This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
12 years agoBug 3652 XSS vulnerability in facets
Chris Cormack [Tue, 9 Oct 2012 01:19:18 +0000 (14:19 +1300)]
Bug 3652 XSS vulnerability in facets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.

12 years agoBug 3652: XSS vulnerability in page numbering
Chris Cormack [Tue, 9 Oct 2012 01:11:10 +0000 (14:11 +1300)]
Bug 3652: XSS vulnerability in page numbering

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Chris Cormack [Mon, 8 Oct 2012 08:30:49 +0000 (21:30 +1300)]
Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8636'
Paul Poulain [Fri, 12 Oct 2012 09:55:14 +0000 (11:55 +0200)]
Merge remote-tracking branch 'origin/new/bug_8636'

12 years agoBug 8636: Add dependency on Test::Deep
Jared Camins-Esakov [Thu, 11 Oct 2012 00:48:54 +0000 (20:48 -0400)]
Bug 8636: Add dependency on Test::Deep

The test t/db_dependent/Koha.t uses Test::Deep to compare data
structures, but that dependency was not listed for the installer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8812 - Staff Client: Patron search should display branch name instead of branch...
Marc Veron [Mon, 24 Sep 2012 16:14:37 +0000 (18:14 +0200)]
Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table

Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8633 Manage OPAC alternate templates
Frédéric Demians [Wed, 19 Sep 2012 13:28:40 +0000 (15:28 +0200)]
Bug 8633 Manage OPAC alternate templates

Modify /misc/translator/translate script in order to manage properly alternate
OPAC templates.

To test it with new 'ccsr' template:

- Create the .po file:

  ./translate create fr-FR

  Result: existing .po files are not modified. A new fr-FR-opac-ccsr.po file is
  available.

- Install all templates :

  ./translate install fr-FR

  Result: A new koha-tmpl/opac-tmpl/ccsr/fr-FR directory contains translated
  templates.

- Update .po files:

  ./translate update fr-FR

  Result: fr-FR .po files are update, include fr-FR-opac-ccsr.po

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8831: relabel gstrate with Tax rate
Nicole C. Engard [Wed, 26 Sep 2012 16:44:46 +0000 (12:44 -0400)]
Bug 8831: relabel gstrate with Tax rate

This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

Signed-off-by: Marc Veron <veron@veron.ch>
Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8700 - RESERVESLIP fields not being replaced correctly
Kyle M Hall [Wed, 29 Aug 2012 12:44:26 +0000 (08:44 -0400)]
Bug 8700 - RESERVESLIP fields not being replaced correctly

The slip RESERVESLIP is not replacing fields correctly.
C4::Reserves::ReserveSlip calls C4::Letters::GetPreparedLetter,
and passes the $reserve hashref to it for each table except branches
( which is passed the branchcode ). The problem is, if you pass a
hashref for a table, it uses that hashref for the replacing, rather
than looking up the data from the database.

Fixed by passing the correct keys for each of the tables requested.

Signed-off-by: Marc Veron <veron@veron.ch>
Tested following the test plan.
Could reproduce the bug.
After applying the patch slip printed as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8820 - Don't show orders table if there are no orders
Owen Leonard [Tue, 25 Sep 2012 18:28:42 +0000 (14:28 -0400)]
Bug 8820 - Don't show orders table if there are no orders

This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8801: Add menu entry to delete items in batch
Julian Maurice [Fri, 21 Sep 2012 10:05:19 +0000 (12:05 +0200)]
Bug 8801: Add menu entry to delete items in batch

In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8742 - Example uses perl 5.8 in Makefile.PL
Mark Tompsett [Tue, 11 Sep 2012 17:25:59 +0000 (01:25 +0800)]
Bug 8742 - Example uses perl 5.8 in Makefile.PL

Changed hardcoded path for a programmatic one. Basing it on:
  grep /\/usr\/share\/perl\//, @INC;
And doing a:
  push @version, ('/usr/share/perl/5.10') if !$version[0];
For a reasonable default otherwise. No more references to
  /usr/share/perl/5.8
hardcoded into the output.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8441: hides MODS export by default in French install
Adrien Saurat [Thu, 20 Sep 2012 09:46:13 +0000 (11:46 +0200)]
Bug 8441: hides MODS export by default in French install

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7873 follow-up s/tab/4spaces/
Paul Poulain [Tue, 9 Oct 2012 16:03:05 +0000 (18:03 +0200)]
Bug 7873 follow-up s/tab/4spaces/

12 years agoBug 7873: fixes sort on Title in OPAC basket
Adrien Saurat [Fri, 21 Sep 2012 08:53:03 +0000 (10:53 +0200)]
Bug 7873: fixes sort on Title in OPAC basket

Signed-off-by: Marc Veron <veron@veron.ch>
Reproduced wrong title sort without patch.
Sort works as expected with patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8741'
Paul Poulain [Tue, 9 Oct 2012 15:55:33 +0000 (17:55 +0200)]
Merge remote-tracking branch 'origin/new/bug_8741'

12 years agoBug 8741 - crontab.example missing username, fails in some systems
Tomas Cohen Arazi [Fri, 7 Sep 2012 18:22:18 +0000 (15:22 -0300)]
Bug 8741 - crontab.example missing username, fails in some systems

Simple addition of the koha user to the sample cron file. Might help non-tech
users to get things like incremental indexing to work.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8570 follow-up removing tabs & improving indentation
Paul Poulain [Tue, 9 Oct 2012 15:34:58 +0000 (17:34 +0200)]
Bug 8570 follow-up removing tabs & improving indentation

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8570 follow-up removing tabs & improving indentation
Paul Poulain [Tue, 9 Oct 2012 15:34:58 +0000 (17:34 +0200)]
Bug 8570 follow-up removing tabs & improving indentation

12 years agoBug 8570 - Add pagination to the Z39.50 results page
Frédérick [Fri, 3 Aug 2012 17:50:29 +0000 (13:50 -0400)]
Bug 8570 - Add pagination to the Z39.50 results page

Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 2930 [REVISED] Put other name on checkout screen
Owen Leonard [Thu, 6 Sep 2012 16:31:23 +0000 (12:31 -0400)]
Bug 2930 [REVISED] Put other name on checkout screen

This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl
Mark Tompsett [Tue, 18 Sep 2012 16:05:24 +0000 (00:05 +0800)]
Bug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl

Changed declartion from:
  my $op = $input->param('op');
to
  my $op = $input->param('op') || q{};
in order to give an empty string default preventing error
logs from filling needlessly.

Signed-off-by: Marc Veron <veron@veron.ch>
The patch removes warnings like:
Use of uninitialized value $op in string eq at...

However there is one more warning, but it is not related to $op (addressed by this patch):
smart-rules.pl: Use of uninitialized value in string ne at .../admin/smart-rules.pl line 388.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8652 follow-up adding more tests
Paul Poulain [Tue, 9 Oct 2012 09:47:37 +0000 (11:47 +0200)]
Bug 8652 follow-up adding more tests

Adding 3 tests to check for the new parameter of output_pref sub
the 3rd parameter, if 1, result in only returning the date (not the time)

12 years agoBug 8652: Followup: add a default value for date_from
Jonathan Druart [Wed, 12 Sep 2012 07:50:16 +0000 (09:50 +0200)]
Bug 8652: Followup: add a default value for date_from

This patchis add a third parameter to the output_pref routine. It allows
to specify the output string with or without the hours and minutes
(%H:%M)

Signed-off-by: MathildeF <mathilde.formery@ville-nimes.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBUG 8652: Add a default value for the lateorders
Jonathan Druart [Tue, 14 Aug 2012 15:26:46 +0000 (17:26 +0200)]
BUG 8652: Add a default value for the lateorders

- By default, the date from value is the today's date
- Replace C4::Dates with Koha::DateUtils

To test:
Check the page displays the late orders by default.
Add values for 'date from' and/or 'date to' and/or delay.
The date interval is based on the estimated delivery date and the delay
param is based on the closed date.

12 years agoNormalize records imported from Z39.50 servers.
Frédérick Capovilla [Wed, 28 Sep 2011 17:58:14 +0000 (13:58 -0400)]
Normalize records imported from Z39.50 servers.

Some Z39.50 server may use the MARC-8 encoding, which uses separated
diacritics. By forcing a normalization, all imported records will have
combined diacritics.

Records with separated diacritics might not show up in Zebra searches if
the search terms use accented characters.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
http://bugs.koha-community.org/show_bug.cgi?id=8610
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked it still works after the patch with UNIMARC and BNF server (that
provide utf-8 records)

12 years agoBug 8829: Fix authority importing
Jared Camins-Esakov [Wed, 26 Sep 2012 20:33:15 +0000 (16:33 -0400)]
Bug 8829: Fix authority importing

A subroutine was not being imported by C4::ImportBatch (ironic, no?)
so this patch makes the call fully-qualified. This patch also cleans
up two warnings in C4::Auth that are raised when logged in as the
database user.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.
Joseph Alway [Thu, 20 Sep 2012 17:39:28 +0000 (12:39 -0500)]
Bug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.

The changes here are duplicate fixes.
The cataloguing directory had the same bugs as the acqui directory.
The bugs in the cataloguing files of the same name were fixed in Bug 8550.
The bugs in the acqui files had not been fixed.
This will fix Bug 8680 which is in the Acquisitions Module.

Changes to the z3950_search.pl file:
Rather than treating ISBN and ISSN as the same, this patch breaks
them out into separate parts of the query, as well as changing
the truncation attribute to enable right truncation (the correct
behavior for the ISBN field in MARC21, and valid behavior in
UNIMARC).

Changes to the z3950_search.tt file:
Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.

Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping...
Owen Leonard [Fri, 14 Sep 2012 16:33:42 +0000 (12:33 -0400)]
Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page

Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
12 years agoBug 5409 follow-up DBRev number
Paul Poulain [Mon, 8 Oct 2012 15:03:37 +0000 (17:03 +0200)]
Bug 5409 follow-up DBRev number

12 years agoBug 5409 - Call number is not show on Opac search result page.
Meenakshi.R [Tue, 18 Sep 2012 08:00:19 +0000 (13:30 +0530)]
Bug 5409 - Call number is not show on Opac search result page.

Fixes Bug 5409, Modified the definition of  'OPACItemsResultsDisplay' in systempreferences and changed the code in opac-search.pl file for 'OPACItemsResultsDisplay'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 5409 - Call number is not show on Opac search result page.
Meenakshi.R [Fri, 15 Jun 2012 05:40:59 +0000 (11:10 +0530)]
Bug 5409 - Call number is not show on Opac search result page.

Fixes Bug 5409, Set the syspref value to 1 if it is itemdetails and 0 if it
is statuses, leaving it alone if it is already 1 or 0 and change the type
of the syspref to YesNo.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 5409 - Fix call number not shown on opac search result page
Amit Gupta [Mon, 15 Nov 2010 10:53:49 +0000 (16:23 +0530)]
Bug 5409 - Fix call number not shown on opac search result page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8481: Items table is showing in opac-MARCdetail.pl but not in MARCdetail.pl
Fridolyn SOMERS [Wed, 26 Sep 2012 14:46:30 +0000 (16:46 +0200)]
Bug 8481: Items table is showing in opac-MARCdetail.pl but not in MARCdetail.pl

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8850: Export CanItemBeReserved in C4::ILSDI::Services
Julian Maurice [Tue, 2 Oct 2012 09:26:39 +0000 (11:26 +0200)]
Bug 8850: Export CanItemBeReserved in C4::ILSDI::Services

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8850: Export CanBookBeReserved in C4::ILSDI::Services
Julian Maurice [Mon, 1 Oct 2012 09:56:22 +0000 (11:56 +0200)]
Bug 8850: Export CanBookBeReserved in C4::ILSDI::Services

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
12 years agocirc/circulation.pl: force issuedate to a string to fix bug 8738
MJ Ray [Fri, 7 Sep 2012 14:17:05 +0000 (15:17 +0100)]
circ/circulation.pl: force issuedate to a string to fix bug 8738

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Installed DataTime version 0.53, verified the error occurs.
Applied patch, verified patch removes the error.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8811 - can't run report after saving
Owen Leonard [Mon, 24 Sep 2012 14:47:27 +0000 (10:47 -0400)]
Bug 8811 - can't run report after saving

The fix for Bug 7993 removed some lines from guided_reports.pl
which passed a new report's name and id to the template after
saving. For some reason this was removed, making it impossible
to run or edit a new report immediately after saving.

This patch adds back that part of the script which passes those
variables to the template. Before this patch, after adding a new
SQL report you would not see a "run this report" link. The
"run this report" and "edit" buttons in the toolbar would not
work. After applying the patch these should work.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested creating reports and was able to run them after saving.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8796 - patron cards not starting on designated card
Marc Veron [Mon, 24 Sep 2012 20:19:56 +0000 (22:19 +0200)]
Bug 8796 - patron cards not starting on designated card

Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8860 - can't merge if you don't have fast cataloging permissions
Kyle M Hall [Tue, 2 Oct 2012 13:25:16 +0000 (09:25 -0400)]
Bug 8860 - can't merge if you don't have fast cataloging permissions

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8497: Strange behavior when modifying the timeout system preference
Fridolyn SOMERS [Tue, 2 Oct 2012 11:49:32 +0000 (13:49 +0200)]
Bug 8497: Strange behavior when modifying the timeout system preference

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested standard login, patron auto-complete, and system preferences.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8810 - Opac: Cart should display branchname instead of branchcode
Marc Veron [Mon, 24 Sep 2012 13:05:12 +0000 (15:05 +0200)]
Bug 8810 - Opac: Cart should display branchname instead of branchcode

In Opac, the cart should display the branchname instead of the branchcode.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8370: Change term issues (smart-rules)
Jonathan Druart [Mon, 17 Sep 2012 12:18:33 +0000 (14:18 +0200)]
Bug 8370: Change term issues (smart-rules)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8233'
Paul Poulain [Fri, 5 Oct 2012 10:00:06 +0000 (12:00 +0200)]
Merge remote-tracking branch 'origin/new/bug_8233'

12 years agoBug 8233 - SolR-related /etc/ files break deb building
Tomas Cohen Arazi [Mon, 17 Sep 2012 19:55:52 +0000 (16:55 -0300)]
Bug 8233 - SolR-related /etc/ files break deb building

Remove them using debian/rules when building .deb packages until
we figure out what to do with them in a .deb install.

To do this I ran the build script like this:

sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7621'
Paul Poulain [Fri, 5 Oct 2012 09:58:28 +0000 (11:58 +0200)]
Merge remote-tracking branch 'origin/new/bug_7621'

12 years agoBug 7621: Follow up to clarify preference language
Nicole C. Engard [Thu, 27 Sep 2012 04:10:11 +0000 (00:10 -0400)]
Bug 7621: Follow up to clarify preference language

This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.

Signed-off-by: Marc Veron <veron@veron.ch>
Better wording of preference instructions. No code echange involved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8382'
Paul Poulain [Fri, 5 Oct 2012 09:56:39 +0000 (11:56 +0200)]
Merge remote-tracking branch 'origin/new/bug_8382'

12 years agoBug 8382 [Follow-up] It is not possible to cancel an order when receiving on a filter...
Owen Leonard [Wed, 5 Sep 2012 16:32:32 +0000 (12:32 -0400)]
Bug 8382 [Follow-up] It is not possible to cancel an order when receiving on a filtered page in parcel.pl

In order to be valid XHTML ampersands must be encoded ("&amp;").

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8827 - YUI CSS files no longer found on Yahoo servers
Owen Leonard [Wed, 26 Sep 2012 12:59:45 +0000 (08:59 -0400)]
Bug 8827 - YUI CSS files no longer found on Yahoo servers

This patch removes the [% yuipath %] variable from the link
to the YUI CSS files in the OPAC and adds a hard-coded path
to the local files.

To test, set your yuipath system preference to "from Yahoo's
servers," clear your browser cache, and view the OPAC. The
style and layout should look the same as if your yuipath
preference were set to "local."

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8623 follow-up: make sure CCSR theme loads YUI
Jared Camins-Esakov [Thu, 27 Sep 2012 13:12:23 +0000 (09:12 -0400)]
Bug 8623 follow-up: make sure CCSR theme loads YUI

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8623'
Paul Poulain [Fri, 5 Oct 2012 09:49:08 +0000 (11:49 +0200)]
Merge remote-tracking branch 'origin/new/bug_8623'

12 years agoMerge remote-tracking branch 'origin/new/bug_8623' into new/bug_8623
Paul Poulain [Fri, 5 Oct 2012 09:48:37 +0000 (11:48 +0200)]
Merge remote-tracking branch 'origin/new/bug_8623' into new/bug_8623