]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 6014 : Removing a leftover warn
Chris Cormack [Thu, 7 Apr 2011 01:16:26 +0000 (13:16 +1200)]
Bug 6014 : Removing a leftover warn
(cherry picked from commit 13ad14a7540dab8b27a21fb6cb00a6edc875040d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6014 : MT3138 Adding some permission management to viewlog
Henri-Damien LAURENT [Wed, 6 Apr 2011 15:28:45 +0000 (17:28 +0200)]
Bug 6014 : MT3138 Adding some permission management to viewlog

If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.

C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated

circ-menu.inc:
Fixing information passed to the viewlog from circ-menu

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 99b49e2b1aa2e5d2629f1167e2b63c3b3158ffe8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4837 make circ print page show item type description
Nicole Engard [Tue, 5 Apr 2011 13:30:07 +0000 (15:30 +0200)]
bug 4837 make circ print page show item type description

Signed-off-by: Guillaume Hatt <guillaume.hatt@€nc.sorbonne.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fcbcdcf4cebdb32544a545d8ef91de1bbe67f457)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4196 -Followup : Defintion of popularity index into Unimarc setup
fdurand [Tue, 5 Apr 2011 15:07:31 +0000 (17:07 +0200)]
Bug 4196 -Followup : Defintion of popularity index into Unimarc setup

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ecbeafff07fa32918d552bbf4ba9cd8410207633)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl
Alex Arnaud [Tue, 5 Apr 2011 07:54:11 +0000 (09:54 +0200)]
Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 99f49c1108dad5ef7548929b23d4a3815ae1a166)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6065: confirmation when deleting an order
Paul Poulain [Tue, 5 Apr 2011 12:54:48 +0000 (14:54 +0200)]
BZ6065: confirmation when deleting an order

when clicking on "delete order", there is no confirmation box, the order line is
deleted without any question !

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2a28b30a3c5a02475d59d4beab9c3b67cfc666e3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5942, sql for UNIMARC Authorities
Stéphane Delaune [Mon, 4 Apr 2011 13:22:37 +0000 (15:22 +0200)]
Bug 5942, sql for UNIMARC Authorities

(MT #4339) init default UNIMARC sql structure

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 132743f66bc07f6b8799835aac6cf440430bd44e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6056: Notes were not shown when modifying order line
Katrin Fischer [Tue, 5 Apr 2011 11:42:57 +0000 (13:42 +0200)]
Bug 6056: Notes were not shown when modifying order line

To test:
- add a new order in acquisitions with some content in the notes field
- save order
- modify order - Notes field will be shown as empty

The template variable for notes is missing from the template.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9cab9be3d6114898e0b8354d784fb8d56ad51fbc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5949 : Popup alert when deleting items from basket, also change planning value...
Christophe Croullebois [Mon, 4 Apr 2011 10:29:36 +0000 (12:29 +0200)]
Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics

(MT #2391) : acqui/neworderempty.pl

Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f323c00a14673ae83ae24b2502aa172d7949781)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5947 Suggestions : add date to the search query
Alex Arnaud [Mon, 4 Apr 2011 15:17:35 +0000 (17:17 +0200)]
Bug 5947 Suggestions : add date to the search query

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes searching by dates, like 'Suggested on:'
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3603ae6274da149370fd38ce642848738b11fcdc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3628: opacSerialDefaultTab
Marcel de Rooy [Mon, 4 Apr 2011 10:04:30 +0000 (12:04 +0200)]
Bug 3628: opacSerialDefaultTab

This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0dba0e0d3c687ffa0c8ba64ddf5c5f217c68aa0a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.07.001
Chris Nighswonger [Sat, 16 Apr 2011 15:52:21 +0000 (11:52 -0400)]
Updating Version Number to 3.02.07.001

13 years agoBug 5860: Adding duplicate stocknumber fails silently
Katrin Fischer [Mon, 4 Apr 2011 11:20:20 +0000 (11:20 +0000)]
Bug 5860: Adding duplicate stocknumber fails silently

When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8ffb2273b63c398492a7cbd08394adedb2aeadb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding a javascript function to check the validation of a record with a budget.
koha-preprod [Mon, 7 Feb 2011 16:12:49 +0000 (11:12 -0500)]
Adding a javascript function to check the validation of a record with a budget.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9dc69cf47fb374b64dcc2ee3716cffa3b15cfb7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5948 : Creation of a quantity column in receipt summary
Christophe Croullebois [Mon, 4 Apr 2011 09:21:18 +0000 (11:21 +0200)]
Bug 5948 : Creation of a quantity column in receipt summary

In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b9d434c18f3ff5a4d168cf24454d51ede1523fde)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit dc37fe9730f00d8dcc1c97029da816f66a0f9a02)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 21993ab00a853d2cf7afb314bd2b6bacb0439ecc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 90392c19cc343ada611c1f06e4b5c20f3dd6dc93)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 5d707b5e9b7f18351d9b996f5f73a1ae53066080)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 731b933d51367489422b90fa7021cfc42c747584)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 641616ef7fd43600864d46f39b938ef3cd8cd4f3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3644 Add support for NORMARC
Magnus Enger [Fri, 5 Mar 2010 10:58:14 +0000 (11:58 +0100)]
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
(cherry picked from commit edf8ad5d5da9c11e0dc61c1df40ce977e9e6a125)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 759499d6e829fad122c7a98668603598e9cea768)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit d5608708c179b5377794129f76fb0e6e6115448f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit a299f54a9f4dce47530f90176a96bc6abaeb0cd8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 93d968cb30d26dbc3aa2933eb49f74f25611b2d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 4a5f1ec49a081319fdc1f00311900119df90eeae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 1564cd0d004aef5b0494fd4eb9a4b4ebc78fa082)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit e69c01faf6da651fb9ea0eded69a6679e71876df)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 7af27271272d11872ced646f2a1f72616095b56d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit f086d7e1bf402c4a9fe341421a566abb444fe7f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 88cb47339a8eab4ff4b95956207bf2d1dcdffeff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 268f860e24171f3c5fe5f4b2c4a752e7c5abd5c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 735d986a0c976a888948ddd912917ad091267b7e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 84e43e06155e107e3965f06ea5ba37cc5d1b7d30)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 51604b548756fbf74620061a779d0182167c36f3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 813f5c3f5164707041fcaa90839f4368355eb8e9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.07.000 v3.02.07
Chris Nighswonger [Sat, 16 Apr 2011 03:52:48 +0000 (23:52 -0400)]
Updating Version Number to 3.02.07.000

