Commit graph

14410 commits

Author SHA1 Message Date
Srdjan Jankovic
33a9aec802 bug_4415: Copy parent contact details to child when adding Let child details be managed separately
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-03 22:19:31 +12:00
Frédérick Capovilla
94700d65c0 Bug 5737: Modified the merge subroutine in AuthoritiesMarc.pm so it won't destroy the connection to the biblioserver.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-08-03 14:01:52 +12:00
Katrin Fischer
75c1c8ca64 Bug 5418: Follow up fix for translated sys pref sql files
Add 'libsuite8' as new option to system preference 'itemBarcodeInputFilter'

en and nb-NO files are already correct.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-02 13:00:17 +12:00
Chris Nighswonger
57155db213 Bug 5263 - Add support for including fields from the ISSUES table in advanced due notices
Adding support for including fields from the Issues table in advanced due notices.
This is primarily to allow the inclusion of the due date for each item in the
advanced due notice, but will allow the inclusion of any field from the ISSUES
table.

This also adds code to exclude timestamp fields as these are irrelevant to the
end user in this context.

Note: Documentation should be updated to reflect the availability of the additional
fields in all circulation notices.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-02 12:44:42 +12:00
Chris Cormack
a869a4d43b Bug 5009 : Turning off autocomplete
Files affected
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-02 12:24:45 +12:00
dd208da05a Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.

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-08-02 09:00:11 +12:00
Liz Rea
09da79616e Bug 6643 -- Able to download patron card batches as an unauthorized user
Making sure permissions are checked on label creator

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 21:15:45 +12:00
Liz Rea
7ad49e0cae Bug 6641 -- Specially crafted URL can allow unauthorized download of MARC files from staff client
Making sure permissions are checked on download of MARC files from staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 21:13:11 +12:00
Chris Cormack
9d5d1f8f96 Bug 6642 : Making sure permissions are checked on label creator
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 21:09:33 +12:00
Stéphane Delaune
97964bc3e9 Bug 6135: insert fields ordered in C4::biblio:ModBiblioMarc
Fixing order subfields for biblionumber and biblioitemnumber

BibLibre MT5951

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 15:23:37 +12:00
Colin Campbell
e793b0dda6 Bug 6311 check_inst_id was being passed non-existent value
Due to a typo in the hash key check_inst_id in the
handle_end_patron_session was always logging an error
as the actual field contents were not being checked
unlike in other messages

Signed-off-by: Frederic Demains <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 15:17:12 +12:00
Liz Rea
8fc65ede3a Bug 6325 Bib detail - z39.50 button functionality should be under "Edit" menu
Moves the button functionality under the "Edit" drop down, as "Replace Record via Z39.50"

To test:
Click Edit -> Replace Record via Z39.50 and attempt to replace the record.

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:48:02 +12:00
4710fae55b 5662: Show control number without organization code in OPAC URLs
OPAC detail xsl adjusted at four places: 773 when leader19=c, 775, 780, 785.

Enable the pref UseControlNumber when testing this patch. And set pref OPACXSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to opac detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in opac detail if the links still work.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works with and without orgCode in front of $w now.
No change to current behaviour, but closer to MARC21 standard.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:35:10 +12:00
Katrin Fischer
4d81858ec6 Bug 4433: Small display problem for topical subjects
This removes the subfield codes shown for topical subject authorities only.

To test:
- Add different authority records and at least one for a topical subject.
- Use search in intranet and opac (turn on opacauthorities) to serch for your subjects.
- All headings will show without the subfield codes (at least $a in front), except the
topical subject.

This patch removes the subfield codes for the topical headings.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised in opac and staff. (July 18, 2011)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:30:38 +12:00
Colin Campbell
b84276a3b1 Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
patron_flagged was being passed at global scope to the template
but being checked as an element in other structures
Also although items could not be selected the Renew Selected
button was displayed, it too should check the flag
Amended the preference text which incorrectly suggested the
option could be turned off. (leading to the opposite to what
the user might expect)
In the script have explicitly assigned the value to a inumeric
variable rather than making an implicit conversion as it may be
that readers were missing that sleight of hand

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:21:13 +12:00
Katrin Fischer
4b2ea4cf44 Bug 4497: Make tabs for managing suggestions translatable
This patch makes the tabs on the manage suggestion page translatable.

To test:
- Create some suggestions in intranet or opac and manage them to make the
different status tabs appear: accecpted, pending, checked, rejected
- Apply patch, run 'perl translate update <languagecode>'
- Check po file for string '%s %sPending %sAccepted %sChecked %sRejected %sAvailable %sOrdered%s %s%s %sNo name%s (%s)'
- Translate it, save and run 'perl translate install <languagecode>'

