Commit graph

3472 commits

Author SHA1 Message Date
1efda7ceb4 Fix for Bug 6185, holds slip says 'reserve'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-19 13:21:34 +12:00
Jared Camins-Esakov
415ea18007 Bug 5859: Allow user to set encoding for import
Rather than having options for MARC21 and UNIMARC in the "Character encoding"
dropdown, the user should be able to select the appropriate character encoding.
The default retains the current behavior, which is to allow the system to guess
which character encoding is in use. However, it should be noticed that this is
almost always wrong for non-UTF8 records with non-ASCII characters. Specifying
a character set is much more reliable if you're not using UTF-8.

Rebased to use Template::Toolkit instead of HTML::Template::Pro.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-19 13:05:48 +12:00
ed9b0c551e Incremental fix for Bug 3514, Returning items through patron details tab
Note: Signed off with the understanding that this partial fix still doesn't compensate for items that need to be transited home (i.e. have no holds, but are not being returned at their home branch.)
 This behavior is much better than the old behavior, however.

Hiding the "check in" checkbox for items which are on hold. This
mitigates the problem of checkins not triggering holds prompts
by forcing the librarian to check in these items individually.

This fix should be considered temporary until a more comprehensive
fix can be developed which incorporates handling for holds.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:40:47 +12:00
55984a1610 Fix for Bug 6192 - Path to theme directory scoped incorrectly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:32:43 +12:00
d44896079b Fix for Bug 6186 - Change to DOCTYPE declaration causing validation errors
In the transition to Template::Toolkit a part of the DOCTYPE includes
got its case switched, making it invalid: XHTML was changed to Xhtml

Correcting the case quiets errors in the validator.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:15:32 +12:00
b03a6a22a0 Fix for Bug 6179, Extra column on fines in staff client
Template variable scope error fixes the column error.
This patch also includes a fix for the column span
error in the table footer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 15:06:24 +12:00
Chris Cormack
7cfa1ca509 Merge remote branch 'kc/new/enh/bug_5952' into kcmaster 2011-04-14 14:41:25 +12:00
49af98afd7 Follow-up fix for Bug 5952, Shows member relatives in issues list
- Moving columns around to match display of patron's own checkouts
- Correcting terminology (issues, borrowers)
- Hiding columns added in previous patch which do not display in
  the standard checkout list: materials, stock number, collection.
  If these are to be added they should be added to all displays.

[edit] Adding display of relative's cardnumber alongside their name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:40:19 +12:00
d00d0721b2 Fix for Bug 6183, "Cancel marked requests" button has become "Renew checked items"
Also includes a fixes for Bug 6168 (Can't delete holds from circulation page)
and Bug 6105 (Cancel a reserve from moremember.pl doesn't work)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:30:59 +12:00
Chris Cormack
d4f2bde054 Merge branch 'new/enh/bug_5917' into kcmaster 2011-04-14 13:36:57 +12:00
Chris Cormack
2fb5b73e6b Bug 5917 : Fixing a bug in the results page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 13:36:25 +12:00
Chris Cormack
9bb2554e39 Merge remote branch 'kc/new/enh/bug_5692' into kcmaster 2011-04-13 16:08:52 +12:00
Chris Cormack
b030ef9f4f Bug 5692 : Adds an alternative cataloguing plugin for 210$c
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 15:48:42 +12:00
Chris Cormack
548a670eaf Bug 5922 : Template changes 2011-04-13 14:46:08 +12:00
Chris Cormack
90962ec380 Bug 5922 : Functional Changes
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 14:45:21 +12:00
Chris Cormack
ce06b67f5e Merge remote branch 'kc/new/bug_6126' into kcmaster 2011-04-13 12:01:53 +12:00
97712c2cca Bug 6126: Slip print doesn't work on Webkit based browsers
Wrap window.print();window.close(); with a function called when body has finished loading. Prevents webkit from closing before page is loaded and print dialog presented to the user.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 12:00:31 +12:00
Colin Campbell
f11ba1343c Bug 6174: Fix ordering of existing title
basketno was treated as local to the resultsloop
also changed the tt variable name for readability

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 11:56:52 +12:00
Colin Campbell
2ea74bef65 Bug 6170: restore more options to staff adv search
Some globals were assigned as search box attributes in conversion
causing elements to be suppressed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:57:18 +12:00
Chris Cormack
6073bd86e2 Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-13 08:35:41 +12:00
Christopher Hall
1d3273595c comma fix 2011-04-13 08:34:15 +12:00
dfa4127db1 Bug 6171 Can't edit items
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 19:52:00 +12:00
Jared Camins-Esakov
66fb80f436 Bug 6158: Permissions scoped wrong for T::T
Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:16:27 +12:00
Chris Cormack
961e9fec87 Bug 5917 : Fixing a bug with categorie.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 16:37:49 +12:00
Chris Cormack
297649c8ec Bug 6085 : Can now change language in the preferences menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 12:58:04 +12:00
Jared Camins-Esakov
f1e96f4590 Bug 5917 follow-up: Fix staff client results display
The change to Template::Toolkit broke a number of things on the Staff Client
results display. This patch:
* Fixes the formatting of the results table, which had an unnecessary colspan=2
* Enables the display of the "Edit record" and "Edit items" links
* Corrects the display of item counts, so that labels for "Available,"
  "On loan," and "Unavailable" only appear when appropriate
* Corrects facet links, which were starting new searches rather than limiting
  due to a variable scoping error
* Changes the resort dropdown so that it will show the currently-selected
  sorting

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:40 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +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
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
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
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
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
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
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
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
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
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
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
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