wip/koha-chris_n.git
9 years agoMerge remote branch 'kc/master' into new/enh/bug_5917
Chris Cormack [Sun, 3 Apr 2011 10:35:24 +0000 (22:35 +1200)]
Merge remote branch 'kc/master' into new/enh/bug_5917

9 years agoMerge remote branch 'kc/new/enh/bug_5548' into kcmaster
Chris Cormack [Sat, 2 Apr 2011 06:58:17 +0000 (19:58 +1300)]
Merge remote branch 'kc/new/enh/bug_5548' into kcmaster

9 years agoBug 5548: Correct punctuation in patch
Colin Campbell [Wed, 30 Mar 2011 18:53:46 +0000 (14:53 -0400)]
Bug 5548: Correct punctuation in patch

Punctuation should be a semi-colon not a comma
It works but is a trap for the unwary in the future

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'magnus/bug6002-sample-data' into new/enh/bug_6002
Chris Cormack [Sat, 2 Apr 2011 06:51:27 +0000 (19:51 +1300)]
Merge remote branch 'magnus/bug6002-sample-data' into new/enh/bug_6002

9 years agoBug 5870 : Follow up clean up patch
Stéphane Delaune [Mon, 28 Mar 2011 01:33:52 +0000 (14:33 +1300)]
Bug 5870 : Follow up clean up patch

(MT #4626) followup debug suggestion management : "accepted by" was not correctly displayed on suggestion's edit page

    suggestion's status, document's type and "accepted by" was not correctly displayed on suggestion's edit page
    (link with MT #4585)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5870 : suggestion management enhancements
Paul Poulain [Thu, 24 Mar 2011 09:08:59 +0000 (10:08 +0100)]
Bug 5870 : suggestion management enhancements

* changing suggestedy management
* adding a new status field & filter

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 6026 : export.pl : removing useless condition
Henri-Damien LAURENT [Fri, 1 Apr 2011 08:34:51 +0000 (10:34 +0200)]
Bug 6026 : export.pl : removing useless condition

Some conditions added AND items.biblionumber=biblio/biblionumber
where JOIN USING (biblionumber) already added that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoUpdating version
Chris Cormack [Fri, 1 Apr 2011 18:18:32 +0000 (07:18 +1300)]
Updating version

9 years agoMerge remote branch 'kc/new/enh/bug_4421' into kcmaster
Chris Cormack [Fri, 1 Apr 2011 18:15:47 +0000 (07:15 +1300)]
Merge remote branch 'kc/new/enh/bug_4421' into kcmaster

Conflicts:
C4/XSLT.pm
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/it-IT/necessari/sysprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/updatedatabase.pl

9 years agoBug 4421: Add alternate holdings display and prefs
Jared Camins-Esakov [Sat, 26 Mar 2011 14:43:06 +0000 (10:43 -0400)]
Bug 4421: Add alternate holdings display and prefs

This patch adds the ability to specify a field with alternate holdings
information for display when a biblio has no items associated with it.

Two sysprefs are added:
* AlternateHoldingsField specifies what field/subfields contain the alternate
holdings information. When blank, the alternate holdings information is not
displayed. The default is blank, as this is a new feature.
* AlternateHoldingsSeparator specifies the string to be used to separate
multiple subfields in the alternate holdings display. The default is ' '.

Example use case:
A library which does not have a 1-1 relationship between uncontrolled 852 fields
from a legacy system and actual physical items on the shelf wishes to display
holdings information from the 852, but does not want to create item records
which are almost certain to be inaccurate. By enabling the alternate holdings
feature (AlternateHoldingsField = '852abcdhi' and AlternateHoldingsSeparator =
' -- '), the library is able to gradually add item records as they locate the
physical items, without losing the holdings information presently stored in the
uncontrolled 852 fields.

To test:
1) Set AlternateHoldingsField to '852abcdhi'
2) Set AlternateHoldingsSeparator to ' -- '
3) Change the hidden value of subfields 'a', 'b', 'c', 'd', 'h', and/or 'i' of
   field 852 to 0 so that they display
4) Create a record which has data in the 852, but no item record
5) Look at holdings tab, where the data you entered should be displayed

Proof-of-concept initially developed for the American Numismatic Society.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
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_5548' into kcmaster
Chris Cormack [Fri, 1 Apr 2011 17:44:40 +0000 (06:44 +1300)]
Merge remote branch 'kc/new/enh/bug_5548' into kcmaster

9 years agoBug 5548 Follow up: Confirm Checkout message where it shouldn't be
Ian Walls [Fri, 1 Apr 2011 17:34:35 +0000 (13:34 -0400)]
Bug 5548 Follow up: Confirm Checkout message where it shouldn't be

