Commit Graph

17066 Commits

Author SHA1 Message Date
Chris Cormack bf2ba7a764 Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster 2011-09-10 21:40:09 +12:00
Ian Walls b49534ebdc Bug 6863: Shelf Browser images not showing up
Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:39:15 +12:00
Ian Walls 156a849aa3 Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.

This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:37:47 +12:00
Chris Cormack 13db3b62a0 Bumpding database version 2011-09-10 21:35:49 +12:00
Ian Walls ba2c61b1b6 Enh 6165: Add OPACResultsSidebar system preference
Adds a system preference for displaying content under the "Refine your Search" menu
on OPAC search results.  Arbitrary HTML can be added, like OpacNav, opacheader, opaccredits
and other such system preferences

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:32:47 +12:00
Robin Sheat 99056625b6 Bug 6687 - allow people to be moved in the holds queue
This fixes a regression introduced by Bug 6526 that told you someone
already had a reserve if you attempted to move their ordering in the
hold queue.

(note: it also cleans a host of trailing whitespace errors that were in
that file)

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-09-08 13:46:46 +12:00
Chris Cormack 073083ea5f Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster 2011-09-08 13:36:51 +12:00
Marcel de Rooy fb781f2dcd 6256 Follow up fixing typo
Fixing typo for 1062

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-08 13:35:56 +12:00
Frédéric Demians f64aaf063e Bug 6750 Guarantor search broken on translated templates
Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 20:59:26 +12:00
Ian Walls 5d8b1713da Bug 6256: Many bib1 attributes missing
This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped

In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally

Signed-off-by: <dev_patches@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 20:51:14 +12:00
Paul Poulain aa239bc430 Bug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc
There were some lines in the specific french sysprefs that were not french/unimarc specific at all
I've removed them, the file now only contains french & unimarc specific things

I also have removed NoZebra as it's deprecated, so should not be here anymore

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 09:20:28 +12:00
Magnus Enger 6bd38d3eab Bug 6537 - squashed version of the previous 5 commits, signed-off
Bug 6537 - Move installer/data/mysql/en/mandatory/sysprefs.sql to installer/data/mysql/sysprefs.sql

Bug 6537 - Make the web installer use installer/data/mysql/sysprefs.sql

Bug 6537 - New syspref files with only the prefs that differ from the default

I have mostly deleted old syspref files and created new ones, with a new name,
mainly in order to reduce the risk of merge conflicts if the old syspref files
are changed before this patch is pushed, if it is pushed.

See http://wiki.koha-community.org/wiki/Simplified_syspref_handling_RFC for
a description of how the new files were created to reflect sysprefs that
differ from the global default.

.txt files have been moved to reflect the new names of the SQL files they are
associated with.

Bug 6537 - Remove syspref-related tests in xt/

As far as I can see, the previous patches for this bug makes the syspref tests
obsolete, and this patch removes them:

xt/syspref.t
xt/check_sysprefs.t

Bug 6537 - Fix a problem in French syspref file

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 09:19:07 +12:00
Chris Cormack 34b553d03b Follow up for 6665 : Fixing the hide_marc pref also
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-09-07 09:06:03 +12:00
Chris Cormack 4363ff6669 Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
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-09-07 09:05:26 +12:00
Chris Cormack e23608a1f9 Bug 6555 : only 10 lists show in the staff client
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-09-07 09:00:38 +12:00
Colin Campbell 6c0962f06b Bug 5605 [ENH] SIP: Add Support for the Fee Paid Message
Allow fee paid to be supported for those machines which handle it

Development Sponsered by Halton Borough Council

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 08:56:15 +12:00
Chris Cormack e71b4faf78 Bug 6732 : Showing the bibliographic title on the manual invoices line
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-09-07 08:51:20 +12:00
Chris Cormack f09e840311 Updating about file and history doc 2011-09-07 08:49:31 +12:00
Brett Wilkins f824121bb1 bug 6724: enable decimals on values greater than 1
Separating perl standard uses from koha uses

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-07 08:39:18 +12:00
Chris Cormack 9e93266714 Updating history and about file 2011-09-04 20:49:09 +12:00
Robin Sheat 6534b5cf29 Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:22:18 +12:00
Magnus Enger 1c6cdaf162 Bug 4877 [ENH] - Update man page for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:21:34 +12:00
Magnus Enger 8d8d2e6b44 Bug 6516 - Make borrowernumber of staff user configurable in koha-create
Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.