13 years agoRelease Notes for 3.02.07.000
Chris Nighswonger [Sat, 16 Apr 2011 03:51:20 +0000 (23:51 -0400)]
Release Notes for 3.02.07.000

13 years agoTranslations update for 3.2.7
Frédéric Demians [Fri, 15 Apr 2011 15:51:33 +0000 (17:51 +0200)]
Translations update for 3.2.7
(cherry picked from commit 742c92c778140fcd00edefb648db79d7ca53c229)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoPartial fix for Bug 4870, Damaged status does not prevent items from being selected...
Owen Leonard [Wed, 6 Apr 2011 07:51:45 +0000 (09:51 +0200)]
Partial fix for Bug 4870, Damaged status does not prevent items from being selected for reserves

This patch changes the holds queue build process in order to
require that items not be damaged in order to appear in the
holds queue report.

Revision adds a check for the AllowHoldsOnDamagedItems preference to
determine whether a damaged item should be included in the holds
queue report.

Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f7411ceee5887751fb34ad2c72c83216d55f0c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug5555 Corrected search for ISBN / ISSN
Janusz Kaczmarek [Wed, 6 Apr 2011 07:36:22 +0000 (09:36 +0200)]
Bug5555 Corrected search for ISBN / ISSN

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ab7435f964336a18f760b9dd91d4b4506528a051)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5924 : C4::AuthoritiesMarc.pm search enhancement
Henri-Damien LAURENT [Tue, 5 Apr 2011 12:18:16 +0000 (14:18 +0200)]
Bug 5924 : C4::AuthoritiesMarc.pm search enhancement

Heading Main is defined in unimarc record.abs
re enabling that feature

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c19d505abb1b492cc21e6f5b78fb4de91da44419)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4196 - Defintion of popularity index into Unimarc setup
fdurand [Tue, 5 Apr 2011 15:07:30 +0000 (17:07 +0200)]
Bug 4196 - Defintion of popularity index into Unimarc setup

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0c21ab2622d2d9b131c24c2002ed6e65875a6b24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5410 : Adds "do-not-truncate" in the search queries of Heading.pm
Frédérick Capovilla [Tue, 5 Apr 2011 08:08:12 +0000 (10:08 +0200)]
Bug 5410 : Adds "do-not-truncate" in the search queries of Heading.pm

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f4edffc16adacb439601f9051bacd89869018f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6040 : Adding some error handling to the opac export
Chris Cormack [Tue, 5 Apr 2011 09:32:41 +0000 (11:32 +0200)]
Bug 6040 : Adding some error handling to the opac export

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 58013b6c2ad01b87c778ec56bf02dd58e826200e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6047: Remove check on subfield 3 that prevents biblios from BNF to create corresp...
Sophie Meynieux [Tue, 5 Apr 2011 12:44:07 +0000 (14:44 +0200)]
Bug 6047: Remove check on subfield 3 that prevents biblios from BNF to create corresponding authorities

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96f054e90d4a582b13f1f6d2922b4ae99999a23d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5651: Question marks break searches w/ICU
Jared Camins-Esakov [Tue, 5 Apr 2011 13:48:03 +0000 (15:48 +0200)]
Bug 5651: Question marks break searches w/ICU

