Commit graph

3315 commits

Author SHA1 Message Date
root
5d707b5e9b 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>
2011-03-31 21:56:09 +13:00
47a53e9132 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>
2011-03-31 21:10:31 +13:00
Chris Cormack
fb4aec265f Merge remote branch 'kc/master' into new/bug_5940 2011-03-31 20:45:52 +13:00
Nicole C. Engard
c597635b36 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>
2011-03-31 20:45:35 +13:00
Nicole C. Engard
fc5ccbf5a3 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>
2011-03-31 20:45:34 +13:00
Nicole C. Engard
de58d82465 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>
2011-03-31 20:45:32 +13:00
Ian Walls
e57dadf762 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>
2011-03-30 20:35:45 +13:00
Ian Walls
48ee1dcb3f 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>
2011-03-30 20:20:05 +13:00
735d986a0c 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>
2011-03-30 19:56:54 +13:00
84e43e0615 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>
2011-03-30 19:55:24 +13:00
Henri-Damien LAURENT
813f5c3f51 Bug 5964 : Translation problem on aqbudgets.tmpl
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:42:53 +13:00
Chris Cormack
c12660a4b3 Merge remote branch 'kc/new/bug_5940' into kcmaster 2011-03-30 19:40:47 +13:00
Nicole C. Engard
f144af1a95 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>
2011-03-30 19:40:03 +13:00
c83589e0e1 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>
2011-03-30 19:33:09 +13:00
Katrin Fischer
e8c43dbf3d Bug 5838: Format sql outout on guided reports
New suggestion: wrapping the sql output in <pre> with an unique id.

- sql can be formatted to be better readable
- sql can be hidden using css and the unique id
- pagination is pushed to its own line and better visible

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-29 09:53:02 +13:00
Jared Camins-Esakov
b853b79001 Bug 5817: Follow-up fixing callnum: on staff results
This patch changes the call number links on the staff results page so that
searching will work. The underlying problem described by bug 5274 remains an
issue, but this fixes some of the more problematic symptoms.

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>
2011-03-29 08:45:28 +13:00
Chris Cormack
63541e4223 Merge remote branch 'kc/master' into new/bug_5817 2011-03-29 08:44:48 +13:00
Jared Camins-Esakov
36ca010cc4 Bug 4276: XSLT subject tracings only use subfield a
When XSLT is enabled, the subject tracings on the details view (both OPAC and
Intranet) previously only searched on the subfield 'a'. In addition, searches
failed when the tracing included parentheses, and the XSLT display did not
include subfields other than abcdvxyz, even for those 6xx tags that have other
subfields.

This patch adds a syspref: TraceSubjectSubdivisons. When
TraceSubjectSubdivisions is set to "Don't include" (default), the subject
tracings in the XSLT details view will only search on subfield 'a'. When
TraceSubjectSubdivisions is set to "Include", the subject tracings will search
on all subfields, not just subfield 'a'.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 09:47:05 +13:00
Chris Cormack
a4b2280b6b Merge remote branch 'kc/new/bug_3670' into kcmaster
Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
2011-03-27 21:19:24 +13:00
Ian Walls
3884e1693f Bug 3670 Followup: fixes message preference form
Changing the database value from "Item DUE" to "Item Due" broke the matching performed in the
messaging-preferences-form.inc file, resulting it the notice being labeled as "Unknown".

This patch changes both the matching, and the display, to "Item Due"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:17:16 +13:00
Chris Cormack
4669a10776 Merge remote branch 'kc/new/enh/bug_1962' into kcmaster
Conflicts:
	circ/returns.pl
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/pl-PL/mandatory/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2011-03-27 21:12:40 +13:00
Katrin Fischer
b3866aff5d Bug 1962: Add new syspref FineNotifyAtCheckin
This patch adds a new syspref FineNotifyAtCheckin.

With syspref ON there will be a message when checking in books from
a patron with outstanding fines.

With syspref OFF (default) no message will be shown.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:06:37 +13:00
ruth@bywatersolutions.com
6e59b9a295 Bug 5954: 490$a not used to create search link in XSLT
This bug corrects a minor XSLT bug that is causing 490$t (which is not defined) to create
search links when XSLT is enabled

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:02:33 +13:00
Nicole C. Engard
2ecdf2fda9 Bug 5940: Catalog and Cataloging 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>
2011-03-27 21:00:01 +13:00
Nicole C. Engard
b8f3120bf5 Bug 5940: Update Patron Help Files
This patch updates the help files in the patron area of Koha.

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>
2011-03-27 20:57:51 +13:00
Jared Camins-Esakov
b585b63ec7 Bug 5921: Add enumchron to the items detail page
This patch adds the Serial enumeration/chronology field to the items display in
moredetail.pl.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 13:29:37 +13:00
Jared Camins-Esakov
637cf26045 Bug 5641: Replace Favicon through staff client
This patch adds two sysprefs:
OpacFavicon
IntranetFavicon

