Commit graph

13981 commits

Author SHA1 Message Date
Chris Cormack
bacd210c73 Bug 5917 : Updating dependencies 2011-04-10 21:50:35 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Chris Cormack
d4cd05126d Bug 5917 / Bug 6085 : Fixing not being able to change language 2011-04-10 20:22:55 +12:00
Chris Cormack
f91441f5f5 Bug 5917 : Catching pref,css and js changes 2011-04-10 20:05:41 +12:00
Chris Cormack
ec16c3a092 Bug 5917 : Updating templates 2011-04-10 20:00:27 +12:00
Chris Cormack
77167b3b17 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-10 20:00:04 +12:00
Chris Cormack
8843e29a9d Bumping database version 2011-04-10 19:54:39 +12:00
Chris Cormack
0d991c6abe Merge remote branch 'kc/new/enh/bug_6013' into kcmaster 2011-04-10 19:47:16 +12:00
Nicolas Morin
93d8a890c0 Bug 6013 : removed z3950 host in label when cataloguing
removed the full host in the label of the z3950
targets: it made for very very long labels, which
were unecessary since we allow librarians to
provide a user friendly name for the host.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:46:27 +12:00
Chris Cormack
fb10394d99 Fixing updatedatabase 2011-04-10 19:41:39 +12:00
Chris Cormack
79610c7421 Bug 5984 : Follow up : Catching the rest of the languages sysprefs
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:38:01 +12:00
Matthias Meusburger
cba9b427a4 Bug 5984 : Follow up Adding OpacHiddenItems syspref
- Adds the syspref in opac.pref

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:36:20 +12:00
Paul POULAIN
e1ab8bc53e Bug 5984 : Follow up Adding OpacHiddenItems syspref
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:36:04 +12:00
Chris Cormack
f078103e33 Bug 5984 : Allowing the librarians to hide items in the Opac using a system preference
Squashed commit of the following:

commit 72b578928b287ba3b5fa8965e42ff1ccbdf9013a
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Oct 20 11:26:46 2010 +0200

    Bug 5984 : MT4587, Follow-up: Hiding rules are now in a syspref

commit d95329955f976900afdafa82fe0a1699e8e892dc
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Tue Oct 19 15:19:16 2010 +0200

    Bug 5984 : MT4587, Follow-up: Adds yaml config file for custom opac items hiding

commit 6777c1a97700b77095e4e499ca73040bf94271e2
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Mon Oct 18 11:14:03 2010 +0200

    Bug 5984 : MT4587 : Adds yaml config file for custom opac items hiding

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:32:06 +12:00
b8d3cfa91b Bug 5546: Follow-up / fixes
Suggested by Owen.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:27:51 +12:00
726a00fd7e Bug 5546 Javascript driven ability to hide MARC documentation links
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:27:49 +12:00
Henri-Damien LAURENT
8902dadf06 Bug 5980 : Adding location to search indexes
Adding location to search indexes in search pages

Original patch amended to change Location to Shelving Location.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:51:27 +12:00
Paul Poulain
7e1077b51b Bug 5961: Filling a basket from the reservoir
creating a form order to import all records from a staged file at once.
All lines of the choosen staged file will be created with the same budget
and item (if applicable depending on AcqCreateItem syspref)

BibLibre bug #4007

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

Bug 5961: follow-up : use matchingrules selected in manage-stage-import instead of FindDuplicate

Now, bulk importing the iso2709 result in adding biblio or connecting to an existing one

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

BZ5961: follow-up, save currency

Cait noticed that currency was not saved properly in the aqorders table.