Remember to update the wiki if this gets pushed!

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:18:14 +12:00
Robin Sheat a57b692a60 Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen
This allows the build information to not be suppressed when using
build-git-snapshot. This makes seeing where problems are substantially
easier.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:14:08 +12:00
Paul Poulain f6d3cb05dd Bug 6121: follow-up = using overloo instead of reserveloo
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:04:13 +12:00
Christophe Croullebois b2138a7ec6 Bug 6121: Holds awaiting pickup
On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:03:37 +12:00
Owen Leonard ca16532ea8 Fix for Bug 5028 - Remove references to catmaintain.pl
catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 20:46:25 +12:00
Owen Leonard 7146449ace Fix for Bug 6768, Two unused include files can be removed
Removing error-top.inc and error-bottom.inc

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 20:43:45 +12:00
Alex Arnaud ca1906f9c6 Bug 4966 - follow up - add xhtml closure for input tags
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 07:01:07 +12:00
Nicole C. Engard bb958cc613 bug4966 - follow up to 4966 changes language from 'end' to 'finish'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 07:00:46 +12:00
Alex Arnaud 955450dd1b bug 4966: Add a button in parcel.pl for confirm end receiving
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:59:49 +12:00
Katrin Fischer 6ba4419be0 Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
Patch fixes some translation issues and address formatting for printed
hold notices.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:50:05 +12:00
Katrin Fischer ba78d6a850 Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Translates the purchase suggestion mails in sample_notices.sql from English to German.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:49:49 +12:00
Henri-Damien LAURENT 1ce78a0c22 bug 6834 followup removing param_map
param_map was still to be found in two files.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:39:24 +12:00
Chris Cormack 0dbad3efce Bug 6834 : Removing last of the $template->{param_map}
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:37:50 +12:00
Chris Cormack afa94246d3 Merge branch 'new/bug_6479' into kcmaster 2011-09-03 06:35:17 +12:00
Frédérick Capovilla acc684bc01 Bug 6479 Converts all the serialseq variables to UTF-8.
Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:31:03 +12:00
Owen Leonard f9413ca2d2 Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Removing unused script.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:25:57 +12:00
Chris Cormack e8f654fcd2 Revert "Bug 5630 CAS improvements"
This reverts commit 9a3950f673.
2011-09-02 13:22:20 +12:00
Steven Callender a2a9bc5220 Bug 6822: fix RIS export from OPAC
Prior to this patch, RIS export was producing
effectively empty output.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 21:39:10 +12:00
Chris Cormack 6be9d2b27d Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster 2011-09-01 21:28:41 +12:00
Ian Walls cb6c40faf7 Bug 6351: Cannot delete library-specific holds polices and checkout limits
Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.

Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 21:26:26 +12:00
Chris Cormack 720e3012a8 Bug 6704 : Escaping html in the merging records, so " don't break the merge
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 21:10:02 +12:00
Chris Cormack 5a2fc683d8 Bug 6656 : Fix for advanced search not respecting default sort order
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-09-01 21:06:12 +12:00
Maxime Pelletier 6756581cf8 Bug 6794 : Fixing a bug with member flags in IE
Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2011-09-01 21:02:38 +12:00
Chris Cormack e39de04020 Bug 5524 : Cant delete list from the second page of lists
Includes follow up fixing deleting lists in OPAC

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 20:55:16 +12:00
Chris Cormack ff4b179e14 Bug 6528 : Cataloguing search not showing location for available items
Cataloging search now shows holdings information.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 20:50:47 +12:00
preprod34 390d1d5be6 Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.
xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.

http://bugs.koha-community.org/show_bug.cgi?id=6715

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-28 19:54:36 +12:00
Chris Cormack 61758c8bcb Updating about page and history 2011-08-28 19:47:22 +12:00
Chris Cormack 55326fc407 Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster 2011-08-28 19:34:25 +12:00