Commit graph

2551 commits

Author SHA1 Message Date
Chris Cormack
c88f43fc67 Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not
Default is on

Part of bug 5609

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 16:18:08 +13:00
Jared Camins-Esakov
4bc293c3aa Bug 5810: Subject tracings search complete subfields
This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:02:59 +13:00
Chris Cormack
554c77569d Merge remote branch 'kc/new/bug_3013' into kcmaster 2011-03-13 14:02:06 +13:00
Janusz Kaczmarek
728b3725df Bug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 20:48:54 +13:00
Chris Cormack
b06a289173 Merge remote branch 'kc/master' into new/bug_3013 2011-03-08 08:28:42 +13:00
Salvador Zaragoza Rubio
519cb622db Bug 3013 - Value builder for 006 and 008 need choices for all format types
Modification of the intranet cataloguing plugin for 006/008 fields to allow
select a type of material and change the positions available to enter the data.
Data are hard stored in xml files to allow easy translation and processing through
Javascript and JQuery-AJAX.

Bug 3013 - Fix selection of combo and trailing whitespace

Bug 3013 - Fix selection of combo

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 08:28:32 +13:00
61adeac859 bug 5783: follow-up system preferences tweaks
* add the AuthoritiesLog system preference to all
  language installer SQL scripts
* options for a 'YesNo' should be '', not '0'
* fix wording glitch on preferences page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:09:23 +13:00
8af91c079a bug 5783: Authorities edit logging
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:12 +13:00
Nicole C. Engard
d6718e14e7 Bug 5820: Change language to 'Fund' over 'Budget'
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:40:28 +13:00
Nahuel ANGELINETTI
6b285cf44d (bug #5157) fix borrowers top issues
this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:31:08 +13:00
Ian Walls
4735e296cf Bug 5824: Creating a circ rule for a specific library causes anomalies
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:38:36 +13:00
2dde876798 Fix for Bug 5818, Date picker broken on label batches
Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:35:57 +13:00
Paul Poulain
ca8ae9b8cc BZ5432 follow-up, removing test string
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:55 +13:00
Stéphane Delaune
3cc0939622 Bug 5432 : (MT #4584b)Add duplicate support for borrowers
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:54 +13:00
Nicole C. Engard
bbd08ffd09 Bug 5799 make language on circ history consistent
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 12:52:43 +13:00
Jared Camins-Esakov
83ab549724 Bug 5811: Add sysprefs to control overriding fines
This patch adds two sysprefs to allow libraries more fine-grained control over
when fines can and can't be overridden. The two sysprefs are:
* AllFinesNeedOverride - when this syspref is set to "Require" (default) any
    fine will require a staffmember to override the fine in order to check out a
    book.  When set to "Don't require," fines below noissuescharge will not need
    any override.
* AllowFineOverride - when this syspref is set to "Allow," staff will be able to
    override fines that are above noissuescharge. When set to "Don't allow"
    (default), staff will not be able to check out items to patrons with fines
    greater than noissuescharge.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:33:18 +13:00
6ded7b9897 Fix for Bug 5814 - Style error message on manage staged records page according to standard
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:23:15 +13:00
f8c85a6bc8 Follow-up fix for Bug 5804, acqui duplicate warning
Typo fix. Thanks for spotting it Marcel.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-03 12:14:56 +13:00
07cef41c73 Fix for Bug 5804 - duplicate warning when ordering needs design work
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 09:18:26 +13:00
Chris Cormack
622f804ffd Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-28 09:09:33 +13:00
575a690b4e 2742 Encoding problem
Small correction of e umlaut. [Something happened with encoding of signed patch; my original patch did not show a wrong character.]

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 09:07:02 +13:00
ruth@bywatersolutions.com
0b961c0ae0 Bug 5805: Having items in-transit can cause derangement of the hold list
If you have a list of holds on a biblio, and one or more are in-transit, then the
array that is fed to modrequest.pl is not fully-populated, lacking the branch on the
in-transit rows.  If you then attempt to edit one of the remaining holds' pickup
location, it doesn't modify the one you expect, but ones *above* that.  Also, holds
at the bottom of the list get the first pickup library in the list, since they are
getting undef passed in.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 20:44:01 +13:00
Katrin Fischer
38b59b7b53 Bug 1962: Add fine notification during check-in
Original patch submitted by dswhite42@yahoo.com

Reformatted to apply cleanly.
Changed alert message during check-in to message used
on borrower account checkout page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 19:52:56 +13:00
Chris Cormack
f75f964ba4 Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-22 08:37:25 +13:00
marcel@libdevelop.rijksmuseum.nl
fc1b7201c5 2742: Wrong language name in the preferences
Follow up patch. Improvement suggested by Belgian translators (Hans Supply).

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-22 08:33:11 +13:00
febba50ba8 Bug 5782: Add warning when ordering a duplicate record from external source
Enhancement for Acquisitions/ordering from external source.
Koha already checked for duplicates, but this patch warns the user. Offers the choice to use existing record, use new record or return without making an order.
The new template is added for this interaction with the user.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-22 08:24:01 +13:00
a0367aa973 Fix for Bug 5776 - menu on funds wraps when only 1 fund
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-21 16:24:46 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
Chris Cormack
36d64bd18c Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-17 09:47:14 +13:00
4797959964 Follow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit
A change was made to MARCdetail.tmpl without making a corresponding
change to MARCdetail.pl. I've reworked the original change so that
both can work together.

0XX --> tab0XX

Apparently TMPL variables can't start with a number now?

MR: Recreated patch file to recover failure to apply.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 09:42:56 +13:00
3e26abc9cd Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record
- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 08:28:29 +13:00
Paul Poulain
761fa37297 Bug 5760 : MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-16 14:45:41 +13:00
Paul Poulain
2f9bebf802 Bug 5759 : displaying 2nd email if there is one on print template for borrowers
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-16 08:57:48 +13:00
Chris Cormack
3f35705ddc Merge remote branch 'kc/new/enh/bug_2170' into kcmaster 2011-02-15 15:55:54 +13:00
173d3cbb2d Follow-up fix for Bug 2170 - Adding 'edititems' user-permission
Save button and duplicate confirmation redirects must respect
the edititems permission: Users without permission to edit items
should not be redirected to the edit items screen.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:31:22 +13:00
50c0ae09a1 Partial fix for Bug 5745, Overdues with fines report not showing titles
- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:12:36 +13:00
Chris Cormack
a10566b53c Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-15 10:04:43 +13:00
d2cf30820f Follow up on bug 2742: Correct language names in install
Rename the phonetic name in about, just like an earlier patch did elsewhere.
Make the distinction between the two Dutch translations more clear.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 09:55:20 +13:00
Chris Cormack
b18ae6dee6 Merge remote branch 'kc/new/bug_5734' into kcmaster 2011-02-14 10:53:17 +13:00
Paul Poulain
adb1aefaf3 Bug 5734 (MT3625) Fix column order in issue history
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:52:29 +13:00
Chris Cormack
a52d4e8a70 Merge remote branch 'kc/new/bug_5649' into kcmaster 2011-02-14 10:33:41 +13:00
Schuster
ace3f0b70a bug 5649: changes the white/blacklisting to approved/rejected consistent wording
Changes the wording to approved/rejected to be consistent with other wording

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:33:07 +13:00
53566f09fb Fix for Bug 5722, other reason for suggestions has code in text box
Input value attributes shouldn't have _() escaping.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:27:49 +13:00
9c0752edf2 Fix for Bug 5679 - funds planning showing strange borders
Table border style needed more specificity

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:24:44 +13:00
9319ab3254 Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay value
Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:19:29 +13:00
af1009da3d Bug 5735: Expanding/collapsing cloned fields in editor takes original field
Adds corrected onclick response for expanding marc tags.
Removes some lines that did not work as promised.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:50:32 +13:00
3a83dc79c5 Fix for Bug 5743, 5743 - Make login errors a little nicer
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:14:46 +13:00
Katrin Fischer
f889cbaa25 Make 'about' show D Ruth Bavousett's name change
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:08:44 +13:00
koha-preprod
de491849ac Add markers to text in Javascript variable in order to be translate.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:13:06 +13:00
Chris Cormack
7c376879b4 Bug 3495 : Providing a link to the fast add screen in circulation for an item that isn't found
Squashed commit of the following:

commit bf7fb7971d2d6ea6b3ea09bda571bdc3399efb35
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Feb 9 13:53:38 2011 +1300

    Bug 3495 : Wrapping link to the fast cataloguing page with syspref and permissions

commit ae7e2c278e10efea94e19b75446d7fed25272de2
Author: Paul Poulain <paul.poulain@biblibre.com>
Date:   Wed Dec 15 20:50:45 2010 +0100

    Bug 3495 : Add link to Fast cataloguing in case the scanned barcode don't exist in circulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:58:43 +13:00