note a surprise, as the 3.2 had no currency feature and 5961 had been written against 3.2
anyway, this patch fixes the problem

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:45:50 +12:00
Chris Cormack
7e7c6bcb34 Bumping database version 2011-04-09 21:30:45 +12:00
fdurand
3b7a22aa09 Bug 5728: Adding kohaversion and fix syntax error in updatedatabase.pl
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:26:11 +12:00
Stéphane Delaune
1fafaafc9a Bug 5728: adding note and manager_id fields to accountlines
Biblibre bug #1874

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:25:18 +12:00
Chris Cormack
e6ec28d062 Fixing a typo in systempreferences 2011-04-09 21:04:50 +12:00
Henri-Damien LAURENT
0c8c7a8db6 Bug 5637 : MT3044 : Fix CSV export when rer are blank characters
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:35:21 +12:00
Henri-Damien LAURENT
40b49900c3 Bug 5631 : (MT #2993) add EAN, PUC and Music-Number indexes
This fix add different "music" identifier to zebra indexes, for example it permit search through CDs via EAN.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:32:04 +12:00
db6ab6a6fd Fix for bug 5498, Standardize markup and style of pagination menus
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:25:36 +12:00
Magnus Enger
004d2a10c5 Bug 5671 Revised Patch #2 - Add a column of custom HTML to my summary
Fix JS error in /koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:23:09 +12:00
Chris Cormack
c1181b780b Merge remote branch 'kc/new/pending_qa/enh/bug_3644' into kcmaster 2011-04-09 19:16:45 +12:00
Chris Cormack
c218254018 Updating database number 2011-04-09 12:06:32 +12:00
Katrin Fischer
ac2da44b69 Bug 5431: Separate state field for library addresses
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 12:01:48 +12:00
Chris Cormack
4f170b7b56 Bumping database version 2011-04-09 11:56:17 +12:00
Katrin Fischer
3224b92743 Bug 5422: Add missing fields to deletedborrowers and change datatype to text
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
b0f74b68bd Bug 5422: Small layout correction to borrower search result list
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
f81726249b Adding state to output of patron search results screen
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
07ec1afa97 Bug 5422: Add missing fields to deletedborrowers and change datatype to text
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
e82f88d5d9 Additional fixes for Bug 5422, Separate state field for patron's adresses
Adding state variable to various circ and member pages so that
sidebar display of patron details includes state.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
21727e00f5 Bug 5422: Separate state field for patron's addresses
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
0ff09dc649 Bug 5422: Separate state field for patron's addresses - database update
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:49:27 +12:00
298919981c Bug 4394 Adding preference definition change to opac.pref
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:43:10 +12:00
Jane Wagner
ac4e83161c Bug 4394 REVISED Allow opaccolorstylesheet syspref to use an external URL
Previous code would only allow for an auxiliary stylesheet on the same server.  This checks for
http in the opaccolorstylesheet syspref.  If it's found, sets a different variable pointing to the
remote server location.  If not found, retains the previous css directory path.

Also modifies the description of opaccolorstylesheet in the installer files to reflect current
usage as an auxiliary stylesheet.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:43:09 +12:00
Chris Cormack
ef8171ba42 Merge remote branch 'kc/new/enh/bug_4449' into kcmaster 2011-04-09 11:40:47 +12:00
Ian Walls
00e019bfd7 Fix for Bug 4449: AllowHoldPolicyOverride cannot over all policies
AllowHoldPolicyOverride should be able to override AllowOnShelfHolds, as well as other possible reasons for blocking a hold. Before, this only
allowed override of branch policies set in Circ Rules.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:39:50 +12:00
Alex Arnaud
4468aea43c Bug #6119 - Add biblioitems.itemtype in columns for items.content
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:27:52 +12:00
Alex Arnaud
7cc7fb8c99 bug #6054 - Add a filter by active budget on acqui-home
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:24:08 +12:00
Alex Arnaud
4268fd376f Bug #6049 - Add a filter by date in overdue.pl
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:18:44 +12:00
Sophie Meynieux
ac9e9cf809 bug #6053 Improvement of letter HOLD_PRINT
Modify title template for letter HOLD_PRINT in installer sample data

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:02:00 +12:00
Paul Poulain
5b16634c0c BZ6087: remove duplicate budget link
this feature doesn't exist yet, so the link is useless

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:56:21 +12:00
b29e6e8609 Fix for Bug 5950 - changing frameworks doesn't change anymore
Selecting a framework from the dropdown menu has never (AFAICT)
auto-submitted the form to change the framework. This patch
reformats the form in order to make it clearer that this menu
 is part of the search function.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:50:38 +12:00
Stéphane Delaune
bda0be46b2 Bug 6108 - Quicksearch in member.pl does not display paging correctly
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:47:22 +12:00
Alex Arnaud
18b89e9a67 Bug #6052 - BranchTransfer Limit :Adds a default value
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:41:14 +12:00
Alex Arnaud
7c08d7c81e Bug #6130 - Letters: Fixing Subject encoding
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:35:15 +12:00