Katrin Fischer [Mon, 25 Apr 2011 09:25:13 +0000 (11:25 +0200)]
Bug 6228: Show active currency in system preferences
Some system preferences like maxoutstanding should show the
active currency behind the value. The code for this was not
translated to Template Toolkit.
Will change strings, so probably for 3.4.1
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f453776ff8859cd3017d6de43a7e215845cf44e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 22 Apr 2011 20:57:38 +0000 (16:57 -0400)]
Fix for Bug 2941 Transfers cannot be canceled once initiated
This patch includes the changes by Catalyst found at
http://git.catalyst.net.nz/gw?p=koha.git;a=shortlog;h=refs/heads/bug_2941
and adds a "cancel transfer" link to the transferstoreceive
script, including a redirect check to send the user back to
that report.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 21 Apr 2011 15:13:46 +0000 (16:13 +0100)]
Bug 6237: Remove redeclarations of global vars in same scope
Scripts should be able to compile without warnings as a minimal test
a couple of variables are redeclared in the same scope generating
warnings. Remove the redeclations
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 21 Apr 2011 18:36:11 +0000 (14:36 -0400)]
Bug 6234: Fixing missing biblionumber for links using biblio-default-view.inc
Fixes various pages where the biblionumber was missing in links to the detail page of a record.
Should also fix 6241.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I made the changes Owen suggested
- added the class="ratiolimit" back
- fixed additional link in waitingreserve.tt Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixes bug where a bib record imported by bulkmarcimport.pl
could become unindexable by ensuring that ModBiblioMarc()
is always called by bulkmarcimport.pl to finalize saving the
bib record (as it was initially created by AddBiblio with the
defer_marc_save option).
Also introduces a utility routine, C4::Biblio::_strip_item_fields.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Had effect of breaking item record changes when the
CatalogingLog system preference is on.
(Note to people reviewing patches - please do not modify the content
of patches that you are signing off on unless you are *sure* you
know *exactly* what you doing. The process of patch review should
not be introducing yet more bugs.)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Mon, 18 Apr 2011 20:16:17 +0000 (16:16 -0400)]
Bug 5671 Links on My Summary - followup patch
- OPACMySummaryhtml and MySummaryhtml should have HTML at the end
- MySummaryHTML is different for each issue, so it needs to be
ISSUE.MySummaryHTML, not MySummaryhtml
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
- The following export pages used to embed items when exporting,
this was no longer the case, so they were fixed :
Intranet :
- basket/downloadcart.pl,
- virtualshelves/downloadshelf.pl
- catalogue/export.pl
Opac :
- opac/opac-downloadcart.pl
- opac/opac-downloadshelf.pl
- opac/opac-export.pl
- Notes :
- GetMarcBiblio used to embed items data, this was no longer the case,
so an optional parameter was added to choose if items should be embedded or not.
This way, previous work on this bug is not broken, and this is a pretty usefull
feature, imho.
- An optional parameter has been added to SetUTF8Flag, to be able to use NFD during
normalization. This was required to make Unicode/UTF-8 export work again.
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
bug 5579: improvements to remove_items_from_biblioitems.pl
* add copyright statement
* make --run switch work; this is now required to cause
the update to run
* improve help text
* make remove_items_from_biblioitems.pl executable
This is a squash of four patches by Henri-Damien Laurent
starting work on removing the copy of item record information
in the 9XX field of bibliographic records. The reason
for doing this is primarily to improve performance, in particular,
the expense of having to add/modify the bib record whenever an
item changes. Now, whenever an item changes, the bib record is
put in the queue to be reindexed; when the bib is indexed, the 9XX
fields are inserted into the version of the bib that Zebra indexes.
Since rebuild_zebra.pl runs in a separate process, the processing of the
bib record will not delay (e.g.) circulation.
As part of upgrading to 3.4, the following batch script should be run:
Colin Campbell [Mon, 18 Apr 2011 03:25:25 +0000 (23:25 -0400)]
Remove redundant variable
The 'first' element in the structure PrepareSerialsData
was only used in the opac template. Remove assignment
as it is now obsolete (and potentially confusing )
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Mon, 18 Apr 2011 03:24:46 +0000 (23:24 -0400)]
Bug 6195 : Opac user should not have serial manage tab
PrepareSerialData adds a year of 'manage' for staff display
Opac should not see this
Would be better if it returned a cleaner data structure and
let the template engine handle the display
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
The Heading-Main and Any indexes were not defined in the MARC21 authority DOM
rules, but was enabled by the fix for bug 5924. This patch adds the Heading-Main
and Any indexes to the MARC21 DOM authority configuration.
This is a revised patch, with the authority-zebra-indexdefs.xsl automatically
generated from authority-koha-indexdefs.xml. Note that Any is added by
koha-indexdefs-to-zebra.xsl rather than in the authority-koha-indexdefs.xml
file.
NOTE: This patch modifies the following files, which you will need to manually
update if you are using a dev install:
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
You will also need to reindex your authorities for the changes in this patch to
take effect.
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>
Lower dependency on Storable to 2.20 in PerlDependencies.pm
This patch lowers the dependency on the "Storable" Perl package
(also known as module/distribution) from version 2.21 to 2.20
This patch created today (14-Apr-2011) does, in PerlDependencies.pm,
the same as a previous patch dated 30-Mar-2010 from Lars Wirzenius
did, in Makefile.PL :
[Koha-patches] [PATCH] Lower dependency on Storable to 2.20.
http://lists.koha-community.org/pipermail/koha-patches/2010-March/011560.html
The reason for this patch is the same that Lars gave for his:
" The Debian squeeze system has only 2.20, and the 2.21 does not seem
to be required for all tests to pass. Also, checked with
Galen Charlton and Henri-Damien LAURENT (who added the 2.21 dependency)
on IRC that 2.21 did not have anything that was required, compared
to 2.20. "
I believe this patch should be applied to the "master" branch
and should also be "cherry-picked" for the "3.2.x" branch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 14 Apr 2011 14:40:21 +0000 (09:40 -0500)]
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>