Fixes the main Hard Due Dates conditional to first check for the existence
of $hardduedate, then the existences of its ISO export, then finally that that
value is not '0000-00-00'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5625 : adding missing title (needed for lateorders.pl)
Paul POULAIN [Fri, 1 Apr 2011 15:04:47 +0000 (17:04 +0200)]
Bug 5625 : adding missing title (needed for lateorders.pl)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3727: Corrects the behaviour of the itemtype selectbox in addbiblio.pl
Frédérick Capovilla [Fri, 1 Apr 2011 10:23:12 +0000 (12:23 +0200)]
Bug 3727: Corrects the behaviour of the itemtype selectbox in addbiblio.pl

If the subfield is set as mandatory with an empty default value, an
empty value is added in the selectbox and this value is selected by
default. Before, the first element was automatically selected, so it was
easy to forget to set this mandatory value.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoSmall patch to make myself feel important
Robin Sheat [Tue, 29 Mar 2011 04:01:38 +0000 (17:01 +1300)]
Small patch to make myself feel important

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5432' into kcmaster
Chris Cormack [Fri, 1 Apr 2011 17:08:43 +0000 (06:08 +1300)]
Merge remote branch 'kc/new/enh/bug_5432' into kcmaster

9 years agoFollow-up fix for Bug 5432 - Duplicate patron feature
Owen Leonard [Sat, 26 Mar 2011 18:29:39 +0000 (14:29 -0400)]
Follow-up fix for Bug 5432 - Duplicate patron feature

circ-toolbar.inc should get the same modification so that
all patron-related pages have the 'duplicate' button

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 6006 - Move location from current location to home library column on detail.pl
Liz Rea [Wed, 30 Mar 2011 20:41:01 +0000 (16:41 -0400)]
Bug 6006 - Move location from current location to home library column on detail.pl

It doesn't make sense to have the home library's location (example: Adult) in
the "current (branch) location" column, since that location is assigned by the
home library.

This patch moves it to the "home location" column, where it belongs.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5478 - Automate MARC framework import/export
Salvador Zaragoza Rubio [Fri, 4 Mar 2011 09:05:34 +0000 (10:05 +0100)]
Bug 5478 - Automate MARC framework import/export

    Module to Import/Export a Framework structure to CSV/Excel-xml/ODS/SQL in Intranet Administration - MARC Frameworks section.
    There are two new links: "Export" to export to a format; and "Import" to import from a file.
    The data exported/imported is the one stored in the MySQL tables marc_tag_structure, marc_subfield_structure.

    Exported works as follows:
    1) CSV: As this format only allows one worksheet, the data from the tables is splitted with a row with #-# cells or with the
    names of the fields of the next MySQL table. Each row has as much cells as fields has the MySQL table. The first row contains the
    field names, the remaining holds the data.
    2) Excel: Excel xml 2003 format. Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    3) ODS: OpenDocument Spreadsheet compressed format, creates a temporary directory to generate the files needed to create the zip file.
    Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    4) SQL: Text file, the first row for each table is a delete and the remaining are inserts.

    Importing reads the rows from the spreadsheet/text-file as follows:
    1) CSV: Each row inserts or updates the associated MySQL table for this framework. At the end of the importing for a MySQL table, deletes the rows in the database that don't possess a correspondence with the spreadsheet.
    2) Excel: Imports each worksheet to the associated MySQL table. Works as the CSV for each worksheet.
    3) ODS: Creates a temporary directory to decompress and read the content.xml. This file has the data needed to import.
    Works as the CSV for each worksheet.
    4) Executes the SQL file.
    If the file imported has a different frameworkcode that the framework importing, the framecode is changed along the process.

    The Csv format will be the default.
    It uses perl module Archive::Zip or zip/unzip system command to process ODS files.
    To parse the sql files when importing it uses SQL::Statement or homemade parsing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5857: longoverdue.pl needs a quiet mode for batch runs
ruth@bywatersolutions.com [Tue, 29 Mar 2011 01:06:18 +0000 (21:06 -0400)]
Bug 5857: longoverdue.pl needs a quiet mode for batch runs

This patch creates a --quiet flag for longoverdue that will squelch
the summary at the end of the run.  It also silences an unnecessary
warn in C4/Acounts.pm

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5952: Add another tab for relatives issues
Julian Maurice [Sat, 26 Mar 2011 09:49:10 +0000 (05:49 -0400)]
Bug 5952: Add another tab for relatives issues

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5952: Shows member relatives in issues lists
Matthias Meusburger [Sat, 26 Mar 2011 08:41:55 +0000 (04:41 -0400)]
Bug 5952: Shows member relatives in issues lists