Tabs should now appear translated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:12:01 +12:00
Paul Poulain
83f6083f36 BZ6412 : spaces in note
There was an improper T::T <input> construction: the note value contained spaces.

This patch fixes the problem by using a correct [% IF %] construction

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:07:18 +12:00
Chris Cormack
3195d20440 Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster 2011-08-01 13:03:34 +12:00
53daf8a2de Additional change for bug 5922 - Show waiting items for patron on return
- Adding patron name to dialog
- Styling dialog as a message rather than an alert since it's
  informational rather than a warning
2011-08-01 13:01:41 +12:00
Paul Poulain
83e42b0285 BZ5719: unimarc plugin fixes
* 010 now don't care of - or no - in the isbn
* 225a window now higher to have all buttons displayed

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 12:23:55 +12:00
Sophie Meynieux
0ff16446a8 Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains -
Adding - to regexp for matching branch code. Wondering if other characters should not be added too.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 12:15:31 +12:00
Alex Arnaud
00354d93bb Bug #6057 - Improve finding next stock number
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 11:59:21 +12:00
Chris Cormack
8ae5719d16 Merge remote-tracking branch 'kc/new/bug_6521' into kcmaster 2011-08-01 11:32:43 +12:00
Ian Walls
d119fbd91c Bug 6521 Follow up: previous patch breaks autoMemberNum functionality
The previous patch broke the autoMemberNum feature by adding a line to fixup_cardnumber
that returned 'undef' for cardnumber in all usages of the subroutine (limited to members/memberentry.pl
and tools/import_borrowers.pl.  This prevented the automatic number from being calculated in all cases.

This patch removes the offending line.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 11:31:27 +12:00
Katrin Fischer
7fd4480167 Bug 6080: Add id to total line in funds table
Alternate patch for bug 6080.

Instead of removing the line altogether make it possible to hide it
easily by adding an id.

To test:
- apply patch
- check your funds table for the last line labelled 'Total'
- add to IntranetUserCss: #funds_total {display:none;}
- check again, line should be hidden now

Reason:
The totals is only confusing for multi-level funds, but not wrong.
If you are using only 1 level of funds, it works all ok.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 11:23:48 +12:00
9c339d466e Fix for Bug 6638, Columns misaligned on serials claims
T:T variable scope error. Also correcting placement of calendar
include in the source to avoid JavaScript error.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-29 08:48:16 +12:00
Robin Sheat
e7cf2223e0 Bug 6540 - [SIGNED-OFF] fix some command-line args issues
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:19:25 +12:00
Magnus Enger
b66c860d5d Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:

1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:18:58 +12:00
Magnus Enger
bddca6fbcf Bug 6540 - Add defaultsql command line option
This will override the setting in /etc/koha/koha-sites.conf.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:18:00 +12:00
Magnus Enger
c7bde29718 Bug 6540 - Followup patch adding command line options
This adds the --marcflavor and --zebralang commandline options, as
well as short versions of all options.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:17:32 +12:00
Magnus Enger
b7b36796f5 Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:17:10 +12:00
Chris Cormack
614fdc2f98 Bug 6350: History update 2011-07-28 14:12:21 +12:00
John Seymour
fb347c97ac Bug 4873 - Ensure that the required directories exist on init
As systems (Ubuntu already, Debian testing is doing it too) move to
ramdisking /var/run and /var/lock, or otherwise clearing them on boot,
we need to ensure that they're there when we need them. This patch
autocreates any directories that are missing when the init script runs.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 14:05:58 +12:00
b9cc6b65a5 [SIGNED-OFF} Fix for Bug 6623 - Nicer style for "clear screen" button
This patch replaces the <button> element with an "X" link
styled to appear fixed to the upper right corner of the box
containing the barcode input field. A title attribute
shows "Clear screen" on hover.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 11:03:30 +12:00
Ian Walls
238a050b31 Bug 6547: Add id attributes to messages in opac-reserve.tt
In order to allow easier styling with JQuery, including text substitution,
this patch adds id attributes to each div tag containing a holds message.
The following ids are added, corresponding to the template variables of the
same names:

too_much_oweing
too_many_reserves
bad_biblionumber
no_items_selected
no_branch_selected
no_biblionumber
bad_data
none_available

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 10:57:17 +12:00
Frère Sébastien Marie
1124bf682f Bug 6632 [Signed Off] add html filter to prevent XSS
The filter 'html' have been added on all occurences of shelvename, which come from user input.

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

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 08:40:37 +12:00
Ian Walls
68f99cdf98 Bug 6614: Remove newlines from order notes when exporting to CSV
Newline is not a valid character to Text::CSV's combine() subroutine.  If an order
contained a note with a newline in it, that line would come out as a blank entry in
the exported CSV.  This patch strips such characters, globally.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-27 08:56:15 +12:00
Chris Cormack
0dae6dca92 Bug 6611 : With the change to making cardnumber a nullable field, we need to pass it around when we are updating borrowers, to make sure we don't null it
Tested with every small edit link on moremember.pl.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-27 08:51:39 +12:00
9db5fa227f Fix for Bug 6622 - Remove closing style tag from staff-global.css
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-25 15:41:34 +12:00
Chris Cormack
bd73c9f9ce Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster 2011-07-22 08:53:09 +12:00
d8bf9e6a29 Follow-up fixes for Bug 5917, Switch Koha to use Template::Toolkit
While fixing Bug 6395 I found a few other instances of leftover
TMPL usage.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-22 08:50:02 +12:00
Chris Cormack
80ba84159d Fixing missing padding on module version 2011-07-21 20:04:02 +12:00
Ian Walls
c414c11d64 Bug 6613: CSV basket export columns misaligned
Removes 'line' heading, since it does not correspond to any existing field name, and it pushes the fields
over by one ('ordernumber' is used to denote the ordernumber).

This patch also optimizes the GetBasketAsCSV subroutine a bit; it removes an unnecessary call to GetBiblioData,
since the order information retrieved from GetOrders already contains every field in koha.biblio and koha.biblioitems

This patch also removes the explicit sort done by publishercode, since the information returned by GetOrders is
already ORDER BY'ed, first by publishercode, then by title (there was a FIXME note in GetBasketAsCSV to do this, but
it's already done, so... :) )

To Test:
1.  Create a basket with at least three orders:  one from one publishercode, and two from another
2.  Be sure to leave out any "\n" in your Order Notes, lest you fall prey to bug 6614!
3.  Export the basket
4.  You should see the orders sorted first by publishercode, then by title
5.  Columns should line up correct all the way through

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 09:56:33 +12:00
0699c8af84 Fix for Bug 6612 - Sort pulldown for messages in alphabetical order
The values in the menu come straight out of GetAuthorisedValues(), which sorts
its results by "category, lib, lib_opac." Rather than trying to re-sort the
data in circulation.pl this patch changes the template to show 'lib,' the
description, instead of the authorised_value. That will make the output
match the column which is being sorted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 09:50:18 +12:00
203de2452e Fix for Bug 6484 - due date sorter on 'my summary' missing
Columns on the summary table are shown or hidden based on a
variety of different settings, leading to convoluted if/else
template constructions if we want to define header sorting
in the <script> block. Using the jQuery Metadata plugin
allows us to specify sorting options as classes on the
table header. This adds a dependency but simplifies the
template markup significantly.

I recommend continuing to specify header sort options in the
<script> block in cases where it is relatively simple to do
so and saving inclusion of the additional jQuery plugin for
pages which really need it.

Other changes: Moved common sorter configuration detalis to
default declaration; Moved the date due column so that it
could be set as the default sort without taking into account
multiple disappearing columns (default sort cannot be set
in the markup for a <th>).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 08:20:12 +12:00
6e2e58107f Fix for Bug 6608 - Date-pickers broken on guided reports pages
Template variable scope errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-20 09:36:20 +12:00
9d21892cec Fix for Bug 6601 - dictionary items not adding to query
T:T variable scope error.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-20 09:32:18 +12:00
bd6404608a Fix for Bug 6599 - Don't show dictionary definition table if there are no definitions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:34:29 +12:00
9a2fd1bb7e Fix for Bug 6596 - Acq framework has white space for hidden fields
Moving the "hidden" style from the <div> inside the <li> to the <li> itself.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:31:44 +12:00
Katrin Fischer
d80659ce35 Bug 6589: Adding supplements broken
To test:
- add a new subscription, choose 'create items on receive'
- receive some issues and create items > should work ok
- create a supplement, alone or at the same time as receiving a normal issue
- check if item was created and attached to the biblio record

Without patch this should give you an error message. Although supplement will be created,
no item will be added to the bibliogrpahic record.

With patch applied there should be no error message and the item should be created
and attached to the proper record.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:22:31 +12:00