Commit graph

13637 commits

Author SHA1 Message Date
Chris Cormack
f76b9fb42e Merge remote branch 'kc/new/bug_5957' into kcmaster 2011-04-07 16:07:58 +12:00
Jared Camins-Esakov
07f16fc52e Bug 5957 follow-up: use comparison operator in if
The patch for bug 5957 used an assignment operator instead of a comparison
operator. Replace the assignment operator with the string comparison that was
desired.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:05:53 +12:00
Chris Cormack
c649ed9257 Removing conflict markers 2011-04-07 15:55:33 +12:00
Henri-Damien LAURENT
700de9664d (Bug 4049) Searching itemtypes returning noise
Fix the problem of searching on partial itemtypes strings
for instance, itemtype="ARTICLE DE PERIODIQUE", itemtype="PERIODIQUE"
searching on itemtype="PERIODIQUE" would also get "ARTICLE DE PERIODIQUE"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:54:00 +12:00
Chris Nighswonger
8ca5d5ff85 Bug 5213 - Suffix number sequence not resetting properly in hmyymmincr barcode autogen pattern
Two things are happening.

First, the SELECT does not account for a branchcode greater than 2 chars.

This is fixed by just selecting the final four digits representing the
incremental suffix from the barcode field.

Second, the incremental suffix (4 digits) is not rolling back over to zero when
reaching 9999.

This pattern probably needs help. It should allow for cataloging of 10000 items
per month as is. I would not recommend doing barcode numbering this way, but
need to support it since it is in use in at least one library.

This patch also impliments strict and warnings per Bug 2505

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:42:40 +12:00
Paul Poulain
d58092dd96 Bug 6077: qty not incremented for AcqCreateItem=recieve
When you want to create items on order recieve, the qty was not incremented
when the librarian adds an item with the +

This was because the js was expecting the qty field to be id=quantity

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:35:01 +12:00
Alex Arnaud
0f6270d310 Bug 5946 : (MT1177) aqplan.pl, fix the problem of calculating the total remaining.
Bug 5946 followup : (MT1236) aqplan.pl - Fixe the problem of unrounded sums

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:30:41 +12:00
9bb36148fd Fix for Bug 5156, JavaScript error when adding list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:26:20 +12:00
Matthias Meusburger
3a8be8d8e0 Bug 6028 : MT3815: Quickfix for CSV export (9999 rows limitation)
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:12:48 +12:00
Koustubha Kale
332e701c25 This patch fixes the broken pagination in members-search.pl
Small patch to fix Error 404 which comes up when we click on pagination links after searching in Patron Card creator.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 14:25:20 +12:00
Jared Camins-Esakov
8b582d863d Bug 6100: request.pl should check maxreserves exists
Adds a check to confirm that the maxreserves syspref actually has a value before
using it. Also fixes an off-by-one error in the maxreserves calculation that
would allow librarians to place maxreserves + 1 holds for patrons.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 14:00:11 +12:00
Robin Sheat
0645f83c22 Bug 6032: Increase zebra biblio register stores
This keeps the package versions of the zebra configuration in sync with
the makefile-installed ones.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 13:27:36 +12:00
Jared Camins-Esakov
2b71959a88 Bug 6032: Give biblio register and shadow sane default max sizes
The out-of-the-box maximum size for the biblio register and shadow stores is
4GB, which is much too small for even medium sized libraries. This makes the
default maximum 20GB, which should be enough for even most large libraries.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 13:27:34 +12:00
cecdc19369 Bug 4374 Improve biblio data entry form regarding hidden/mandatory fields
Biblio framework has 3 entry points controlling if input box are
displayed by default in data entry form:

  - 'mandatory' flag at field level
  - 'mandatory' flag at subfield level
  - 'hidden' flag at subfield level

It doesn't work as it should (?):

  - All subfields are expanded (shown) if their field is mandatory
  - A subfield containing anything is always expanded whatever it contains
  - A mandatory subfield is always expanded
  - An hidden subfield isn't expanded.

Default framework having 0 in all marc_subfield_structure.hidden, by default
all subfields will be expanded.

TO BE INTEGRATED IN RELEASE NOTES:

  Koha sysadmin should have to edit its frameworks to add hidden=1 in
  appropriate subfields.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 13:20:09 +12:00
Chris Cormack
13ad14a754 Bug 6014 : Removing a leftover warn 2011-04-07 13:16:26 +12:00
Henri-Damien LAURENT
99b49e2b1a 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>
2011-04-07 13:14:17 +12:00
Chris Cormack
b00c36989f Merge remote branch 'kc/new/bug_4276' into kcmaster 2011-04-07 10:41:37 +12:00
Jared Camins-Esakov
0f39c4fcc3 Bug 4276 follow-up: quote strings with curly braces
Previous fix used the wrong characters for quoting. I should have used curly
braces instead of double quotes. Some searches using double quotes will fail
(the problem seems to be punctuation, although there may be other circumstances
where double quotes fail as well).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 10:37:53 +12:00
0f7411ceee 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>
2011-04-06 20:21:07 +12:00
Jared Camins-Esakov
a6f28246ae Bug 5868: Subject indexes do not search 6xx fields
Prior to this change, the named Zebra Subject phrase index did not include the
600, 610, 611, 630, 654, 655, 656, and 657 fields. This could be seen in
searches such as: "su:Bible and su:N.T. and su:Matthew and su:Textbooks", which
should return a result with the following field:
=630  00$aBible.$pN.T.$pMatthew$vTextbooks.
This did not formerly work.