Duplicate of '[PATCH] MT3747: Shows member relatives in issueslists' : Subject was wrong

MT3747, Follow-up: Adds siblings issues

MT3747, Follow-up: Shows member relatives in issues lists

 - Now displays patron's and relatives' issues apart

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in circulation.pl
 - Adds links to moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Remove unuseful warn

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Adds sorting for circulation.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5401, WYSIWYG for Koha news: Testing TinyMCE
Owen Leonard [Wed, 30 Mar 2011 11:42:48 +0000 (11:42 +0000)]
Bug 5401, WYSIWYG for Koha news: Testing TinyMCE

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoEscape the double quotes in authority search queries to prevent errors.
Frédérick Capovilla [Fri, 1 Apr 2011 07:16:51 +0000 (09:16 +0200)]
Escape the double quotes in authority search queries to prevent errors.

Before this fix, any search with double-quotes would return an error
500.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Fri, 1 Apr 2011 07:25:47 +0000 (20:25 +1300)]
Bumping database version

9 years agoBug 5959: Add search link for analytics to serial records
Katrin Fischer [Sun, 27 Mar 2011 21:42:18 +0000 (23:42 +0200)]
Bug 5959: Add search link for analytics to serial records

This will work similar to 'Show volumes' links from traced series records and
set records. A link to search for analytics linked to serials.

A new syspref will be added: UseControlNumber.

This syspref will make it possible to determine, if $w and Controlnumber are
used for linking of records in bibliographic records.

If syspref is OFF (default), the search links will not use control numbers
but keywords.
If syspref is ON links will be built using Control-number and rcn index.

NOTE: 773$a is added to index Host-item. For testing on a dev installation:
copy record.abs to your koha-dev folder and reindex!

Rebased against 3.03.00.035 and a small typo fixed by Jared Camins-Esakov.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Fri, 1 Apr 2011 07:17:39 +0000 (20:17 +1300)]
Bumping database version

9 years agoBug 5897: Add new syspref ShowReviewer
Katrin Fischer [Sat, 26 Mar 2011 10:26:34 +0000 (06:26 -0400)]
Bug 5897: Add new syspref ShowReviewer

This patch adds a new syspref ShowReviewer.

If ON (default) the reviewer/author of an OPAC comment will show.
If OFF the reviewer's name will be hidden.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5987: Add cl scripts to touch all biblios and items
Jared Camins-Esakov [Tue, 29 Mar 2011 13:39:52 +0000 (09:39 -0400)]
Bug 5987: Add cl scripts to touch all biblios and items

Add scripts that call ModBiblio and ModItem on all or some of the records in a
given catalog. For use when an upgrade changes the behavior of ModBiblio or
ModItem, and the change needs to be retroactively applied to records already in
the system. Usage is as follows:
misc/maintenance/touch_all_[biblios|items].pl [-v] [--where=STRING]

When invoked with a --where argument, the scripts will only modify those biblios
or items that match.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5975: Add id to "Don't have a card" instructions
Jared Camins-Esakov [Sat, 26 Mar 2011 17:39:25 +0000 (13:39 -0400)]
Bug 5975: Add id to "Don't have a card" instructions

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5973: Add spans to staff client results
Jared Camins-Esakov [Sat, 26 Mar 2011 17:37:28 +0000 (13:37 -0400)]
Bug 5973: Add spans to staff client results

This patch adds spans with named classes to the results page on the staff client
so that the formatting can be adjusted with CSS and/or jQuery.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFixing FSF address in license statements
Chris Cormack [Fri, 1 Apr 2011 02:55:06 +0000 (15:55 +1300)]
Fixing FSF address in license statements

9 years agoBumping database version
Chris Cormack [Fri, 1 Apr 2011 02:51:23 +0000 (15:51 +1300)]
Bumping database version

9 years agoBug 5578 : Follow up patch fixing FSF addresses
Chris Cormack [Fri, 1 Apr 2011 02:48:19 +0000 (15:48 +1300)]
Bug 5578 : Follow up patch fixing FSF addresses

9 years agoBug 5578: Self checkout by Login enhancement
Ian Walls [Wed, 30 Mar 2011 20:40:12 +0000 (16:40 -0400)]
Bug 5578: Self checkout by Login enhancement

Enables the library to choose whether to have patrons scan their barcodes for self checkout, or login
with username and password.  Uses 'checkpw' for compatibility with LDAP authentication.