When a user is doing a simple keyword search, they should not be expected to
deal with the magical behavior of question marks in Zebra. This fix escapes
question marks, and reduces the number of false positives for identifying a
"simple keyword search."

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ad206a73f867f6a184f64d41e4ccfa8e5bb0cd21)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6058: uncertain price can't be unchecked
Paul Poulain [Tue, 5 Apr 2011 12:05:57 +0000 (14:05 +0200)]
BZ6058: uncertain price can't be unchecked

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ce71043216f843ad1b1d2fb254db4dd2635e1066)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug #6044 - Authority is deleted when mergeto and mergefrom are the same
Alex Arnaud [Tue, 5 Apr 2011 12:11:00 +0000 (14:11 +0200)]
Bug #6044 - Authority is deleted when mergeto and mergefrom are the same

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e43da19e34745d734ab6ee5cb5540e4d6e92adf3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating history
Chris Cormack [Tue, 5 Apr 2011 07:27:15 +0000 (19:27 +1200)]
Updating history
(cherry picked from commit ff4645523b7e273438a4211ed4735f59084f5baf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui...
Christophe Croullebois [Mon, 4 Apr 2011 12:28:19 +0000 (14:28 +0200)]
Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl

In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Add a new fund, leave library empty, owned by yourself
2) Go into the database and change aqbudgets.budget_branchcode to be NULL
3) Check acq home. Before patch the fund will not show up, although it's owned by you.
After patch it will.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5910b59d1d4bdbe6fb6152453536bfe64d490c01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoCorrects an error when showing a suggestion linked to a deleted budget.
Frédérick Capovilla [Wed, 30 Mar 2011 16:12:19 +0000 (12:12 -0400)]
Corrects an error when showing a suggestion linked to a deleted budget.

If a suggestion is associated to a budget that was deleted, an error was
returned because we try to get the name of a budget that doesn't exist.
With this fix, the page is shown without errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a43ba114d0fee9a478def455b926121442a0814)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6046: suggestedby list on she filter was not created properly
Paul Poulain [Mon, 4 Apr 2011 13:53:19 +0000 (15:53 +0200)]
Bug 6046: suggestedby list on she filter was not created properly

The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ff8ad64c2797d73464ef9009acba8744922fc61f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6043: SQL error when IndependantBranches=ON on suggestion
Paul Poulain [Mon, 4 Apr 2011 13:19:32 +0000 (15:19 +0200)]
Bug 6043: SQL error when IndependantBranches=ON on suggestion

On suggestion page, when IndependantBranch=ON, the SQL built is wrong:
branchcode is ambiguous

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 09e2ee605845e9cb03f21f2596404d60d1e9fc74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6045: Accepted by is empty when accepting from list
Paul Poulain [Mon, 4 Apr 2011 14:28:44 +0000 (16:28 +0200)]
Bug 6045: Accepted by is empty when accepting from list

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a56e1e1729fbbc1b341bbad7c2fcf94d4642806f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.06.001
Chris Nighswonger [Mon, 11 Apr 2011 19:33:08 +0000 (15:33 -0400)]
Updating Version Number to 3.02.06.001

13 years agoBug 5860: Adding duplicate stocknumber fails silently
Katrin Fischer [Mon, 4 Apr 2011 11:20:20 +0000 (11:20 +0000)]
Bug 5860: Adding duplicate stocknumber fails silently

