Commit Graph

47735 Commits

Author SHA1 Message Date
Chris Cormack 513fbe2084 Bug 5965 : Follow up patch, cleaned for style
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 13:21:16 +13:00
Paul Poulain 480ca80dd0 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>
2011-04-01 13:16:52 +13:00
Matthias Meusburger ff7affdf43 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>
2011-04-01 13:13:47 +13:00
Ian Walls 90392c19cc 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>
2011-04-01 12:07:46 +13:00
Chris Cormack f1331722f1 Bumping database version number 2011-04-01 12:06:20 +13:00
Ian Walls c625ff9872 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>
2011-04-01 12:00:25 +13:00
Matthias Meusburger fd1b757233 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>
2011-04-01 11:54:00 +13:00
Owen Leonard b6f51fb79e 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>
2011-04-01 11:51:48 +13:00
Chris Cormack 849342e3f5 Merge remote branch 'kc/new/enh/bug_5548' into kcmaster 2011-04-01 09:12:58 +13:00
Ian Walls 1d6fa48d19 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>
2011-04-01 09:10:45 +13:00
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
ruth@bywatersolutions.com 0a64cfba5e 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>
2011-03-31 21:20:12 +13:00
ruth@bywatersolutions.com 8548b804f4 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>
2011-03-31 21:18:29 +13:00
Owen Leonard 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
Owen Leonard 731b933d51 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>
2011-03-31 21:08:40 +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
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 6350a7d1cb Bug 5917 : Fixing a bug with signedin users 2011-03-31 08:59:27 +13:00
Chris Cormack 6840c9ca44 Bug 5917 : Fixing search results 2011-03-30 21:53:17 +13:00
Chris Cormack 2ab91e2cb6 Bug 5917 : Working on a fix for commas 2011-03-30 21:53:14 +13:00
Chris Cormack a3e59f3bf2 Bug 5917 : FIxing problem with comma in variable names 2011-03-30 21:53:13 +13:00
Magnus Enger edf8ad5d5d Bug 3644 Add support for NORMARC
- XSLT for the OPAC
- Value_builders for lesder, 007 and 008
- Default NORMARC framework
- Reverse MARC logic of some subs, so MARC21 is default (and works for NORMARC)
- Add NORMARC as an option to the syspref marcflavour
- Add record.abs for NORMARC
- Add NORMARC and nb as options to Makefile.PL
- Add etc/zebradb/lang_defs/nb/sort-string-utf.chr
- Copy MARC21slim2OAIDC.xsl to NORMARCslim2OAIDC.xsl

Some things are still missing, e.g.:

- XSLT for Intranet
- More MARC21slim2*.xsl transformations
2011-03-30 10:13:37 +02:00
Chris Cormack d247caf585 Bug 5917 updating templates 2011-03-30 20:55:45 +13:00
Magnus Enger 759499d6e8 Another wrong encoding in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:26 +02:00
Magnus Enger d5608708c1 Fix wrong encodings in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:26 +02:00
Magnus Enger a299f54a9f A couple of missing translations in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:26 +02:00
Magnus Enger 93d968cb30 Fix typo in installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:26 +02:00
Magnus Enger 4a5f1ec49a Add files to installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:26 +02:00
Magnus Enger 1564cd0d00 Translate OPACSearchForTitleIn in installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:25 +02:00
Magnus Enger e69c01faf6 Add files in installer/data/mysql/nb-NO/1-Obligatorisk/
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:25 +02:00
Magnus Enger 7af2727127 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>
2011-03-30 09:55:25 +02:00
Magnus Enger f086d7e1bf Add sample Z39.50 servers
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
2011-03-30 09:55:24 +02:00
Chris Cormack 8e00f55216 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
2011-03-30 20:53:45 +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
Owen Leonard 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
Owen Leonard 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