Also introduces a few new system preferences to make Self Checkout more secure and manageable:

  SelfCheckTimeOut:      the number of seconds before the self-checkout login times out for a patron
  AllowSelfCheckReturns: indicate whether or not patrons can return materials via self-checkout
  SelfCheckHelpMessage:  user-configurable HTML to show specific text on the Help page.

Thank you to Marlboro College in Marlboro, VT for sponsoring and testing this development!

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5738 Display 856u As Image
Doug Dearden [Thu, 31 Mar 2011 21:22:26 +0000 (15:22 -0600)]
Bug 5738 Display 856u As Image

Add an option to the OPAC to display the URI that is stored in the 856u field
as an image instead of a text link.  This would be implemented in the OPAC XSLT
style sheets for the Results and Details pages, and would require that the
corresponding OPAC XSLT option be set.

This enhancement is designed to enable the staff to catalog images, then have
them appear on the resulting pages in the OPAC when searching.  Clicking on the
image would open it full size.  If the image option is in use, then the default
link text would be disabled.  Custom text would still appear if entered in the
"URLLinkText" option.

Add system preference "Display856uAsImage" with options of Results page,
Details page, Both Results and Details pages, Neither Results or Details page.

Notes for documentation manager:
There are two system preferences added for this enhancement:
OPACDisplay856uAsImage and Display856uAsImage.  These appear on the OPAC and
Staff Client screens under the System Preferences.

The preference can be set to one of four options:

Both Details and Results pages
Details page only
Neither Details or Results pages
Results page only

In addition to this option being set, the corresponding XSLT option must be
turned on. Also, the corresponding 856q field must have a valid MIME image
extension (e.g., "jpg") or MIME image type (i.e. starting with "image/"), or the
generic indicator "img" entered in the field.

As of 14 March 2011 the UNIMARC xslt display files also require a "0" in the
second indicator location of the 856u field for the links to be activated.  This
is not true for the MARC21 display files.

When all of the requirements are met, an image file will be displayed instead of
the standard link text. Clicking on the image will open it in the same way as
clicking on the link text.

Rebased and three original patches squashed into one on 30 March 2011 by Jared
Camins-Esakov.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Doug Dearden <dearden@sarsf.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_6003' into kcmaster
Chris Cormack [Fri, 1 Apr 2011 00:31:53 +0000 (13:31 +1300)]
Merge remote branch 'kc/new/enh/bug_6003' into kcmaster

9 years agoBug 6003 Display call number on return
Magnus Enger [Thu, 31 Mar 2011 03:09:24 +0000 (23:09 -0400)]
Bug 6003 Display call number on return

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5965 : Follow up patch, cleaned for style
Chris Cormack [Wed, 30 Mar 2011 10:24:20 +0000 (12:24 +0200)]
Bug 5965 : Follow up patch, cleaned for style

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5965 : Normalizing opac-detail.pl
Paul Poulain [Wed, 30 Mar 2011 10:24:19 +0000 (12:24 +0200)]
Bug 5965 : Normalizing opac-detail.pl

NFC on opac-detail

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5996 : MT2926: Fix default values for patron import
Matthias Meusburger [Wed, 30 Mar 2011 14:07:07 +0000 (16:07 +0200)]
Bug 5996 : MT2926: Fix default values for patron import

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5990: Lists and Cart show LOC code not Location Authorized value
Ian Walls [Wed, 30 Mar 2011 17:39:53 +0000 (13:39 -0400)]
Bug 5990: Lists and Cart show LOC code not Location Authorized value

Lists in the OPAC, and Cart on both sides, show the LOC code for items, rather
than the appropriate Description from Authorised Values.  This is because the
code uses GetItemInfo, which is a very heavy-weight call to only retrieve some
of the desired information.

This patch introduces a new subroutine in C4::Items, GetItemsLocationInfo, which
returns the branch names for both home- and holdingbranches, the location code,
both opac and intranet location descriptions, itemcallnumber and cn_sort. This
should be used instead of GetItemsInfo in any case where the locational
information is all that's required, as it's much more streamlined and efficient.

In the OPAC Lists, this only applies if OPACXSLTResultsDisplay is 'off' (set to
'normal').

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version number
Chris Cormack [Thu, 31 Mar 2011 23:06:20 +0000 (12:06 +1300)]
Bumping database version number

9 years agoBug 5957: Making COiNS in OPAC search results optional
Ian Walls [Wed, 30 Mar 2011 16:01:34 +0000 (12:01 -0400)]
Bug 5957: Making COiNS in OPAC search results optional