This patch modifies etc/zebradb/marc_defs/marc21/biblios/records.abs. This file
must be installed and biblios reindexed in Zebra for the changes made here to
affect records already in the catalog.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 20:03:05 +12:00
Chris Cormack
31c519006e Merge remote branch 'kc/new/bug_5555' into kcmaster 2011-04-06 19:49:55 +12:00
Janusz Kaczmarek
ab7435f964 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>
2011-04-06 19:49:18 +12:00
Henri-Damien LAURENT
c19d505abb 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>
2011-04-06 19:35:18 +12:00
Nicole Engard
fcbcdcf4ce 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>
2011-04-06 19:31:46 +12:00
fdurand
ecbeafff07 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>
2011-04-06 19:29:29 +12:00
fdurand
0c21ab2622 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>
2011-04-06 19:29:27 +12:00
Chris Cormack
f9658db163 Merge remote branch 'kc/new/bug_6009' into kcmaster 2011-04-06 19:28:54 +12:00
Frédérick Capovilla
0f4edffc16 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>
2011-04-06 17:18:21 +12:00
Alex Arnaud
99f49c1108 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>
2011-04-06 17:05:23 +12:00
Chris Cormack
58013b6c2a 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>
2011-04-06 17:04:19 +12:00
Chris Cormack
99160747f4 Merge remote branch 'kc/new/bug_6065' into kcmaster 2011-04-06 16:16:30 +12:00
Sophie Meynieux
96f054e90d 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>
2011-04-06 16:15:49 +12:00
Paul Poulain
2a28b30a3c 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>
2011-04-06 16:13:07 +12:00
Chris Cormack
5bdfefc7e1 Merge remote branch 'kc/new/bug_6058' into kcmaster 2011-04-06 15:35:28 +12:00
Chris Cormack
827c575b18 Merge remote branch 'kc/new/bug_6056' into kcmaster 2011-04-06 15:35:25 +12:00
Chris Cormack
3291784a88 Merge remote branch 'kc/new/bug_5942' into kcmaster 2011-04-06 15:35:16 +12:00
Chris Cormack
e9db636e63 Merge remote branch 'kc/new/bug_5914' into kcmaster 2011-04-06 15:35:11 +12:00
Chris Cormack
b1daec9fa3 Merge remote branch 'kc/new/bug_5651' into kcmaster 2011-04-06 15:34:56 +12:00
Jared Camins-Esakov
ad206a73f8 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>
2011-04-06 15:33:58 +12:00
Stéphane Delaune
132743f66b 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>
2011-04-06 15:32:15 +12:00
Chris Cormack
706a881b7f Bug 5914 : BuildUnimarchierarchies can go into an infinite loop Squashed commit of the following:
commit 58e18dfa4109fcdde3c71675ff07ed6aae86b258
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue May 18 16:54:49 2010 +0200

    Bug 5914 : followup BuildUnimarchierarchies fixing infinite loop

commit bbbcb7fcb0ff36eb8a072d9b0442996e71ebb247
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue May 18 13:11:44 2010 +0200

    Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop

    When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop

    Conflicts solved: C4/AuthoritiesMarc.pm

commit 3581021997bc8965af807738c47d5fd27f2fd97f
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Apr 7 15:15:59 2010 +0200

    Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop

    When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 15:29:38 +12:00
Katrin Fischer
9cab9be3d6 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>
2011-04-06 15:26:44 +12:00
Paul Poulain
ce71043216 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>
2011-04-06 15:26:12 +12:00
Alex Arnaud
e43da19e34 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>
2011-04-06 15:22:40 +12:00
Chris Cormack
66de13af9a Updating database version number 2011-04-05 19:56:12 +12:00
Chris Cormack
ff4645523b Updating history 2011-04-05 19:28:09 +12:00
Katrin Fischer
10b9e3186f Bug 5970: Follow-up, freedeliveryplace was missing in kohastructure
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 15:10:21 +12:00
Matthias Meusburger
a1a8945c2f Bug 5970: Adds the ability to use a free delivery address for basket
When editing a basket group, user can choose a library for delivery
place, or enter address of his choice in a text field.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will send a follow-up for missing change in kohastructure.sql
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 15:10:17 +12:00
f1869ec064 Fix for Bug 5593, Change cart markup to allow for easier icon styling
Replacing inline cart image with a span with a unique ID. Adding
styling to the deafult CSS to give that span a background of the
same cart image as before. Custom CSS can override this with a
different image.

Example for OPACUserCSS preference:

  background-image : url("/opac-tmpl/prog/famfamfam/silk/basket.png");
  width:16px;
  height:16px;
}

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

    background-image: url("/opac-tmpl/prog/famfamfam/silk/basket.png");
}

Will also change the cart image in opac detail view.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 15:04:07 +12:00
Chris Cormack
ef9c269d7a Incrementing database version 2011-04-05 14:57:13 +12:00