wip/koha-chris_n.git
9 years agoFollow up for Bug 3326: previous fix broke searches when
Jared Camins-Esakov [Wed, 16 Mar 2011 15:09:46 +0000 (15:09 +0000)]
Follow up for Bug 3326: previous fix broke searches when

This fix ensures that searches will still work when -x is not used when
reindexing Zebra.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3326: Work around Zebra's handling of &amp; entities
Jared Camins-Esakov [Tue, 15 Mar 2011 02:14:19 +0000 (22:14 -0400)]
Bug 3326: Work around Zebra's handling of &amp; entities

When using XSLT mode, the OPAC results display will show "&amp;" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&amp;" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoRevert "Merge remote branch 'kc/new/bug_5734' into kcmaster"
Chris Cormack [Wed, 16 Mar 2011 03:28:00 +0000 (16:28 +1300)]
Revert "Merge remote branch 'kc/new/bug_5734' into kcmaster"

This reverts commit b18ae6dee66f5bbba3d5d78ce6885a6d34cbcecd, reversing
changes made to a52d4e8a70783fdf9cf4429931c2d133331d7ef5.

9 years agoBug 5750: (MT #4095) add exact matching filter for categorycode and branchcode fields...
Stéphane Delaune [Mon, 14 Mar 2011 06:13:03 +0000 (07:13 +0100)]
Bug 5750: (MT #4095) add exact matching filter for categorycode and branchcode fields in search members's result

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No searching borrowers by categorycode or branchcode will only bring up
exact matches. Before searches for Staff (S) would also bring up
Students and Schools (SC, ST). Same for branchcodes.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_3495' into kcmaster
Chris Cormack [Tue, 15 Mar 2011 09:01:45 +0000 (22:01 +1300)]
Merge remote branch 'kc/new/enh/bug_3495' into kcmaster

9 years agoBug 3495: Fast bib record add at circulation
Katrin Fischer [Sun, 13 Mar 2011 20:12:57 +0000 (16:12 -0400)]
Bug 3495: Fast bib record add at circulation

The link to the Fast add framework was never shown.
Now the link is shown if you have the right permissions (fast cataloging or superlibrarian).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5865 - Labels wrap incorrectly when paper width is greater than height
Chris Nighswonger [Mon, 14 Mar 2011 20:27:17 +0000 (16:27 -0400)]
Bug 5865 - Labels wrap incorrectly when paper width is greater than height

This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.

Note: This should be backported to 3.2.x

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_3659' into kcmaster
Chris Cormack [Tue, 15 Mar 2011 02:58:26 +0000 (15:58 +1300)]
Merge remote branch 'kc/new/enh/bug_3659' into kcmaster

9 years agoFix for Bug 3659, Add place hold option from patron checkout tab
Owen Leonard [Tue, 15 Mar 2011 02:08:57 +0000 (21:08 -0500)]
Fix for Bug 3659, Add place hold option from patron checkout tab

Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5693' into kcmaster
Chris Cormack [Mon, 14 Mar 2011 21:04:38 +0000 (10:04 +1300)]
Merge remote branch 'kc/new/bug_5693' into kcmaster

9 years agoBug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs
Chris Cormack [Mon, 14 Mar 2011 20:55:06 +0000 (16:55 -0400)]
Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Mon, 14 Mar 2011 08:11:30 +0000 (21:11 +1300)]
Bumping database version

9 years agoBug 3670: change 'Item DUE' to 'Item Due' in English dbs
Nicole Engard [Fri, 11 Mar 2011 10:14:49 +0000 (11:14 +0100)]
Bug 3670: change 'Item DUE' to 'Item Due' in English dbs

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5819 : No toolbar in record view when quotes present in title - fix
Janusz Kaczmarek [Mon, 14 Mar 2011 06:21:47 +0000 (07:21 +0100)]
Bug 5819 : No toolbar in record view when quotes present in title - fix

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail
Marcel de Rooy [Sun, 13 Mar 2011 20:13:01 +0000 (21:13 +0100)]
Bug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail

Adjusts three opac detail templates. Moves few styles to css.
Removes duplicate view info from XSLT file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_4438' into kcmaster
Chris Cormack [Mon, 14 Mar 2011 07:48:50 +0000 (20:48 +1300)]
Merge remote branch 'kc/new/bug_4438' into kcmaster

9 years agobug4438/MT5496 budget Exceeds total allocation
Henri-Damien LAURENT [Sun, 13 Mar 2011 19:52:44 +0000 (20:52 +0100)]
bug4438/MT5496 budget Exceeds total allocation

This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping db version
Chris Cormack [Mon, 14 Mar 2011 03:22:28 +0000 (16:22 +1300)]
Bumping db version

9 years agoBug 5669: Adding a system preference to control whether a user can select a pick...
Chris Cormack [Tue, 1 Feb 2011 08:55:17 +0000 (09:55 +0100)]
Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not

Default is on

Part of bug 5609

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5595' into kcmaster
Chris Cormack [Sun, 13 Mar 2011 07:31:38 +0000 (20:31 +1300)]
Merge remote branch 'kc/new/bug_5595' into kcmaster

9 years agoBug 5595 : Fixing a security glitch (please always use placeholders or
Chris Cormack [Sun, 13 Mar 2011 07:30:13 +0000 (20:30 +1300)]
Bug 5595 : Fixing a security glitch (please always use placeholders or
dbh->quote and fixing the tests

9 years agoBumping the database version
Chris Cormack [Sun, 13 Mar 2011 02:19:31 +0000 (15:19 +1300)]
Bumping the database version

9 years agoBug 5810 revision to fix author search link
Jane Wagner [Sat, 12 Mar 2011 19:35:50 +0000 (14:35 -0500)]
Bug 5810 revision to fix author search link

Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5810: Subject tracings search complete subfields
Jared Camins-Esakov [Sat, 12 Mar 2011 19:35:49 +0000 (14:35 -0500)]
Bug 5810: Subject tracings search complete subfields

This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoAdding release dates and 2 new developers
Chris Cormack [Sun, 13 Mar 2011 01:13:33 +0000 (14:13 +1300)]
Adding release dates and 2 new developers

9 years agoMerge remote branch 'kc/new/bug_3013' into kcmaster
Chris Cormack [Sun, 13 Mar 2011 01:02:06 +0000 (14:02 +1300)]
Merge remote branch 'kc/new/bug_3013' into kcmaster

9 years agoBug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory...
Janusz Kaczmarek [Thu, 10 Mar 2011 15:45:40 +0000 (16:45 +0100)]
Bug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4072 Lost items aren't hidden on OPAC result page
Frédéric Demians [Thu, 10 Mar 2011 17:29:11 +0000 (11:29 -0600)]
Bug 4072 Lost items aren't hidden on OPAC result page

When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 5846: fix detection of Javascript to compress by mod_gzip
Galen Charlton [Wed, 9 Mar 2011 22:14:56 +0000 (17:14 -0500)]
bug 5846: fix detection of Javascript to compress by mod_gzip

Update to default Apache config; should result in a slight
performance benefit.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5595: (MT #5757)adding additional attributes support on patrons's search
Stéphane Delaune [Tue, 8 Mar 2011 03:34:19 +0000 (22:34 -0500)]
Bug 5595: (MT #5757)adding additional attributes support on patrons's search

Restores ability to search on extended borrower attributes that are configured to be searchable

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug_5064 Rework data retrieval in booksellers.pl
Colin Campbell [Tue, 8 Mar 2011 02:41:13 +0000 (21:41 -0500)]
bug_5064 Rework data retrieval in booksellers.pl

loops were slightly illogical and db accesss was excessive
and repetitive. caused it not to scale well on large datasets
Routines in Acquisition.pm seem to have inconsistent views
of the data.
rework logic to utilize db and processing better

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoupdate INSTALL* to acknowledge the use of mod_deflate
Tomás Cohen Arazi [Fri, 11 Mar 2011 11:05:12 +0000 (12:05 +0100)]
update INSTALL* to acknowledge the use of mod_deflate

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug5063: C4::Bookseller Changes
Colin Campbell [Tue, 8 Mar 2011 02:30:25 +0000 (21:30 -0500)]
Bug5063: C4::Bookseller Changes

Merge unfao changes to C4::Bookseller
Enable warnings in Bookseller.pm
Some cleanups in Bookseller code
Do not export everything by default
Display vendors more rationally
    Was displaying by id make it name as the searchstring is for all
    embedded substrings
Have removed "if mysql" logic as we want to deal with this by
    abstracting the DB interaction and it makes cleaner code until then

Sponsered by UN FAO, Rome

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 1962: Follow-up: Add fine notification during check-in
Katrin Fischer [Mon, 7 Mar 2011 21:30:21 +0000 (15:30 -0600)]
Bug 1962: Follow-up: Add fine notification during check-in

Don't show message when patron has no fines.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5527: Fix some problems in inactive borrowers report
Katrin Fischer [Mon, 7 Mar 2011 18:50:48 +0000 (13:50 -0500)]
Bug 5527: Fix some problems in inactive borrowers report

- 'Not checked out since:' date was not added to query
- borrowers with only checkouts and no returns since this date were considered inactive

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5703: Hide the $9 subfield (linked authid) when showing series for a MARC record...
Frédérick Capovilla [Mon, 7 Mar 2011 18:18:41 +0000 (13:18 -0500)]
Bug 5703: Hide the $9 subfield (linked authid) when showing series for a MARC record in normal view.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3624 : Follow up patch, to catch any installs that still have the missing columns
Chris Cormack [Fri, 11 Mar 2011 19:15:17 +0000 (08:15 +1300)]
Bug 3624 : Follow up patch, to catch any installs that still have the missing columns

9 years agoBZ3624, proposed patch for kohastructure.sql rewritten
Paul Poulain [Mon, 7 Mar 2011 18:12:44 +0000 (13:12 -0500)]
BZ3624, proposed patch for kohastructure.sql rewritten

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5830 Using XSLT on OPAC Lists page
Frédéric Demians [Mon, 7 Mar 2011 16:44:03 +0000 (11:44 -0500)]
Bug 5830 Using XSLT on OPAC Lists page

On OPAC Lists page (opac-shelves.pl), biblio records are now displayed
accordingly to OPACXSLTResultsDisplay system preference.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/master' into new/bug_3013
Chris Cormack [Mon, 7 Mar 2011 19:28:42 +0000 (08:28 +1300)]
Merge remote branch 'kc/master' into new/bug_3013

9 years agoBug 3013 - Value builder for 006 and 008 need choices for all format types
Salvador Zaragoza Rubio [Mon, 7 Mar 2011 16:37:45 +0000 (11:37 -0500)]
Bug 3013 - Value builder for 006 and 008 need choices for all format types

Modification of the intranet cataloguing plugin for 006/008 fields to allow
select a type of material and change the positions available to enter the data.
Data are hard stored in xml files to allow easy translation and processing through
Javascript and JQuery-AJAX.

Bug 3013 - Fix selection of combo and trailing whitespace

Bug 3013 - Fix selection of combo

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Mon, 7 Mar 2011 02:13:53 +0000 (15:13 +1300)]
Bumping database version

9 years agoMerge remote branch 'kc/new/enh/bug_5783' into kcmaster
Chris Cormack [Mon, 7 Mar 2011 02:10:37 +0000 (15:10 +1300)]
Merge remote branch 'kc/new/enh/bug_5783' into kcmaster

9 years agobug 5783: follow-up system preferences tweaks
Galen Charlton [Thu, 3 Mar 2011 21:54:02 +0000 (16:54 -0500)]
bug 5783: follow-up system preferences tweaks

* add the AuthoritiesLog system preference to all
  language installer SQL scripts
* options for a 'YesNo' should be '', not '0'
* fix wording glitch on preferences page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 5783: follow-up - fix logging of modifications
Galen Charlton [Thu, 3 Mar 2011 21:54:01 +0000 (16:54 -0500)]
bug 5783: follow-up - fix logging of modifications

Fix so that modifying an authority record is not logged
as both an ADD and a MODIFY.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 5783: Authorities edit logging
Tomas Cohen Arazi [Thu, 3 Mar 2011 21:54:00 +0000 (16:54 -0500)]
bug 5783: Authorities edit logging

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 2975: whitespace and formatting cleanup
Galen Charlton [Thu, 3 Mar 2011 19:52:47 +0000 (14:52 -0500)]
bug 2975: whitespace and formatting cleanup

Not part of the bugfix per se, but taking this chance
to clean up some inconsistent tabbing.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 2975: fix calculation of due dates by offline circ
Galen Charlton [Thu, 3 Mar 2011 19:52:46 +0000 (14:52 -0500)]
bug 2975: fix calculation of due dates by offline circ

Offline circ no longer tries to calculate the due date
directly, instead relying on the AddIssue and AddRenewal
APIs to do so.  This corrects a bug where the due date
would be calculated incorrectly if the item-level_itypes
system preference is turned on.

This change also has the effect of causing the issue date
for loans uploaded via offline circulation to be set
to the time stamp recorded by the offline circulation client.

Test plan:

* Turn on item-level_itypes
* Create an example item whose loan policy per
  the item's item type would be different from
  the default policy based on the bib-level type.
* Create a test KOC file with a loan of the test
  item and the checkout date artificially set
  to yesterday.
* Upload the file:
  - Before the fix, the due date would be set
    to the default due date.  Also, the issue date
    will be set to the date of the upload.
  - After the fix, the due date would be calculated
    correctly based on the item's item type.  Also,
    the issue date will be set to the date recorded
    by the offline circulation client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5835 : adding a class to index <select>
Paul Poulain [Tue, 14 Dec 2010 23:01:04 +0000 (00:01 +0100)]
Bug 5835 : adding a class to index <select>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5831: rebuild_zebra.pl doesn't respect -r
Ian Walls [Fri, 4 Mar 2011 20:08:22 +0000 (15:08 -0500)]
Bug 5831: rebuild_zebra.pl doesn't respect -r

Reimplements support for -r, as well for -reset

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5820: Change language to 'Fund' over 'Budget'
Nicole C. Engard [Thu, 3 Mar 2011 14:17:19 +0000 (09:17 -0500)]
Bug 5820: Change language to 'Fund' over 'Budget'

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 5693 - mc-ccode parens fix
Reed Wade [Fri, 4 Mar 2011 04:13:00 +0000 (23:13 -0500)]
bug 5693 - mc-ccode parens fix

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years ago(bug #5157) fix borrowers top issues
Nahuel ANGELINETTI [Tue, 1 Mar 2011 20:55:38 +0000 (21:55 +0100)]
(bug #5157) fix borrowers top issues

this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 4853 - Rights needed to renew a document
Owen Leonard [Tue, 1 Mar 2011 20:19:16 +0000 (21:19 +0100)]
Fix for Bug 4853 - Rights needed to renew a document

Correcting check for circulation permission. Also updating
updateitem.pl (for setting lost and damaged statuses) with
circulate permissions.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 4290 - search for author in repository
Owen Leonard [Tue, 1 Mar 2011 13:01:32 +0000 (14:01 +0100)]
Fix for Bug 4290 - search for author in repository

Reimplementation of Nahuel's patch from 2010-03-02

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3341: Fines calculation erroneous when a repeatable holiday is added
Frédérick Capovilla [Sat, 5 Mar 2011 19:15:04 +0000 (08:15 +1300)]
Bug 3341: Fines calculation erroneous when a repeatable holiday is added

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFixing a utf8 issue with the translator tests
Chris Cormack [Sat, 5 Mar 2011 19:05:40 +0000 (08:05 +1300)]
Fixing a utf8 issue with the translator tests

9 years agoBug 5824: Creating a circ rule for a specific library causes anomalies
Ian Walls [Thu, 3 Mar 2011 23:13:26 +0000 (18:13 -0500)]
Bug 5824: Creating a circ rule for a specific library causes anomalies

The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5818, Date picker broken on label batches
Owen Leonard [Thu, 3 Mar 2011 22:20:40 +0000 (17:20 -0500)]
Fix for Bug 5818, Date picker broken on label batches

Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4103 In Pro Adv Search, superlibrarian search always all libraries
Frédéric Demians [Sun, 27 Feb 2011 09:20:33 +0000 (04:20 -0500)]
Bug 4103 In Pro Adv Search, superlibrarian search always all libraries

Now, when 'independantbranches' syspref is activated, 'Individual Libraries'
combo list is set by default to the current user branch. It shouldn't be the
case for superlibrarian user who is supposed to manage all libraries.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFixing license and copyright statement for updatedatabase.pl
Chris Cormack [Sat, 5 Mar 2011 07:24:57 +0000 (20:24 +1300)]
Fixing license and copyright statement for updatedatabase.pl

9 years agoUpdating database version
Chris Cormack [Sat, 5 Mar 2011 07:22:45 +0000 (20:22 +1300)]
Updating database version

9 years agoBug 5642: Item field serial enumeration (enumchron) should be longer
Marcel de Rooy [Sun, 27 Feb 2011 08:49:50 +0000 (03:49 -0500)]
Bug 5642: Item field serial enumeration (enumchron) should be longer

Field enumchron in items table is now varchar(80).
We have records that need a much longer field, even up to 400 or 500 chars.
I suggest to change its type to TEXT (variable length with max 64K; tinytext
goes up to 255 chars and is just too short).
Mediumtext or longtext are not needed; as a side note these types are used in
the items table for e.g. booksellerid and more_subfields_xml..

Revised original patch thanks to Ian Walls: update kohatructure.sql. Copied the change in deleteditems as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBZ5432 follow-up, removing test string
Paul Poulain [Sun, 27 Feb 2011 12:18:34 +0000 (07:18 -0500)]
BZ5432 follow-up, removing test string

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5432 : (MT #4584b)Add duplicate support for borrowers
Stéphane Delaune [Sun, 27 Feb 2011 12:18:21 +0000 (07:18 -0500)]
Bug 5432 : (MT #4584b)Add duplicate support for borrowers

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5815: Double clicking submits patron selection
Jared Camins-Esakov [Sat, 26 Feb 2011 21:21:33 +0000 (16:21 -0500)]
Bug 5815: Double clicking submits patron selection

Double clicking on an item in the list of matching names now automatically
submits the form when checking out to a patron by name rather than barcode.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 5813: Remove unnecessary empty file
MJ Ray [Fri, 25 Feb 2011 13:51:03 +0000 (08:51 -0500)]
bug 5813: Remove unnecessary empty file

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4852 - rewrite the query to include limits if using ccl=
Robin Sheat [Thu, 24 Feb 2011 21:33:38 +0000 (16:33 -0500)]
Bug 4852 - rewrite the query to include limits if using ccl=

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5792' into kcmaster
Chris Cormack [Thu, 3 Mar 2011 23:54:59 +0000 (12:54 +1300)]
Merge remote branch 'kc/new/enh/bug_5792' into kcmaster

9 years agoBug 5792 - Add reference icon to Bridge icon set
Nicole C. Engard [Wed, 23 Feb 2011 13:46:40 +0000 (08:46 -0500)]
Bug 5792 - Add reference icon to Bridge icon set

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5799 make language on circ history consistent
Nicole C. Engard [Wed, 23 Feb 2011 13:46:22 +0000 (08:46 -0500)]
Bug 5799 make language on circ history consistent

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFixing the translatable tests to work in french locales
Chris Cormack [Thu, 3 Mar 2011 23:31:48 +0000 (12:31 +1300)]
Fixing the translatable tests to work in french locales

9 years agoBug 5811 - Bumping database version
Chris Cormack [Thu, 3 Mar 2011 20:48:21 +0000 (09:48 +1300)]
Bug 5811 - Bumping database version

9 years agoBug 5811: Add sysprefs to control overriding fines
Jared Camins-Esakov [Mon, 21 Feb 2011 02:55:03 +0000 (21:55 -0500)]
Bug 5811: Add sysprefs to control overriding fines

This patch adds two sysprefs to allow libraries more fine-grained control over
when fines can and can't be overridden. The two sysprefs are:
* AllFinesNeedOverride - when this syspref is set to "Require" (default) any
    fine will require a staffmember to override the fine in order to check out a
    book.  When set to "Don't require," fines below noissuescharge will not need
    any override.
* AllowFineOverride - when this syspref is set to "Allow," staff will be able to
    override fines that are above noissuescharge. When set to "Don't allow"
    (default), staff will not be able to check out items to patrons with fines
    greater than noissuescharge.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5814 - Style error message on manage staged records page according to...
Owen Leonard [Mon, 21 Feb 2011 02:33:30 +0000 (21:33 -0500)]
Fix for Bug 5814 - Style error message on manage staged records page according to standard

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5804' into kcmaster
Chris Cormack [Wed, 2 Mar 2011 23:16:11 +0000 (12:16 +1300)]
Merge remote branch 'kc/new/bug_5804' into kcmaster

9 years agoFollow-up fix for Bug 5804, acqui duplicate warning
Owen Leonard [Mon, 28 Feb 2011 14:05:47 +0000 (14:05 +0000)]
Follow-up fix for Bug 5804, acqui duplicate warning

Typo fix. Thanks for spotting it Marcel.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_3319' into kcmaster
Chris Cormack [Mon, 28 Feb 2011 09:55:59 +0000 (22:55 +1300)]
Merge remote branch 'kc/new/bug_3319' into kcmaster

Conflicts:
members/members-home.pl

9 years agoBug 3319 Followup: Fix compatibility with fix for bug 4945
Ian Walls [Sat, 19 Feb 2011 10:38:32 +0000 (05:38 -0500)]
Bug 3319 Followup: Fix compatibility with fix for bug 4945

The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch.  Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_1953' into kcmaster
Chris Cormack [Mon, 28 Feb 2011 08:37:10 +0000 (21:37 +1300)]
Merge remote branch 'kc/new/bug_1953' into kcmaster

9 years agoBug 1953 - Follow up fix on security patch
Marcel de Rooy [Mon, 28 Feb 2011 08:30:07 +0000 (08:30 +0000)]
Bug 1953 - Follow up fix on security patch

Fixing: Undefined subroutine prepare called on line 722.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5812 - Tag Cloud - capitalized words come before lower-case words
Owen Leonard [Mon, 21 Feb 2011 02:32:22 +0000 (21:32 -0500)]
Fix for Bug 5812 - Tag Cloud - capitalized words come before lower-case words

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_4885' into kcmaster
Chris Cormack [Sun, 27 Feb 2011 21:11:09 +0000 (10:11 +1300)]
Merge remote branch 'kc/new/bug_4885' into kcmaster

Conflicts:
opac/opac-detail.pl

9 years agoFollow-up fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Owen Leonard [Sun, 20 Feb 2011 17:28:30 +0000 (12:28 -0500)]
Follow-up fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view

Fix for Bug 5551 overwrote the necessary changes to opac-detail.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_1883' into kcmaster
Chris Cormack [Sun, 27 Feb 2011 20:50:14 +0000 (09:50 +1300)]
Merge remote branch 'kc/new/enh/bug_1883' into kcmaster

9 years agoBZ1883 follow-up
Paul Poulain [Sun, 20 Feb 2011 17:20:25 +0000 (12:20 -0500)]
BZ1883 follow-up

solve comment 10 from nengard: This patch added these types only on upgrade.  We need them to be added to new
installs to.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5804 - duplicate warning when ordering needs design work
Owen Leonard [Sun, 20 Feb 2011 17:18:50 +0000 (12:18 -0500)]
Fix for Bug 5804 - duplicate warning when ordering needs design work

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5723: Font for 780s on staff client shrinks
Jared Camins-Esakov [Sun, 20 Feb 2011 17:14:57 +0000 (12:14 -0500)]
Bug 5723: Font for 780s on staff client shrinks

This patch fixes the bug that caused 780s in the staff client details XSLT to
display in progressively smaller fonts. This also corrects the semantics of the
780 ind1.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_2742' into kcmaster
Chris Cormack [Sun, 27 Feb 2011 20:09:33 +0000 (09:09 +1300)]
Merge remote branch 'kc/new/bug_2742' into kcmaster

9 years ago2742 Encoding problem
Marcel de Rooy [Wed, 23 Feb 2011 12:55:32 +0000 (12:55 +0000)]
2742 Encoding problem

Small correction of e umlaut. [Something happened with encoding of signed patch; my original patch did not show a wrong character.]

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_1953' into kcmaster
Chris Cormack [Sun, 27 Feb 2011 19:45:05 +0000 (08:45 +1300)]
Merge remote branch 'kc/new/bug_1953' into kcmaster

9 years agoUse placeholders in sql
Frère Sébastien Marie [Sun, 27 Feb 2011 12:56:43 +0000 (13:56 +0100)]
Use placeholders in sql

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5805: Having items in-transit can cause derangement of the hold list
ruth@bywatersolutions.com [Sun, 20 Feb 2011 23:24:38 +0000 (18:24 -0500)]
Bug 5805: Having items in-transit can cause derangement of the hold list

If you have a list of holds on a biblio, and one or more are in-transit, then the
array that is fed to modrequest.pl is not fully-populated, lacking the branch on the
in-transit rows.  If you then attempt to edit one of the remaining holds' pickup
location, it doesn't modify the one you expect, but ones *above* that.  Also, holds
at the bottom of the list get the first pickup library in the list, since they are
getting undef passed in.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 1953: Reduce risk of possible tainted supplierid call to C4::Serials::GetLateIssues
MJ Ray [Fri, 25 Feb 2011 13:26:20 +0000 (08:26 -0500)]
bug 1953: Reduce risk of possible tainted supplierid call to C4::Serials::GetLateIssues

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 1962: Add fine notification during check-in
Katrin Fischer [Sun, 20 Feb 2011 00:21:56 +0000 (19:21 -0500)]
Bug 1962: Add fine notification during check-in

Original patch submitted by dswhite42@yahoo.com

Reformatted to apply cleanly.
Changed alert message during check-in to message used
on borrower account checkout page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoSecurity Bugfix: Bug 1953 Adding Placeholders to SQL To Avoid Potential Injection...
Chris Nighswonger [Thu, 24 Feb 2011 14:57:11 +0000 (09:57 -0500)]
Security Bugfix: Bug 1953 Adding Placeholders to SQL To Avoid Potential Injection Attacks

This patch addresses both security issues mentioned in the summary of the report
submitted by Frère Sébastien Marie included below.

---------------------------
The problem is here: 'C4/AuthoritiesMarc.pm' in the function 'DelAuthority':
The argument $authid is included directly (not via statement) in the SQL.

For the exploit of this problem, you can use 'authorities/authorities-home.pl'
with authid on the URL and op=delete (something like
"authorities/authorities-home.pl?op=delete&authid=xxx").

This should successfully call DelAuthority, without authentification...
(DelAuthority is call BEFORE get_template_and_user, so before authentification
[This should be an issue also...]).

Please note that the problem isn't only that anyone can delete an authority of
this choose, it is more general: with "authid=1%20or%1=1" (after inclusion sql
will be like: "delete from auth_header where authid=1 or 1=1") you delete all
authorities ; with "authid=1;delete%20from%xxx" it is "delete from auth_header
where authid=1;delete from xxx" and so delete what you want...

SQL-INJECTION is very permissive: you can redirect the output in a file (with
some MySQL function), so write thea file of you choose in the server, in order
to create a backdoor, and compromise the server.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_3550' into kcmaster
Chris Cormack [Mon, 21 Feb 2011 19:37:34 +0000 (08:37 +1300)]
Merge remote branch 'kc/new/enh/bug_3550' into kcmaster

9 years agoMerge remote branch 'kc/new/bug_2742' into kcmaster
Chris Cormack [Mon, 21 Feb 2011 19:37:25 +0000 (08:37 +1300)]
Merge remote branch 'kc/new/bug_2742' into kcmaster

9 years agoBug 3550 : Display changes needed in opac-results-grouped too
Colin Campbell [Mon, 21 Feb 2011 16:18:59 +0000 (16:18 +0000)]
Bug 3550 : Display changes needed in opac-results-grouped too

Change to how subfield is derived had not been implemented in
opac-results-grouped causing ARRAY(hexnumber) to follow all titles
Replace template ref to scalar with an array

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years ago2742: Wrong language name in the preferences
marcel@libdevelop.rijksmuseum.nl [Mon, 21 Feb 2011 14:40:44 +0000 (15:40 +0100)]
2742: Wrong language name in the preferences

Follow up patch. Improvement suggested by Belgian translators (Hans Supply).

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>