Adds a new system preference, COinSinOPACResults, which toggles the inclusion of
COiNS/OpenURL/Z39.88 in the search results display.  Default is 'on', continuing
the current behaviour.

Disabling this feature will result in a significant increase in search speed, since
each call to GetCOinSBiblio requires a separate parsing of the MARC record, and there are
<OPACnumSearchResults> calls to this routine with each search.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4943: Search history cookie size limit
Matthias Meusburger [Wed, 30 Mar 2011 10:03:23 +0000 (12:03 +0200)]
Bug 4943: Search history cookie size limit

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5828 - notes for purchase suggestions not showing in the staff client
Owen Leonard [Thu, 31 Mar 2011 01:39:52 +0000 (21:39 -0400)]
Fix for Bug 5828 - notes for purchase suggestions not showing in the staff client

- Correcting the markup error that prevented the note from appearing
- Adding a little icon to set the note off from the other data

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_5548' into kcmaster
Chris Cormack [Thu, 31 Mar 2011 20:12:58 +0000 (09:12 +1300)]
Merge remote branch 'kc/new/enh/bug_5548' into kcmaster

9 years agoBug 5578 Followup: Hard Due Dates break hard-coded default circ rule
Ian Walls [Thu, 31 Mar 2011 19:33:17 +0000 (15:33 -0400)]
Bug 5578 Followup: Hard Due Dates break hard-coded default circ rule

If you do not have an applicable circulation rule for a combination of branch,
item type and patron category defined in your Circulation and Fines rules,
the Hard Due Dates development prevents circulation by introducing an error:

Can't call method "output" on an undefined value at /home/magnus/kohahead/C4/Circulation.pm line 2713

This is because the $hardduedate variable is not defined.  Changing the conditional
to check it, rather that it's output, fixes the issue.  That's what this patch does.

Is this the longest commit message for a single line fix?  Maybe.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening...
root [Wed, 30 Mar 2011 14:44:59 +0000 (10:44 -0400)]
Bug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening additional dialogs"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 6004/3270: Sending things "home"
ruth@bywatersolutions.com [Wed, 30 Mar 2011 15:52:27 +0000 (10:52 -0500)]
Bug 6004/3270: Sending things "home"

This patch addresses two problems:

Bug 6004:

If an item is returned at other than its' home library, and there is a hold for
it--at any library other than the return library--two prompts come up: one
telling the user to send the item home, and the other, to confirm and transfer
for the hold.  Only the latter should be displayed.

Bug 3270:

Cancelling a hold request after transfer initiated orphans item.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5305: CCL query, then resort, loses reults.
ruth@bywatersolutions.com [Wed, 30 Mar 2011 16:11:51 +0000 (11:11 -0500)]
Bug 5305: CCL query, then resort, loses reults.

If you did a CCL query, then attempted resort, you would get the advanced-search page,
because of wonky URL escaping of the q= clause.  This patch fixes that.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5988 - SearchMyLibraryFirst preference appears twice in preferences
Owen Leonard [Wed, 30 Mar 2011 13:06:44 +0000 (09:06 -0400)]
Fix for Bug 5988 - SearchMyLibraryFirst preference appears twice in preferences

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 3523 - Menu of existing lists limited to 10
Owen Leonard [Wed, 30 Mar 2011 13:34:25 +0000 (15:34 +0200)]
Fix for Bug 3523 - Menu of existing lists limited to 10

- adding "more" option to the search results dropdown
- offering a scrolling list on the add-to-list popup
- lists add popup shows the full list of all
  the patron's lists, divided into groups of private and
  public lists.

Can be improved by a fix for Bug 5529

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/master' into new/bug_5940
Chris Cormack [Thu, 31 Mar 2011 07:45:52 +0000 (20:45 +1300)]
Merge remote branch 'kc/master' into new/bug_5940

9 years agoBug 5940: Offline Circ & Patron Card Help Files for 3.4
Nicole C. Engard [Wed, 30 Mar 2011 20:47:13 +0000 (16:47 -0400)]
Bug 5940: Offline Circ & Patron Card Help Files for 3.4

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug5940: Authority, Labels, Circ help files for 3.4
Nicole C. Engard [Wed, 30 Mar 2011 19:48:04 +0000 (15:48 -0400)]
Bug5940: Authority, Labels, Circ help files for 3.4

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5940: Admin Help Files for 3.4
Nicole C. Engard [Tue, 29 Mar 2011 21:35:41 +0000 (17:35 -0400)]
Bug 5940: Admin Help Files for 3.4

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMT3289 : check_sysprefs.pl case sensitive variable names
Henri-Damien LAURENT [Sun, 11 Apr 2010 18:40:57 +0000 (20:40 +0200)]
MT3289 : check_sysprefs.pl case sensitive variable names

