Commit graph

13546 commits

Author SHA1 Message Date
Henri-Damien LAURENT
641616ef7f 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>
2011-03-31 15:23:24 +13:00
Chris Cormack
c584003c1d Typo in kohastructured.sql thanks to Marcel de Rooy for the catch 2011-03-31 11:41:48 +13:00
Chris Cormack
223436970b Bug 5548 bumping db version number 2011-03-30 20:37:49 +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
Chris Cormack
e1760e8463 Bug 5547 : Bumping db version 2011-03-30 20:21:50 +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
Colin Campbell
88cb47339a 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>
2011-03-30 20:01:37 +13:00
Paul POULAIN
268f860e24 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>
2011-03-30 19:59:55 +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
Jared Camins-Esakov
51604b5487 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>
2011-03-30 19:51:52 +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
Chris Cormack
5a89ef7ea5 Bug 5687 : Bumping database version 2011-03-30 19:36:20 +13:00
5d43524cdb 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>
2011-03-30 19:33:11 +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
Paul POULAIN
091d310016 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>
2011-03-30 12:37:50 +13:00
Jared Camins-Esakov
412966eff0 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>
2011-03-29 22:53:06 +13:00
b5a050d759 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>
2011-03-29 21:58:14 +13:00
Magnus Enger
aef8358cf2 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>
2011-03-29 21:54:12 +13:00
Jared Camins-Esakov
04ff06931c 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>
2011-03-29 21:52:16 +13:00
Jared CAMINS-ESAKOV
8958f152e7 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>
2011-03-29 12:16:46 +13:00
Chris Cormack
38b51b5638 Merge remote branch 'kc/new/bug_3326' into kcmaster 2011-03-29 12:14:59 +13:00
Jared Camins-Esakov
fa7ca5c8b8 Bug 3326: Staff results still displayed &amp;
In certain circumstances, ampersands would not be displayed properly in the
Staff client search results. This patch fixes that by ensuring that all the
doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
correct single ampersand entity.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-29 12:12:20 +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
Matthias Meusburger
c9ca5edf85 Bug 5966 : MT 3010: Adds waiting date for holds in opac-user
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 21:46:56 +13:00
Ian Walls
1d6f791541 Bug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens
This patch enables the ACCTDETAIL notices (and any branch-specific derivatives) to use
<<branches.*>> and <<borrowers.*>> tokens

This patch also attempts to send the email from the branch email first, falling back to
KohaAdminEmailAddress if no branch email exists.

To test:

1. Enable AutoEmailOpacUser system preference
2. Add <<branches.*>> tokens to the ACCTDETAIL notice
3. Create a new patron, including:
   a. test email address in the field matching your AutoEmailPrimaryAddress syspref value
   b. username and password (required to send a notice)
   c. any other required fields to save the record
4. Check you inbox.  Notice should send instantly (no need to run process_message_queue.pl)

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 21:26:29 +13:00
Chris Cormack
42f316ae48 Bug 5960 : Itemtype icons not showing correctly in staff search results
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 21:23:46 +13:00
Chris Cormack
7ddb28d1dd Bumping database version 2011-03-28 09:55:51 +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
Paul Poulain
a898b69dcc Bug 5930 : improving/modifying authority display on OPAC
- changing some terms that are unclear for a patron
- removing tag & subfields values & indicators
- removing UNIMARC coded fields
- changing the search page (removing options useless for a patron)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 20:54:10 +13:00
Henri-Damien LAURENT
eeb0d7c0d3 Bug 5926 : Fixing Hierarchies : taking any heading subfield
Conflicts solved:

	C4/AuthoritiesMarc.pm

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 20:51:59 +13:00
Colin Campbell
aaa80a54dc Bug 5932 Remove itemdata sub from C4::Serials
C4/Serials does not need to retrieve full item data
just to check if barcode is unique. Replace with
a lighter weight subroutine make code logic clearer and
cleaner

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 20:48:53 +13:00
Henri-Damien LAURENT
f7190f48aa Bug 5944 : (MT #3000) new cronjob script to delete old suggestions
This patch is a new script that delete suggestion that have be processed by librarians.
It take on argument, it's a number of days to keep suggestions. Suggestions olders than TODAY - $days will be deleted.
This script should be used to purge suggestions and clean the table in intranet.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 22:10:20 +13:00
Chris Cormack
079b546a61 Merge remote branch 'kc/new/enh/bug_5880' into kcmaster 2011-03-24 22:09:50 +13:00
Colin Campbell
0e1ea3ef81 Bug 5880: Correct misleading pod in new subroutine
Also remove some whitespace noise from prev commit

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 22:07:35 +13:00
Jared Camins-Esakov
1deadb34c3 Bug 5919: Display MARC21 fields 583, 586, 530
This patch adds the MARC21 fields 583 (Action note), 586 (Awards note), and
530 (Additional physical form available note) to the OPAC details display in the
XSLT-controlled portion of the page. In order to allow libraries to hide these
notes if they do not want them added, the notes have been given CSS classes.

Depends on patch for Bug 3098.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:16:33 +13:00
Jared Camins-Esakov
009036b537 Bug 3098 follow-up: Clean up formatting
This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:13:46 +13:00
Jared Camins-Esakov
52ade1d437 Bug 5939: "Save and edit items" button broken
When modifying an existing biblio, the "Save and edit items" option in the
"Save" menu did not redirect to the edit items screen. Instead, it redirected to
the regular details screen.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 13:33:13 +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