The two sysprefs take full URLs to an alternate favicon.ico file for the OPAC
and Staff Client, respectively. Leaving them blank will use the favicon.ico file
that is included with Koha.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 21:41:32 +13:00
bf2fb98ea0 Bug 5931 Paging and sorting saved reports table
On Reports > Saved reports page, a table shows all saved reports.
Table's rows are sorted by report IDs. When there are a lot reports,
this table is difficult to read.

This enhancement add to Saved report page a paging bar and sort options on
column names, like in the framework table.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 17:02:36 +13:00
Nicole C. Engard
1a870e4c23 Bug 5928 follow up remove branchcode label
Under Acq info it said 'Branchcode,' I've changed this to 'Library'
to match the style used in other places.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 10:35:19 +13:00
Srdjan Jankovic
670a262504 Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 10:35:16 +13:00
769faee11a Bug 5755: Syspref to control facets truncation
On OPAC/staff result page facets are truncated to 20 characters. On some OPAC
layout, it's not enough. A new syspref FacetLabelTruncationLength defines the
length to cut facets if necessary.

This patch add the syspref to searching.pref and add it to syspref various
language default values loaded into DB during installation process. It's not
necessary to update DB since length is fixed to 20 (as before) when this
syspref isn't defined in systemprefercences table.

Rebased to last HEAD: 2011.03.18

[Documentation] FacetLabelTruncationLength syspref in Searching tab

[3.2] It doesn't apply.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 21:06:35 +13:00
265ed53f12 3154 Preferences for building facets (functionality)
Based on patch from Fridolyn Somers with input of Frederic Demians.
Added new Searching preference maxRecordsForFacets.
This pref contains number of result records used in facet building.
Also added pref displayFacetCount (with thanks to Frederic).
Follow up patch takes care of install issues; functionality can already be tested with this patch only.

Updated on March 17 for changes in include files.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 20:53:28 +13:00
b9cee99da4 Bug 5065 Add ability to choose framework on import
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:36:35 +13:00
Savitra Sirohi
589aac1540 Bug 5466 - Acquisitions - ability to set currency in order screens
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:51:40 +13:00
Salvador Zaragoza Rubio
0499633a6b Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".

Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer

Fix error on comma for IE

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 12:00:36 +13:00
Julian Maurice
632277e453 Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.

The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.

This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:54:21 +13:00
1b57668d7e 5622: Improve display of MARC21 773 field in XSLT detail view
Applies change to OPAC and staff detail view.
Chops punctuation. Adds 773g. Strips MARC org code from URL.
Utils code is used as basis for patches #5662 and #5663 too.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:05:11 +13:00
Chris Cormack
2ea6fdec15 Merge remote branch 'kc/new/bug_4218' into kcmaster 2011-03-18 10:38:40 +13:00
4b1fe1c9c3 Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:38:07 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
Paul Poulain
e28e34fbbb Bug 5882 : catalogue/moredetails (minor) changes
MT3288 moredetail.tmpl Lost and Damaged first choice is empty

    First choice was the first value of the authorised value list
    This is not handy for users.
    Rather than showing the first value, inserting a new empty value for users to see what to do

Term "Total Renewals" misleading, change to "Current Renewals"

    In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl under History,
    there's a Total Renewals entry: seems to indicate a cumulative count of renewals on
    the item, which it is not, contrary to "Total Issues" just below.
    Moved the line up outside "history", and renamed it "Current Renewals".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:15:21 +13:00
Nicole C. Engard
3141202764 Follow Up Bug 5869 Update Report Page Title
The title said Checkout Stats - updated to say Holds Stats

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:13 +13:00
Nicole C. Engard
e05bb4ef85 Follow Up Bug 5869 Fix String Errors
This patch fixes all occurences of 'reserves' to 'holds.' It also
added Holds to the menu include and updates capitalization and spacing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:11 +13:00
Chris Cormack
2b1de0948d Bug 5869 - Follow up patch, fixing copyring and s/reserves/holds/
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:09 +13:00
Paul Poulain
99b0a074eb Bug 5869 : Adding a reserve report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:08 +13:00
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
Chris Cormack
74c37aeeb6 Revert "Merge remote branch 'kc/new/bug_5734' into kcmaster"
This reverts commit b18ae6dee6, reversing
changes made to a52d4e8a70.
2011-03-16 16:28:00 +13:00
Chris Cormack
1e98195b10 Merge remote branch 'kc/new/enh/bug_3495' into kcmaster 2011-03-15 22:01:45 +13:00
Katrin Fischer
9dfc9d4d12 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>
2011-03-15 22:00:23 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00