Variable names for systempreferences are now case sensitive.
Changing check_sysprefs in relation with this change

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoTypo in kohastructured.sql thanks to Marcel de Rooy for the catch
Chris Cormack [Wed, 30 Mar 2011 22:41:48 +0000 (11:41 +1300)]
Typo in kohastructured.sql thanks to Marcel de Rooy for the catch

9 years agoBug 5917 : Fixing a bug with signedin users
Chris Cormack [Wed, 30 Mar 2011 19:59:27 +0000 (08:59 +1300)]
Bug 5917 : Fixing a bug with signedin users

9 years agoBug 5917 : Fixing search results
Chris Cormack [Wed, 30 Mar 2011 08:49:39 +0000 (21:49 +1300)]
Bug 5917 : Fixing search results

9 years agoBug 5917 : Working on a fix for commas
Chris Cormack [Wed, 30 Mar 2011 08:49:38 +0000 (21:49 +1300)]
Bug 5917 : Working on a fix for commas

9 years agoBug 5917 : FIxing problem with comma in variable names
Chris Cormack [Wed, 30 Mar 2011 08:49:37 +0000 (21:49 +1300)]
Bug 5917 : FIxing problem with comma in variable names

9 years agoBug 5917 updating templates
Chris Cormack [Wed, 30 Mar 2011 07:55:45 +0000 (20:55 +1300)]
Bug 5917 updating templates

9 years agoAnother wrong encoding in installer/data/mysql/nb-NO/2-Valgfritt/
Magnus Enger [Tue, 29 Mar 2011 19:15:08 +0000 (21:15 +0200)]
Another wrong encoding in installer/data/mysql/nb-NO/2-Valgfritt/

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoFix wrong encodings in installer/data/mysql/nb-NO/2-Valgfritt/
Magnus Enger [Tue, 29 Mar 2011 19:13:41 +0000 (21:13 +0200)]
Fix wrong encodings in installer/data/mysql/nb-NO/2-Valgfritt/

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoA couple of missing translations in installer/data/mysql/nb-NO/2-Valgfritt/
Magnus Enger [Tue, 29 Mar 2011 19:11:28 +0000 (21:11 +0200)]
A couple of missing translations in installer/data/mysql/nb-NO/2-Valgfritt/

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoFix typo in installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt
Magnus Enger [Tue, 29 Mar 2011 19:06:47 +0000 (21:06 +0200)]
Fix typo in installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoAdd files to installer/data/mysql/nb-NO/2-Valgfritt/
Magnus Enger [Tue, 29 Mar 2011 14:26:47 +0000 (16:26 +0200)]
Add files to installer/data/mysql/nb-NO/2-Valgfritt/

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoTranslate OPACSearchForTitleIn in installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
Magnus Enger [Tue, 29 Mar 2011 11:32:25 +0000 (13:32 +0200)]
Translate OPACSearchForTitleIn in installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoAdd files in installer/data/mysql/nb-NO/1-Obligatorisk/
Magnus Enger [Tue, 29 Mar 2011 10:31:42 +0000 (12:31 +0200)]
Add files in installer/data/mysql/nb-NO/1-Obligatorisk/

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoAdd a copy of MARC21 data
Magnus Enger [Mon, 28 Mar 2011 21:00:56 +0000 (23:00 +0200)]
Add a copy of MARC21 data

Copy installer/data/mysql/en/marcflavour/marc21
to   installer/data/mysql/nb-no/marcflavour/marc21

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoAdd sample Z39.50 servers
Magnus Enger [Tue, 9 Mar 2010 11:38:23 +0000 (12:38 +0100)]
Add sample Z39.50 servers

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
9 years agoMerge remote branch 'kc/master' into new/enh/bug_5917
Chris Cormack [Wed, 30 Mar 2011 07:53:45 +0000 (20:53 +1300)]
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql

9 years agoBug 5548 bumping db version number
Chris Cormack [Wed, 30 Mar 2011 07:37:49 +0000 (20:37 +1300)]
Bug 5548 bumping db version number

9 years agoBug 5548: Hard Due Dates Circ Rule
Ian Walls [Mon, 28 Mar 2011 21:17:09 +0000 (17:17 -0400)]
Bug 5548: Hard Due Dates Circ Rule

Implements the RFC found at http://wiki.koha-community.org/wiki/Hard_Due_Dates_Circ_Rule_RFC.  See squashed commits
messages below for details of implementation.