When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8ffb2273b63c398492a7cbd08394adedb2aeadb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5989 - Funds filter does not remember library choice
Owen Leonard [Mon, 4 Apr 2011 10:25:55 +0000 (12:25 +0200)]
Fix for Bug 5989 - Funds filter does not remember library choice

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f22b8bcd458df8d8fad29070a7b95a63b6d356a2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 63f1ea0c2dcd442ce0cb3b29d40f5015dceb5bab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 624ebb6e03bbf0f4c9f99298c0faed14bf4ed29b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit f7d9ebbff3ab9b620b0c0b80b3dc28c51753ec13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 480ca80dd0b38022b106a7b1339bc7c56ca272f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit ff7affdf43b4850a0ce62c9924246caac69b9030)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit fd1b757233a6db66a82bbc3ff4d2f40291b96832)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 0a64cfba5e10be80a220f6c8164905788ba5a78b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 8548b804f49a5e84a64b7caf2457daf1a83f834b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 091d3100169a12e9498f6d58c8b61ac01a5a5db6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 412966eff0016c69e5763197f1542e88c74580a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit b5a050d759b08027b210106e90d5714eb02b9032)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit aef8358cf2ce8db9803d94c14f6728cdf9ebd0d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 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>
(cherry picked from commit 8958f152e7273d3b1fc45a6f7494ab6066aab55e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3326: Staff results still displayed &amp;
Jared Camins-Esakov [Sat, 26 Mar 2011 09:58:54 +0000 (05:58 -0400)]
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>
(cherry picked from commit fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5817: Follow-up fixing callnum: on staff results
Jared Camins-Esakov [Sat, 26 Mar 2011 15:03:31 +0000 (11:03 -0400)]
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>
(cherry picked from commit b853b79001ceefc897eac781a6ebf28e7cc29c85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens
Ian Walls [Sun, 27 Mar 2011 17:05:48 +0000 (13:05 -0400)]
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>
(cherry picked from commit 1d6f791541686dfa409843f8f5b1624f1be6e8cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5960 : Itemtype icons not showing correctly in staff search results
Chris Cormack [Mon, 28 Mar 2011 01:13:13 +0000 (21:13 -0400)]
Bug 5960 : Itemtype icons not showing correctly in staff search results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 42f316ae480100572e996a7a4de76b9528db3d23)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5940: Update Patron Help Files
Nicole C. Engard [Thu, 24 Mar 2011 20:27:03 +0000 (16:27 -0400)]
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>
(cherry picked from commit b8f3120bf5f5e7f2da73c213ed74bb003cf5da25)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3098 follow-up: Clean up formatting
Jared Camins-Esakov [Sun, 22 May 2011 21:31:47 +0000 (17:31 -0400)]
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>
(cherry picked from commit 009036b53722881f607ed01b5701bd300abd6735)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5883 : Prevent re-encoding the items if they are already in UTF-8 in ModBiblio.
Frédérick Capovilla [Wed, 23 Mar 2011 14:19:57 +0000 (15:19 +0100)]
Bug 5883 : Prevent re-encoding the items if they are already in UTF-8 in ModBiblio.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cce98a2914c85ce1e1c5563b64a986c880024079)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5902: additem.pl should default to set library
Jared Camins-Esakov [Fri, 18 Mar 2011 00:48:33 +0000 (20:48 -0400)]
Bug 5902: additem.pl should default to set library

This patch makes the additem screen default to selecting the currently set
library. If the library is unset, it will default to the first branch
alphabetically.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d8e239c23e23eb34eb2552cc036b364c869ceec2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5909 : SetUTF8Flag on any incoming data
Henri-Damien LAURENT [Tue, 22 Mar 2011 09:59:52 +0000 (10:59 +0100)]
Bug 5909 : SetUTF8Flag on any incoming data

This prompts NFC normalization on adding record
Therefore, any saved record will be NFC normalized

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b4512d5c40b552a45fced0f48635af355d55efa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5907 : MT 2538 : Using default authtypecode for authority display
Matthias Meusburger [Tue, 22 Mar 2011 09:13:12 +0000 (10:13 +0100)]
Bug 5907 : MT 2538 : Using default authtypecode for authority display

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2498992447ba36f4af2aea5df2c2b2130cbe95f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5889: Messages name in english for notifications on public interface.
Sophie Meynieux [Wed, 23 Mar 2011 11:05:27 +0000 (12:05 +0100)]
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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5390: OPAC loses library selection
Jared Camins-Esakov [Mon, 21 Mar 2011 21:36:20 +0000 (16:36 -0500)]
Bug 5390: OPAC loses library selection

This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.

To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.

This patch also fixes bug 5852 and bug 3778.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a1f05a5a2cbe0bb5665c824c0cbcf1a0851a6fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5834: Holds link missing when 942$c is not for loan
Katrin Fischer [Sat, 19 Mar 2011 21:14:33 +0000 (17:14 -0400)]
Bug 5834: Holds link missing when 942$c is not for loan

Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.

To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter

After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan

Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1654e1aa148303fde0d30360f533be26b3029d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4878 - Command-line tool for getting and setting sysprefs
Jesse Weaver [Fri, 18 Mar 2011 15:10:19 +0000 (16:10 +0100)]
Bug 4878 - Command-line tool for getting and setting sysprefs

New script misc/admin/koha-preferences - Allows getting and setting of
sysprefs one-at-a-time or in bulk. More info:

misc/admin/koha-preferences help

or:

misc/admin/koha-preferences manual

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba6b2e148667d7fc1bd382d8f65c06e28768631)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding 2 more developers to the history 137 now!
Chris Cormack [Mon, 21 Mar 2011 03:42:49 +0000 (16:42 +1300)]
Adding 2 more developers to the history 137 now!
(cherry picked from commit c523ae2d646350996efa9cfc1e6149e1f1fac722)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
Salvador Zaragoza Rubio [Fri, 18 Mar 2011 15:07:04 +0000 (11:07 -0400)]
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>
(cherry picked from commit 0499633a6b27d44bf002bc4d99b82ee63237a001)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5892 : opac-user: minor spelling/html changes
Paul Poulain [Fri, 18 Mar 2011 14:30:05 +0000 (15:30 +0100)]
Bug 5892 : opac-user: minor spelling/html changes

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 01b6e7a6ddfbaaca59215f7a88d8aa1010053217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5864: link biblio => serials subscription is wrong
Julian Maurice [Fri, 18 Mar 2011 10:15:08 +0000 (10:15 +0000)]
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>
(cherry picked from commit 632277e453fa80797e1cfc9dc32f1d1d8cc089af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12...
Paul Poulain [Tue, 4 Jan 2011 20:28:10 +0000 (21:28 +0100)]
Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML
(cherry picked from commit 528cfd918c2f8f57a392302897977804c5f7e7c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML
Paul Poulain [Tue, 4 Jan 2011 20:26:38 +0000 (21:26 +0100)]
Bug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML
(cherry picked from commit 04869d0fd08c4bad9403f18365d3648ba1410452)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3735: Wrong search results for a few fields in ccl.properties
Marcel de Rooy [Thu, 17 Mar 2011 14:37:59 +0000 (10:37 -0400)]
Bug 3735: Wrong search results for a few fields in ccl.properties

This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 975aea1372de1def413ad02330916942e4160533)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5890 Correct Mismatched operator in comparison
Colin Campbell [Thu, 17 Mar 2011 10:34:52 +0000 (10:34 +0000)]
Bug 5890 Correct Mismatched operator in comparison

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f0a326da5bb347310e60103bd3486b22a495743)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Owen Leonard [Wed, 16 Mar 2011 15:40:41 +0000 (10:40 -0500)]
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>
(cherry picked from commit 4b1fe1c9c33a4ac0924c96fd1aacf076c4f2fa23)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5879 : Biblio.pm : fix isbd syspref and default location
Paul Poulain [Wed, 16 Mar 2011 11:06:37 +0000 (12:06 +0100)]
Bug 5879 : Biblio.pm : fix isbd syspref and default location

- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 620ae78f847ba3c42bcbfd0e0f9a530daa79e65b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5646: Translated sql files break messaging
Katrin Fischer [Tue, 15 Mar 2011 14:03:30 +0000 (15:03 +0100)]
Bug 5646: Translated sql files break messaging

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1411a929360d1ad667b2178b3d42b82996642bfc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5816: XSLT doesn't display enhanced contents
Jared Camins-Esakov [Tue, 15 Mar 2011 07:26:24 +0000 (03:26 -0400)]
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>
(cherry picked from commit de4619b849e4cc6f7bdc821bd52581876a02b7d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow up for Bug 3326: previous fix broke searches when
Jared Camins-Esakov [Wed, 16 Mar 2011 15:09:46 +0000 (15:09 +0000)]
Follow up for Bug 3326: previous fix broke searches when

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

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e18ddca9d4a6c741a918be28bb3e2cc3e2b30030)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3595 (partial): Items seen at checkin are not filling holds well
ruth@bywatersolutions.com [Fri, 4 Mar 2011 19:04:43 +0000 (13:04 -0600)]
Bug 3595 (partial): Items seen at checkin are not filling holds well

In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary.  If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*.  But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.

This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned.  One caveat:  If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned.  This is, however, an edge case!

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 784b9df4f240302d3946089862ca6bf6f33c08a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>