]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoMerge branch 'new/enh/bug_5579' into kcmaster
Chris Cormack [Wed, 20 Apr 2011 23:48:11 +0000 (11:48 +1200)]
Merge branch 'new/enh/bug_5579' into kcmaster

Conflicts:
C4/Biblio.pm

13 years agoBug 6215 : Fixing a bug with virtuallists
Chris Cormack [Wed, 20 Apr 2011 23:37:44 +0000 (11:37 +1200)]
Bug 6215 : Fixing a bug with virtuallists

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: tweaks to bulkmarcimport.pl
Galen Charlton [Wed, 20 Apr 2011 21:34:47 +0000 (17:34 -0400)]
bug 5579: tweaks to bulkmarcimport.pl

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>
13 years agobug 5579: remove a now-unecessary vestigal variable
Galen Charlton [Wed, 20 Apr 2011 21:34:46 +0000 (17:34 -0400)]
bug 5579: remove a now-unecessary vestigal variable

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: add line removed during patch review
Galen Charlton [Wed, 20 Apr 2011 21:34:45 +0000 (17:34 -0400)]
bug 5579: add line removed during patch review

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>
13 years agoBug 6212 : Fix for tags label showing with no tags
Chris Cormack [Wed, 20 Apr 2011 21:39:38 +0000 (09:39 +1200)]
Bug 6212 : Fix for tags label showing with no tags

13 years agoFix for Bug 6213, Koha News template error
Owen Leonard [Wed, 20 Apr 2011 13:01:45 +0000 (09:01 -0400)]
Fix for Bug 6213, Koha News template error

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFix for Bug 6216, Search results pagination links broken
Owen Leonard [Wed, 20 Apr 2011 14:09:59 +0000 (10:09 -0400)]
Fix for Bug 6216, Search results pagination links broken

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFix for Bug 6221, Modifying patron doesn't show "Patron Account Flags" group
Owen Leonard [Wed, 20 Apr 2011 06:59:11 +0000 (02:59 -0400)]
Fix for Bug 6221, Modifying patron doesn't show "Patron Account Flags" group

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6211: Set default correctly for SubscriptionHistory syspref
Colin Campbell [Wed, 20 Apr 2011 02:16:13 +0000 (22:16 -0400)]
Bug 6211: Set default correctly for SubscriptionHistory syspref