Squashed commit of the following:

commit 871b91af00871146eb1216ebf5ce673dda2c5925
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Tue Dec 28 15:09:49 2010 -0500

    Hard Due Dates dev part 3: implementing the due dates in circ

    CalcDateDue now calls GetLoanLength, rather than each invocation running separately one after another.  Therefore, instead of
    the 'loanlength' param, CalcDateDue now takes 'itype', and uses the info to get both the issuelength and the hardduedate info (if it exists)

    Global Due Date no longer populates in the sticky due date field in Circ, since it can't be determined before the item is scanned.  Any specified
    due date still overrides the circulation rules, if allowed.

    Hard Due Dates in the past will return an error message, but can be manually specified if truly desired.

    Also, a small fix to updatedatabase.pl to allow the old data to populate if possible.

commit 14d5505f3c01287a2464a759f0076c1d4b665c49
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 18:28:11 2010 -0500

    HardDueDates dev part 2:  adding admin interface

    Adds columns to Smart Rules page, including calendar for easy date selection.

    Removes globalDueDate and ceilingDueDates from system preferences editors

commit 76e3e3d86a7a54c6ce4253e7f68278b4dc75a0bb
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 15:58:05 2010 -0500

    HardDueDates dev part 1: database changes

    Adds two new columns to issuingrules, a hardduedate and a hardduedatecompare.  If globalduedate is set, use that as the universal value
    for all circ rules.  Else, if ceilingduedate is set, use that as the universal value.  Adjust the comparison accordingly (-1 before, 0
    exact, 1 after).  the old system preferences globalDueDate and ceilingDueDate are then removed.

    Rebased onto 3.03.00.032

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5547 : Bumping db version
Chris Cormack [Wed, 30 Mar 2011 07:21:50 +0000 (20:21 +1300)]
Bug 5547 : Bumping db version

9 years agoBug 5547: Hide Lost Items dev
Ian Walls [Mon, 28 Mar 2011 14:21:02 +0000 (10:21 -0400)]
Bug 5547: Hide Lost Items dev

Adds a Hide Lost Items option to the staff client, as detailed in the enhancement request
at http://wiki.koha-community.org/wiki/Hidelostitems_option_for_the_staff_client_RFC

Minor edits: Whitespace

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5708 : Get Correct Discount when levying rentalcharge
Colin Campbell [Tue, 29 Mar 2011 13:57:41 +0000 (09:57 -0400)]
Bug 5708 : Get Correct Discount when levying rentalcharge

Branch can be a parameter so it should be included in the rule retrieval
Need to select the most appropriate rule from those returned
(was defaulting to first returned!)
Try to make what's happening a bit less opaque
null fields are returned as undefined not 'NULL' by DBI

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5982 : OPAC Serials Minor change in description
Paul POULAIN [Sat, 26 Mar 2011 22:17:58 +0000 (18:17 -0400)]
Bug 5982 : OPAC Serials Minor change in description

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup
Owen Leonard [Sat, 26 Mar 2011 15:06:51 +0000 (11:06 -0400)]
Fix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5971, Minor markup error in holds queue report
Owen Leonard [Sat, 26 Mar 2011 18:26:47 +0000 (14:26 -0400)]
Fix for Bug 5971, Minor markup error in holds queue report

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4393: Scan Indexes results cannot be sorted
Jared Camins-Esakov [Sat, 26 Mar 2011 10:01:51 +0000 (06:01 -0400)]
Bug 4393: Scan Indexes results cannot be sorted

Because of the way Scan Indexes works, the results cannot be sorted. Previously
when any sort other than relevance (or in some cases popularity) was used, the
search failed. This patch disables sorting on Scan results. This patch also
fixes the index selection dropdown on the results page, which was not being
populated correctly from the Advanced Search screen.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5964 : Translation problem on aqbudgets.tmpl
Henri-Damien LAURENT [Tue, 29 Mar 2011 16:04:21 +0000 (12:04 -0400)]
Bug 5964 : Translation problem on aqbudgets.tmpl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5940' into kcmaster
Chris Cormack [Wed, 30 Mar 2011 06:40:47 +0000 (19:40 +1300)]
Merge remote branch 'kc/new/bug_5940' into kcmaster

9 years agoBug 5940: Acq and Suggestion Help Files for 3.4
Nicole C. Engard [Tue, 29 Mar 2011 14:21:15 +0000 (10:21 -0400)]
Bug 5940: Acq and Suggestion Help Files for 3.4

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5687 : Bumping database version
Chris Cormack [Wed, 30 Mar 2011 06:36:20 +0000 (19:36 +1300)]
Bug 5687 : Bumping database version

9 years agoBug 5687: Add pref StaffAuthorisedValueImages for staff search results (install)
Marcel de Rooy [Tue, 29 Mar 2011 22:31:24 +0000 (18:31 -0400)]
Bug 5687: Add pref StaffAuthorisedValueImages for staff search results (install)

This patch contains only the install stuff. (Functionality in previous patch.)

Rebased on March 28.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5687: Add pref StaffAuthorisedValueImages for staff search results
Marcel de Rooy [Tue, 29 Mar 2011 22:30:13 +0000 (18:30 -0400)]
Bug 5687: Add pref StaffAuthorisedValueImages for staff search results

This patch contains the functionality, not the install stuff.

Revised: with input of Ian Walls: populate authorised_value_images only if needed; no changes anymore for template and search.pl.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3629 : search limit by group is not OK
Paul POULAIN [Sat, 26 Mar 2011 22:24:19 +0000 (18:24 -0400)]
Bug 3629 : search limit by group is not OK

MT4491 : limitation by library group

- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()

author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)

the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5917 : final commit from catalyst
Christopher Hall [Fri, 25 Feb 2011 03:38:49 +0000 (16:38 +1300)]
Bug 5917 : final commit from catalyst

9 years agoBug 5917 : initial work on translation tool conversion
Christopher Hall [Wed, 16 Feb 2011 01:00:10 +0000 (14:00 +1300)]
Bug 5917 : initial work on translation tool conversion

9 years agoBug 5917 : fixed branches.pl and made template::param handle empty array/hashes better
Christopher Hall [Fri, 4 Feb 2011 02:10:16 +0000 (15:10 +1300)]
Bug 5917 : fixed branches.pl and made template::param handle empty array/hashes better

9 years agoBug 5917 : Tracking template changes
Chris Cormack [Tue, 29 Mar 2011 19:39:38 +0000 (08:39 +1300)]
Bug 5917 : Tracking template changes

9 years agoMerge remote branch 'kc/master' into new/enh/bug_5917
Chris Cormack [Tue, 29 Mar 2011 19:39:10 +0000 (08:39 +1300)]
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql

9 years agoBug 5253: Add options to runreport.pl
Jared Camins-Esakov [Tue, 29 Mar 2011 01:16:02 +0000 (21:16 -0400)]
Bug 5253: Add options to runreport.pl

This makes sending reports via e-mail with runreport.pl work properly. It also
adds a --format option to allow the user to select between text, html, csv, and
tsv. At the moment text is not implemented, and falls back to tsv, but that is
still more readable than the HTML that used to be produced.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5833, opacstylesheet not loading on all pages
Owen Leonard [Sat, 26 Mar 2011 15:08:43 +0000 (11:08 -0400)]
Fix for Bug 5833, opacstylesheet not loading on all pages

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4265: Fix padding of short callnumbers and Bib-1 attribute for sorting
Magnus Enger [Mon, 28 Mar 2011 15:42:57 +0000 (11:42 -0400)]
Bug 4265: Fix padding of short callnumbers and Bib-1 attribute for sorting

1. The current C4::ClassSortRoutine::Dewey turns "306 Les" into "306_Les" for items.cn_sort and MARC-field 952$6, which results in "306.46 Les" being sorted before "306 Les" in the OPAC. With this patch, "306 Les" is turned into "306_000000000000000_Les".

2. Currently, call_number_asc and call_number_desc are set up to sort by 1=20, but this is mapped to Local-classification in ccl.properties, which is mapped to 952$o in record.abs.

This patch changes these sorts to use 1=8007, which is mapped to cn-sort and 952$6.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5900: GetAllIssues performance issues
Jared Camins-Esakov [Sat, 26 Mar 2011 14:53:42 +0000 (10:53 -0400)]
Bug 5900: GetAllIssues performance issues

Previously GetAllIssues was called before authenticating. Given how expensive
GetAllIssues is, this is problematic and could be used for used for DOSing the
server. There should be no functional change from this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4366: Improve COinS support for MARC21
Jared CAMINS-ESAKOV [Sat, 26 Mar 2011 10:04:39 +0000 (06:04 -0400)]
Bug 4366: Improve COinS support for MARC21

This patch begins the process of improving the COinS support in Koha to take
advantage of all the metadata available in the MARC format. COinS still doesn't
work quite right, but at least it seems to be following the standard now. The
COinS exported by C4::Biblio::GetCOinSBiblio now correctly identifies articles
from journals and books as such.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>