Was being set to an invalid value ';'
resulting in weird behaviour where it looked set but was not
in practice

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Wed, 20 Apr 2011 08:44:36 +0000 (20:44 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years agoBug 5917 : Testing fixing utf8 for preferences po file
Chris Cormack [Wed, 20 Apr 2011 08:42:05 +0000 (20:42 +1200)]
Bug 5917 : Testing fixing utf8 for preferences po file

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFixing bug in the french sys pref file, duplicate sys prefs plus l'OPAC not l\'OPAC
Chris Cormack [Wed, 20 Apr 2011 04:44:04 +0000 (16:44 +1200)]
Fixing bug in the french sys pref file, duplicate sys prefs plus l'OPAC not l\'OPAC

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5897' into kcmaster
Chris Cormack [Wed, 20 Apr 2011 04:19:44 +0000 (16:19 +1200)]
Merge remote branch 'kc/new/enh/bug_5897' into kcmaster

13 years agoFollow-up fix for Bug 5897 - Hide name of comment writer in OPAC
Owen Leonard [Wed, 20 Apr 2011 00:48:33 +0000 (20:48 -0400)]
Follow-up fix for Bug 5897 - Hide name of comment writer in OPAC

Correcting 'recent comments' view to obey ShowReviewer pref

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Wed, 20 Apr 2011 04:12:53 +0000 (16:12 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years agoBug 5917 : Fixes for innerhtml -> innerHTML
Chris Cormack [Wed, 20 Apr 2011 04:02:24 +0000 (16:02 +1200)]
Bug 5917 : Fixes for innerhtml -> innerHTML

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6184 : Plugin for 007 broken
Chris Cormack [Wed, 20 Apr 2011 03:49:07 +0000 (15:49 +1200)]
Bug 6184 : Plugin for 007 broken

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6202 : Fix for showing subscription details
Chris Cormack [Wed, 20 Apr 2011 03:28:44 +0000 (15:28 +1200)]
Bug 6202 : Fix for showing subscription details

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6208 : Cant add funds to a budget
Chris Cormack [Wed, 20 Apr 2011 02:33:29 +0000 (14:33 +1200)]
Bug 6208 : Cant add funds to a budget

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6203 : Fix for numbering pattern not showing
Chris Cormack [Wed, 20 Apr 2011 02:02:31 +0000 (14:02 +1200)]
Bug 6203 : Fix for numbering pattern not showing

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5791 - Robust handling of deleted/non-existent biblios and authority records
Tomas Cohen Arazi [Mon, 18 Apr 2011 20:59:32 +0000 (16:59 -0400)]
Bug 5791 - Robust handling of deleted/non-existent biblios and authority records

Patch reworked for master using Template::Toolkit.

To+

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5671 Links on My Summary - followup patch
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>
13 years agoMerge remote branch 'kc/master' into new/enh/bug_5579
Chris Cormack [Tue, 19 Apr 2011 18:44:09 +0000 (06:44 +1200)]
Merge remote branch 'kc/master' into new/enh/bug_5579

13 years agoBug 6207 : Template scoping error
Chris Cormack [Tue, 19 Apr 2011 18:41:58 +0000 (06:41 +1200)]
Bug 6207 : Template scoping error

13 years agoAdding another sponsoring library to the credits in the release notes
Chris Cormack [Tue, 19 Apr 2011 18:31:21 +0000 (06:31 +1200)]
Adding another sponsoring library to the credits in the release notes

13 years agobug 5579 : Fixes ISBD display
Matthias Meusburger [Thu, 7 Apr 2011 14:08:11 +0000 (16:08 +0200)]
bug 5579 : Fixes ISBD display

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579 : Fixes several exports to embed items
Matthias Meusburger [Thu, 7 Apr 2011 10:04:43 +0000 (12:04 +0200)]
bug 5579 : Fixes several exports to embed items

  - 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>
13 years agobug 5579: teach MARC export to embed items when needed
Galen Charlton [Sun, 3 Apr 2011 02:19:39 +0000 (22:19 -0400)]
bug 5579: teach MARC export to embed items when needed

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: remove unused routines
Galen Charlton [Sun, 3 Apr 2011 01:22:02 +0000 (21:22 -0400)]
bug 5579: remove unused routines

Remove the following routines which used to
handle embedding item data in the bibliographic record:

C4::Items::_replace_item_field_in_biblio
C4::Items::_add_item_field_to_biblio

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: remove sync_items_in_marc_bib.pl
Galen Charlton [Sun, 3 Apr 2011 00:48:40 +0000 (20:48 -0400)]
bug 5579: remove sync_items_in_marc_bib.pl

Now that item data is inserted into the MARC bib record
at the point of indexing, sync_items_in_marc_bib.pl is
no longer needed.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: reduce processing to log item changes
Galen Charlton [Fri, 4 Mar 2011 00:09:35 +0000 (19:09 -0500)]
bug 5579: reduce processing to log item changes

* no need to record full bib MARC when logging
  change to an item record
* IDEA: set up a separate ItemLog syspref

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: new routine to embed items in bib
Galen Charlton [Thu, 3 Mar 2011 23:41:42 +0000 (18:41 -0500)]
bug 5579: new routine to embed items in bib

Adds a new routine, C4::Biblio::EmbedItemsInMarcBiblio, to
embed the items in the bib record when necessary:

* cataloging/additem.pl
* rebuild_zebra.pl

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: correctly signal when to reindex bibs
Galen Charlton [Thu, 3 Mar 2011 23:29:32 +0000 (18:29 -0500)]
bug 5579: correctly signal when to reindex bibs

* when item changes
* when new item is added

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: fix moving items from bib to another
Galen Charlton [Thu, 3 Mar 2011 23:24:19 +0000 (18:24 -0500)]
bug 5579: fix moving items from bib to another

* Must signal both bibs to be reindexed

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug 5579: improvements to remove_items_from_biblioitems.pl
Galen Charlton [Sun, 3 Apr 2011 01:09:59 +0000 (21:09 -0400)]
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

Signed-off-by: Galen Charlton <gmcharlt@esilibrary.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5579: remove items from MARC bib
Henri-Damien LAURENT [Fri, 3 Sep 2010 10:16:52 +0000 (12:16 +0200)]
Bug 5579: remove items from MARC bib

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:

misc/maintenance/remove_items_from_biblioitems.pl --run

This should be followed by a complete reindexing of the bib records, e.g.,

misc/migration_tools/rebuild_zebra.pl -b -r

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6205 : Fix for the installer, falling back to english
Chris Cormack [Tue, 19 Apr 2011 10:05:53 +0000 (22:05 +1200)]
Bug 6205 : Fix for the installer, falling back to english

13 years agoBug 6205 : Further fix for installer
Chris Cormack [Tue, 19 Apr 2011 09:55:26 +0000 (21:55 +1200)]
Bug 6205 : Further fix for installer

13 years agoBug 6205 : Fix for not found doc-head file when installing in another language
Chris Cormack [Tue, 19 Apr 2011 09:17:30 +0000 (21:17 +1200)]
Bug 6205 : Fix for not found doc-head file when installing in another language

13 years agoBug 5917 : Removing comments <!-- etc from the po file
Chris Cormack [Tue, 19 Apr 2011 08:14:06 +0000 (20:14 +1200)]
Bug 5917 : Removing comments <!-- etc from the po file

13 years agoRelease notes for 3.4.0
Chris Cormack [Tue, 19 Apr 2011 07:41:39 +0000 (19:41 +1200)]
Release notes for 3.4.0

13 years agoBug 5917 : We need to catch the comments for the xslt to work
Chris Cormack [Tue, 19 Apr 2011 05:15:17 +0000 (17:15 +1200)]
Bug 5917 : We need to catch the comments for the xslt to work

13 years agoUpdating package lists
Chris Cormack [Tue, 19 Apr 2011 05:01:27 +0000 (17:01 +1200)]
Updating package lists

13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Tue, 19 Apr 2011 04:21:40 +0000 (16:21 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years ago5917 : Working on the translation script, fixing the line breakages
Chris Cormack [Tue, 19 Apr 2011 04:03:20 +0000 (16:03 +1200)]
5917 : Working on the translation script, fixing the line breakages

13 years agoFix for Bug 6189 - renewal warning should say 'renew' not checkout
Owen Leonard [Mon, 18 Apr 2011 03:42:26 +0000 (23:42 -0400)]
Fix for Bug 6189 - renewal warning should say 'renew' not checkout

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoRemove redundant variable
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>
13 years agoBug 6195 : Opac user should not have serial manage tab
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>
13 years agoBug 4389 - [tt] Trigger quick slip print on empty checkout submit
Tomas Cohen Arazi [Sun, 17 Apr 2011 23:27:37 +0000 (19:27 -0400)]
Bug 4389 - [tt] Trigger quick slip print on empty checkout submit

js listener approach. Added a reasonable id to the mainform.
To+

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFix for Bug 6185, holds slip says 'reserve'
Owen Leonard [Sun, 17 Apr 2011 23:24:01 +0000 (19:24 -0400)]
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>
13 years agoFix for Bug 6156, Misaligned column in cart print view
Owen Leonard [Sun, 17 Apr 2011 23:22:29 +0000 (19:22 -0400)]
Fix for Bug 6156, Misaligned column in cart print view

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5859: Allow user to set encoding for import
Jared Camins-Esakov [Sun, 17 Apr 2011 22:15:51 +0000 (18:15 -0400)]
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>
13 years agoMerge remote branch 'kc/new/bug_3072' into kcmaster
Chris Cormack [Tue, 19 Apr 2011 01:03:07 +0000 (13:03 +1200)]
Merge remote branch 'kc/new/bug_3072' into kcmaster

13 years agoBug 3072: Add Heading-Main and Any to MARC21 DOM
Jared Camins-Esakov [Sun, 17 Apr 2011 22:09:07 +0000 (18:09 -0400)]
Bug 3072: Add Heading-Main and Any to MARC21 DOM

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>
13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Sun, 17 Apr 2011 23:45:47 +0000 (11:45 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years agoBug 5917 : Trimming leading spaces - Please test it seems to work ok
Chris Cormack [Sun, 17 Apr 2011 22:39:25 +0000 (10:39 +1200)]
Bug 5917 : Trimming leading spaces - Please test it seems to work ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5917 : More tweaks to the translation
Chris Cormack [Sun, 17 Apr 2011 22:31:35 +0000 (10:31 +1200)]
Bug 5917 : More tweaks to the translation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoLower dependency on Storable to 2.20 in PerlDependencies.pm
Ricardo Dias Marques [Thu, 14 Apr 2011 15:15:55 +0000 (16:15 +0100)]
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>
13 years agoIncremental fix for Bug 3514, Returning items through patron details tab
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>
13 years agoFix for Bug 6192 - Path to theme directory scoped incorrectly
Owen Leonard [Thu, 14 Apr 2011 13:38:18 +0000 (09:38 -0400)]
Fix for Bug 6192 - Path to theme directory scoped incorrectly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/bug_6187' into kcmaster
Chris Cormack [Thu, 14 Apr 2011 22:28:55 +0000 (10:28 +1200)]
Merge remote branch 'kc/new/bug_6187' into kcmaster

13 years agoBug 6187 : Stupid typo in previous patch
Chris Cormack [Thu, 14 Apr 2011 22:22:42 +0000 (10:22 +1200)]
Bug 6187 : Stupid typo in previous patch

13 years agoFix for Bug 6186 - Change to DOCTYPE declaration causing validation errors
Owen Leonard [Thu, 14 Apr 2011 12:32:39 +0000 (08:32 -0400)]
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>
13 years agoBumping database version
Chris Cormack [Thu, 14 Apr 2011 08:28:17 +0000 (20:28 +1200)]
Bumping database version

13 years ago5917 Fix for updating/creating .po files
Chris Cormack [Thu, 14 Apr 2011 08:23:57 +0000 (20:23 +1200)]
5917 Fix for updating/creating .po files

13 years agoMerge remote branch 'kc/new/bug_6104' into kcmaster
Chris Cormack [Thu, 14 Apr 2011 06:30:38 +0000 (18:30 +1200)]
Merge remote branch 'kc/new/bug_6104' into kcmaster

13 years agoBug 6104: Modify item looses branch
Paul Poulain [Thu, 7 Apr 2011 09:42:59 +0000 (11:42 +0200)]
Bug 6104: Modify item looses branch

If the $value is provided by the item, use it, don't use the librarian branch !

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6188 : Gender not showing in the opac
Chris Cormack [Thu, 14 Apr 2011 03:29:26 +0000 (15:29 +1200)]
Bug 6188 : Gender not showing in the opac

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6187 : Fixing template issue with opac-authoritesdetail.tt
Chris Cormack [Thu, 14 Apr 2011 03:25:28 +0000 (15:25 +1200)]
Bug 6187 : Fixing template issue with opac-authoritesdetail.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFix for Bug 6179, Extra column on fines in staff client
Owen Leonard [Wed, 13 Apr 2011 15:52:07 +0000 (11:52 -0400)]
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>
13 years agoFix for Reserves.t allow the tests to run without a logged in user
Chris Cormack [Thu, 14 Apr 2011 03:03:37 +0000 (15:03 +1200)]
Fix for Reserves.t allow the tests to run without a logged in user

13 years agoMerge remote branch 'kc/new/bug_6162' into kcmaster
Chris Cormack [Thu, 14 Apr 2011 03:02:02 +0000 (15:02 +1200)]
Merge remote branch 'kc/new/bug_6162' into kcmaster

13 years agoBug 6162 Fix passing of borrower details to reading history
Colin Campbell [Tue, 12 Apr 2011 10:40:57 +0000 (11:40 +0100)]
Bug 6162 Fix passing of borrower details to reading history

script was passing borr details incorrectly and in a fix was
then passing them in a one element array
unnecessary complication tends to go wrong sooner or later

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5952' into kcmaster
Chris Cormack [Thu, 14 Apr 2011 02:41:25 +0000 (14:41 +1200)]
Merge remote branch 'kc/new/enh/bug_5952' into kcmaster

13 years agoFollow-up fix for Bug 5952, Shows member relatives in issues list
Owen Leonard [Wed, 13 Apr 2011 18:38:25 +0000 (14:38 -0400)]
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>
13 years agoFix for Bug 6183, "Cancel marked requests" button has become "Renew checked items"
Owen Leonard [Wed, 13 Apr 2011 20:06:06 +0000 (16:06 -0400)]
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>
13 years agoMerge branch 'new/enh/bug_5917' into kcmaster
Chris Cormack [Thu, 14 Apr 2011 01:36:57 +0000 (13:36 +1200)]
Merge branch 'new/enh/bug_5917' into kcmaster

13 years agoBug 5917 Trying to fix the js parsing for translation
Chris Cormack [Thu, 14 Apr 2011 01:30:34 +0000 (13:30 +1200)]
Bug 5917 Trying to fix the js parsing for translation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5917 : Fixing a bug in the results page
Chris Cormack [Wed, 13 Apr 2011 21:17:50 +0000 (09:17 +1200)]
Bug 5917 : Fixing a bug in the results page

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5692' into kcmaster
Chris Cormack [Wed, 13 Apr 2011 04:08:52 +0000 (16:08 +1200)]
Merge remote branch 'kc/new/enh/bug_5692' into kcmaster

13 years agoBug 5692 : Adds an alternative cataloguing plugin for 210$c
Chris Cormack [Wed, 13 Apr 2011 03:02:58 +0000 (15:02 +1200)]
Bug 5692 : Adds an alternative cataloguing plugin for 210$c

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 5922 : Template changes
Chris Cormack [Wed, 13 Apr 2011 02:46:08 +0000 (14:46 +1200)]
Bug 5922 : Template changes

13 years agoBug 5922 : Functional Changes
Chris Cormack [Wed, 13 Apr 2011 02:39:13 +0000 (14:39 +1200)]
Bug 5922 : Functional Changes

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFixing typo in fix for tests
Chris Cormack [Wed, 13 Apr 2011 02:04:07 +0000 (14:04 +1200)]
Fixing typo in fix for tests

13 years agoBug 6154: Default sorting by title doesn't work
Jared Camins-Esakov [Sun, 10 Apr 2011 21:28:05 +0000 (17:28 -0400)]
Bug 6154: Default sorting by title doesn't work

If you have the default sorting set to title ascending or title descending,
your search results will not automatically be sorted because the syspref uses
title_asc and title_dsc, whereas Search.pm wants title_az and title_za. The same
issue is present when the default sort is on author.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/bug_6126' into kcmaster
Chris Cormack [Wed, 13 Apr 2011 00:01:53 +0000 (12:01 +1200)]
Merge remote branch 'kc/new/bug_6126' into kcmaster

13 years agoBug 6126: Slip print doesn't work on Webkit based browsers
Tomas Cohen Arazi [Tue, 12 Apr 2011 12:45:22 +0000 (08:45 -0400)]
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>
13 years agoBug 6174: Fix ordering of existing title
Colin Campbell [Tue, 12 Apr 2011 15:25:51 +0000 (16:25 +0100)]
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>
13 years agoWhen running the tests a user is not logged in so C4::Context->userenv
Chris Cormack [Tue, 12 Apr 2011 23:52:28 +0000 (11:52 +1200)]
When running the tests a user is not logged in so C4::Context->userenv
does not exist, stopping the tests erroring

13 years agoBug 5067 Add a cleanisbn param to bulkmarcimport.pl
Frédéric Demians [Tue, 12 Apr 2011 15:41:38 +0000 (16:41 +0100)]
Bug 5067 Add a cleanisbn param to bulkmarcimport.pl

Import script shouldn't remove an information present in entering biblio
records. With this patch, by default, ISBN are not cleared anymore.

[2011.04.12] Rebased on HEAD

DOCUMENTATION: There is a new paramater --isbn|--noisbn

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6170: restore more options to staff adv search
Colin Campbell [Tue, 12 Apr 2011 20:43:43 +0000 (22:43 +0200)]
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>
13 years agoBug 6170 restore more options to advanced search
Colin Campbell [Tue, 12 Apr 2011 20:43:42 +0000 (22:43 +0200)]
Bug 6170 restore more options to advanced search

Template conversion was treating some globals as attributes of searchbox

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6170: Do not prematurely group results
Colin Campbell [Tue, 12 Apr 2011 20:43:41 +0000 (22:43 +0200)]
Bug 6170: Do not prematurely group results

If OPACGroupResults preference was set it was
shortcircuiting the template selection logic and
we didn't go to the advanced options field

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Tue, 12 Apr 2011 20:35:41 +0000 (08:35 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years agocomma fix
Christopher Hall [Tue, 1 Feb 2011 20:15:07 +0000 (09:15 +1300)]
comma fix

13 years agoBug 6169: Inventory tool fails when ignoreissued set
Jared Camins-Esakov [Tue, 12 Apr 2011 10:06:36 +0000 (11:06 +0100)]
Bug 6169: Inventory tool fails when ignoreissued set

Due to incorrect parameters passed to C4::Items::GetItemsForInventory, checking
the "Skip copies on loan" box resulted in the inventory failing to run.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote branch 'kc/new/enh/bug_5917' into kcmaster
Chris Cormack [Tue, 12 Apr 2011 08:18:20 +0000 (20:18 +1200)]
Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

13 years agoBug 5917 : Fix for xgettext.pl
Chris Cormack [Tue, 12 Apr 2011 08:16:57 +0000 (20:16 +1200)]
Bug 5917 : Fix for xgettext.pl

13 years agoBug 6171 Can't edit items
Frédéric Demians [Tue, 12 Apr 2011 07:02:38 +0000 (09:02 +0200)]
Bug 6171 Can't edit items

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>