koha.git
13 years agomark 3.2.0 release candidate - DBrev 3.01.00.999 v3.02.00-rc
Galen Charlton [Thu, 7 Oct 2010 01:26:58 +0000 (21:26 -0400)]
mark 3.2.0 release candidate - DBrev 3.01.00.999

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agodefer rotating collections
Galen Charlton [Thu, 7 Oct 2010 01:12:20 +0000 (21:12 -0400)]
defer rotating collections

Disabling rotating collections for 3.2.0 release; after more testing,
candidate for 3.4 as well as backport into 3.2.1.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agotranslator hack to avoid failure on opac-opensearch.tmpl
Galen Charlton [Thu, 7 Oct 2010 01:01:23 +0000 (21:01 -0400)]
translator hack to avoid failure on opac-opensearch.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofurther correction to the invocation of unzip
Galen Charlton [Wed, 6 Oct 2010 23:55:01 +0000 (19:55 -0400)]
further correction to the invocation of unzip

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoTighten system call to unzip
Ian Walls [Wed, 6 Oct 2010 20:25:19 +0000 (16:25 -0400)]
Tighten system call to unzip

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoadd explicit type to <input> elements missing it
Galen Charlton [Wed, 6 Oct 2010 21:43:28 +0000 (17:43 -0400)]
add explicit type to <input> elements missing it

Quells a warning from xt/author/translatable-templates.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agobug 4472: in a hackish fashion, quiet warnings about DOCTYPE in the XSLT
Galen Charlton [Wed, 6 Oct 2010 21:42:46 +0000 (17:42 -0400)]
bug 4472: in a hackish fashion, quiet warnings about DOCTYPE in the XSLT

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge branch 'translation' of git://git.workbuffer.org/git/koha into master
Galen Charlton [Wed, 6 Oct 2010 20:26:37 +0000 (16:26 -0400)]
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoUpdated spanish files
Chris Cormack [Wed, 6 Oct 2010 19:51:24 +0000 (08:51 +1300)]
Updated spanish files

13 years agoAnother fix for Bug 2704, 440 Display Issues
Owen Leonard [Tue, 13 Jul 2010 16:44:03 +0000 (12:44 -0400)]
Another fix for Bug 2704, 440 Display Issues

Removing the check for 490 @ind1=0 since the
alternative 8xx tag will not display anyway

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5284' into master
Galen Charlton [Wed, 6 Oct 2010 17:45:52 +0000 (13:45 -0400)]
Merge remote branch 'koha-fbc/k_bug_5284' into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5284 - Generic report covering various problems with the labels/patron card tests
Chris Nighswonger [Wed, 6 Oct 2010 17:41:34 +0000 (13:41 -0400)]
Bug 5284 - Generic report covering various problems with the labels/patron card tests

This patch removes a very incomplete test script which was really not even formed into
a test routine.

Note: In all probability, the labels tests could be adapted to test patroncards as well.

13 years agoMerge remote branch 'koha-fbc/k_bug_5284' into master
Galen Charlton [Wed, 6 Oct 2010 17:38:33 +0000 (13:38 -0400)]
Merge remote branch 'koha-fbc/k_bug_5284' into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5284 - Generic report covering various problems with the labels/patron card tests
Chris Nighswonger [Wed, 6 Oct 2010 17:33:16 +0000 (13:33 -0400)]
Bug 5284 - Generic report covering various problems with the labels/patron card tests

This patch fixes the C4::Labels::Template tests

13 years agoBug 5284 - Generic report covering various problems with the labels/patron card tests
Chris Nighswonger [Wed, 6 Oct 2010 17:28:18 +0000 (13:28 -0400)]
Bug 5284 - Generic report covering various problems with the labels/patron card tests

This patch fixes the C4::Labels::Profile tests

13 years agoBug 4472 Fix how &nbsp; are injected into XSL files
Frédéric Demians [Sun, 11 Jul 2010 15:53:21 +0000 (17:53 +0200)]
Bug 4472 Fix how &nbsp; are injected into XSL files

tmpl_process is patched to handle properly specific XML directives.
UNIMARC XSL files are modified to gain knowledge of HTML &nbsp; entity
which isn't the case by default. It may be necessary to do the same
thing for MARC21 XSL.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5284 - Generic report covering various problems with the labels/patron card tests
Chris Nighswonger [Wed, 6 Oct 2010 17:17:32 +0000 (13:17 -0400)]
Bug 5284 - Generic report covering various problems with the labels/patron card tests

This patch fixes the C4::Labels::Layout tests

13 years agoFollowup to Bug 4305: multiple ISBNS in biblioitems.isbn breaks patron
Ian Walls [Wed, 6 Oct 2010 16:46:26 +0000 (12:46 -0400)]
Followup to Bug 4305: multiple ISBNS in biblioitems.isbn breaks patron

This patch adds a scrub for ' | ' when the ISBN comes from the
biblioitems table, in the event that Koha has attempted to store
multiple ISBNs in the field.  The ISBN presented to Business::ISBN will
now be something it can handle.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofix invalid invocation of GetBranches in test case
Galen Charlton [Wed, 6 Oct 2010 16:54:05 +0000 (12:54 -0400)]
fix invalid invocation of GetBranches in test case

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5284 - Generic report covering various problems with the labels/patron card tests
Chris Nighswonger [Wed, 6 Oct 2010 16:52:55 +0000 (12:52 -0400)]
Bug 5284 - Generic report covering various problems with the labels/patron card tests

This patch fixes the C4::Labels::Batch tests

13 years agoBug 5013: Advanced patron search category pull down broken
Katrin Fischer [Thu, 16 Sep 2010 15:02:23 +0000 (11:02 -0400)]
Bug 5013: Advanced patron search category pull down broken

The pull down for category in patron's advanced search was only showing any and no patron categories.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agomore test case fixes
Galen Charlton [Wed, 6 Oct 2010 15:55:37 +0000 (11:55 -0400)]
more test case fixes

SQLHelper.t - clean up after itself better
Context.t - fix reporting of test plan

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agocleanup of DB-dependent fund test cases
Galen Charlton [Wed, 6 Oct 2010 15:13:07 +0000 (11:13 -0400)]
cleanup of DB-dependent fund test cases

* remove test that was adding a second active budget period,
  which was throwing off later tests
* updated to reflect current API

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofix typo/thinko in list test
Galen Charlton [Wed, 6 Oct 2010 14:55:44 +0000 (10:55 -0400)]
fix typo/thinko in list test

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agovarious improvements to t/db_dependent/VirtualShelves.t
Galen Charlton [Wed, 6 Oct 2010 14:39:57 +0000 (10:39 -0400)]
various improvements to t/db_dependent/VirtualShelves.t

* updated to reflect recent (and old) changes to the API
* corrected test plan
* adopted Test::More
* correctly handle and test functionality to not add duplicate
  bibs to a list

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoremoved AddToShelfFromBiblio from C4::VirtualShelves
Galen Charlton [Wed, 6 Oct 2010 14:38:09 +0000 (10:38 -0400)]
removed AddToShelfFromBiblio from C4::VirtualShelves

Back in the day, lists could contain item records instead or in addition
to bibs, but that hasn't been the case for a while.  Therefore, removed
AddToShelfFromBiblio, which does exactly the same thing that AddToShelf does.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofix test plan and false test errors in Search.t
Galen Charlton [Wed, 6 Oct 2010 13:51:55 +0000 (09:51 -0400)]
fix test plan and false test errors in Search.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofix test plan for SQLHelper.t
Galen Charlton [Wed, 6 Oct 2010 13:44:18 +0000 (09:44 -0400)]
fix test plan for SQLHelper.t

Also removed incorrect comments about test case numbers - we should
just let Test::More number them.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 2377 - Review tags: format date according to system preference
Owen Leonard [Tue, 17 Aug 2010 13:01:58 +0000 (09:01 -0400)]
Fix for Bug 2377 - Review tags: format date according to system preference

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge branch 'test_cases' of /home/koha/koha1/dev into to-push
Galen Charlton [Wed, 6 Oct 2010 13:23:42 +0000 (09:23 -0400)]
Merge branch 'test_cases' of /home/koha/koha1/dev into to-push

13 years agofix typo in INSTALL.debian
Galen Charlton [Wed, 6 Oct 2010 13:20:10 +0000 (09:20 -0400)]
fix typo in INSTALL.debian

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agouse Test::More for t/Koha.t
Galen Charlton [Wed, 6 Oct 2010 13:15:36 +0000 (09:15 -0400)]
use Test::More for t/Koha.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5100, Incorrect link to System Preferences
Owen Leonard [Fri, 6 Aug 2010 19:03:12 +0000 (15:03 -0400)]
Fix for Bug 5100, Incorrect link to System Preferences

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5156 - JavaScript error when adding list
Owen Leonard [Thu, 19 Aug 2010 14:53:44 +0000 (10:53 -0400)]
Fix for Bug 5156 - JavaScript error when adding list

JavaScript referenced nonexistent form name

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agofixes bug 4385
Ian Walls [Tue, 10 Aug 2010 06:47:59 +0000 (08:47 +0200)]
fixes bug 4385

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5264 (Retain additional bibliographic subfields when merging authorities) [for...
Marcel de Rooy [Thu, 30 Sep 2010 08:03:16 +0000 (08:03 +0000)]
Bug 5264 (Retain additional bibliographic subfields when merging authorities) [for master only]

The current code in AuthoritiesMarc.pm rewrites all subfields from the report
tag in the authority record to fields in related bibliographic records when
merging authorities. Additional subfields in the biblio records (e.g. relator
code or term) are lost in the process.

This patch retains the original algorithm but restores the additional subfields
from the original biblio record when rewriting the linked marc fields.

The problem also exists in 3.0. Two separate patches have been submitted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFixing non placeholder sql in UpdateGuarantees
Chris Cormack [Sun, 1 Aug 2010 09:29:58 +0000 (21:29 +1200)]
Fixing non placeholder sql in UpdateGuarantees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5089: Add German translation of borrowerRelationship and BorrowersTitles values
Katrin Fischer [Wed, 4 Aug 2010 16:12:48 +0000 (18:12 +0200)]
Bug 5089: Add German translation of borrowerRelationship and BorrowersTitles values

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5093 - JavaScript error in IE8 when choosing authority record
Owen Leonard [Thu, 5 Aug 2010 19:55:01 +0000 (15:55 -0400)]
Fix for Bug 5093 - JavaScript error in IE8 when choosing authority record

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5092: No results when searching by LC Call Number: in Z39.50 Server
Katrin Fischer [Sun, 8 Aug 2010 19:19:41 +0000 (21:19 +0200)]
Bug 5092: No results when searching by LC Call Number: in Z39.50 Server

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 2947, value_builder scripts using authnotrequired
Owen Leonard [Tue, 17 Aug 2010 13:29:25 +0000 (09:29 -0400)]
Fix for Bug 2947, value_builder scripts using authnotrequired

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 3630 Impossible to perform Scan Indexes search
Frédéric Demians [Wed, 25 Aug 2010 07:51:21 +0000 (09:51 +0200)]
Bug 3630 Impossible to perform Scan Indexes search

This is a quick fix. The way scan indexes performs should be improved in
3.4. There are several issues:

  - No paging
  - The interface is the same as for biblio records search result and so
    is unusable: for example you have a button to place a hold or you
    can sort by Popularity which is irrelevant for index terms.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoAvoid to add a warning in log
Frédéric Demians [Tue, 31 Aug 2010 17:45:38 +0000 (19:45 +0200)]
Avoid to add a warning in log

... each time GetMemberDetails function is called

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 4849 - Cannot delete records from Labeled MARC view
Owen Leonard [Wed, 25 Aug 2010 18:36:20 +0000 (14:36 -0400)]
Fix for Bug 4849 - Cannot delete records from Labeled MARC view

The template checks for a "count" variable (item count) to see
whether it should allow deletion of the biblio record. For some
reason labeledMARCdetail.pl hard-coded this as 1, which meant
the template always thought was 1 item.

This patch also adds an item count check on the display of
"Delete all items," disabling it if there are no items.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5054 - allow the resulting .deb location to be specified
Robin Sheat [Thu, 22 Jul 2010 03:37:51 +0000 (15:37 +1200)]
Bug 5054 - allow the resulting .deb location to be specified

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5139 - packages now do email and other cron jobs
Robin Sheat [Mon, 30 Aug 2010 23:48:20 +0000 (11:48 +1200)]
Bug 5139 - packages now do email and other cron jobs

By default the packages now set up the cron jobs to handle things like
overdues and email etc. By default, email is off, 'koha-email-enable'
and 'koha-email-disable' can manage this.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5116 – Duplicate and missing entries in "apt-get-debian-lenny.sh"
Ricardo Dias Marques [Wed, 11 Aug 2010 17:31:53 +0000 (17:31 +0000)]
Fix for Bug 5116 – Duplicate and missing entries in "apt-get-debian-lenny.sh"

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

In the Debian installer shell script for Debian Lenny -
"apt-get-debian-lenny.sh"  - there were 2 missing lines for packages
that exist for Debian Lenny and that have versions that satisfy the
requirements of the Koha Installer, listed in the "PerlDependencies.pm"
file - located at "C4/Installer/PerlDependencies.pm".

The two missing lines are for "libnet-server-perl" (for the
"Net::Server" module) and "libpdf-table-perl" (for the "PDF::Table"
module).

I also noticed, in that same "apt-get-debian-lenny.sh" script, that
there were some duplicate (repeated) entries / lines for other modules,
namely: libdate-calc-perl, libdbd-mysql-perl, libemail-date-perl,
libgd-barcode-perl, libhtml-scrubber-perl, liblingua-stem-perl,
libmail-sendmail-perl, libmime-lite-perl, libnet-ldap-perl
and libpoe-perl.

So I'm adding, in this patch, the 2 missing lines
and removing the duplicate lines / entries.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoUpdate VOKAL icon set
Ian Walls [Fri, 20 Aug 2010 17:02:24 +0000 (13:02 -0400)]
Update VOKAL icon set

The Green Mountain Library Consortium has updated the 'vokal' item type
image set to include new and updated icons, including:
Puzzles and Games
BLURAY
Hardware
Educational Media
Fiction, Nonfiction, New and Holiday books
ILL materials

Smaller versions of all the icons (32 px) are included as well.

Sorting of the icons has been included in this patch to group
large and small versions of these icons together, as well as make large
icon sets easier to visually scan (the 'bridge' set benefits from this,
as well) .

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 4922 - Item display tries to show serial info for titles with series...
Owen Leonard [Tue, 7 Sep 2010 14:59:52 +0000 (16:59 +0200)]
Fix for Bug 4922 - Item display tries to show serial info for titles with series tags

Removing check for "is this a serial record" when displaying enumchron
information. This check evaluates as true for all biblio records which
have a series title, so it's an inaccurate determiner of whether
enumchron information should be displayed. The script already
checks for the presence of enumchron data, so that will display
anyway if it exists.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoUpdate VOKAL icon set
Nicole Engard [Tue, 7 Sep 2010 19:47:08 +0000 (15:47 -0400)]
Update VOKAL icon set

follow up patch to Ian's August 20th patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5217 : package/CPAN updates for Ubuntu Lucid install
Eric Olsen [Sun, 12 Sep 2010 03:34:59 +0000 (22:34 -0500)]
Bug 5217 : package/CPAN updates for Ubuntu Lucid install

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5207 - Details on editing SAX Parser ini file.
Eric Olsen [Thu, 9 Sep 2010 02:04:25 +0000 (21:04 -0500)]
Bug 5207 - Details on editing SAX Parser ini file.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5200 - ubuntu.packages file installs CVS Removed 'install cvs' line from ubuntu...
Eric Olsen [Mon, 6 Sep 2010 00:21:41 +0000 (19:21 -0500)]
Bug 5200 - ubuntu.packages file installs CVS Removed 'install cvs' line from ubuntu.packages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoRemoving outdated note about z3950search in the help file, no longer applicable
Chris Cormack [Mon, 9 Aug 2010 22:45:14 +0000 (10:45 +1200)]
Removing outdated note about z3950search in the help file, no longer applicable

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5077 - ensure rebuild_zebra will run somewhere it can read
Robin Sheat [Tue, 24 Aug 2010 04:28:48 +0000 (16:28 +1200)]
Bug 5077 - ensure rebuild_zebra will run somewhere it can read

This prevents it leaving files lying around in /tmp

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoShifting the tests that need user input to their own directory, they cant be used...
Chris Cormack [Sat, 4 Sep 2010 06:07:13 +0000 (18:07 +1200)]
Shifting the tests that need user input to their own directory, they cant be used by the automated tester

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFixing the VirtualShelves test
Chris Cormack [Sat, 4 Sep 2010 07:59:25 +0000 (19:59 +1200)]
Fixing the VirtualShelves test

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFixing C4::Boolean tests, in August 2009 we changed the die to a warn, tests didn...
Chris Cormack [Sat, 4 Sep 2010 08:51:50 +0000 (20:51 +1200)]
Fixing C4::Boolean tests, in August 2009 we changed the die to a warn, tests didn't reflect this. Now we should have 100% of C4::Boolean

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5032 Remove duplicate code
Colin Campbell [Sun, 18 Jul 2010 16:05:55 +0000 (17:05 +0100)]
Bug 5032 Remove duplicate code

Two duplicate calls to GetSerials appear to have been merged in
to no purpose other than to generate warnings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5047 html option not in -help output
Colin Campbell [Wed, 21 Jul 2010 08:27:34 +0000 (09:27 +0100)]
Bug 5047 html option not in -help output

Add -html option to list in pod so that it shows up
in output of help

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5160 Stop words should be stop words not strings
Colin Campbell [Mon, 23 Aug 2010 12:04:29 +0000 (13:04 +0100)]
Bug 5160 Stop words should be stop words not strings

Stop words in the default zebra config were being defined as
initial strings not as words causing then to truncate legitimate
headings.

This patch corrects that behaviour. It does not address the
question of what should be in the default file

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agobug 5086: fix setting claim date
Galen Charlton [Wed, 6 Oct 2010 11:43:15 +0000 (07:43 -0400)]
bug 5086: fix setting claim date

Also removed a locus for SQL injection.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5101, Creators tab isn't highlighted when selected
Owen Leonard [Thu, 9 Sep 2010 16:43:39 +0000 (12:43 -0400)]
Fix for Bug 5101, Creators tab isn't highlighted when selected

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5215' into master
Galen Charlton [Wed, 6 Oct 2010 11:12:25 +0000 (07:12 -0400)]
Merge remote branch 'koha-fbc/k_bug_5215' into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5247' into to-push
Galen Charlton [Wed, 6 Oct 2010 11:11:02 +0000 (07:11 -0400)]
Merge remote branch 'koha-fbc/k_bug_5247' into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5249' into to-push
Galen Charlton [Wed, 6 Oct 2010 11:10:27 +0000 (07:10 -0400)]
Merge remote branch 'koha-fbc/k_bug_5249' into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agobug_5245 Fix SQL syntax in GetItems
Colin Campbell [Thu, 23 Sep 2010 16:04:28 +0000 (17:04 +0100)]
bug_5245 Fix SQL syntax in GetItems

Routine never executed query due to syntax error
and returned undef
made the call to fetchrow_array explicit as the old fetchrow alias
is no longer documented in perldoc DBI

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5203' into master
Galen Charlton [Wed, 6 Oct 2010 11:04:11 +0000 (07:04 -0400)]
Merge remote branch 'koha-fbc/k_bug_5203' into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFixes bug 5231: bad call to GetAuthType in BiblioAddAuthorities()
Ian Walls [Sat, 25 Sep 2010 16:17:31 +0000 (12:17 -0400)]
Fixes bug 5231: bad call to GetAuthType in BiblioAddAuthorities()

If systempreference BiblioAddsAuthorities is on, this could lead to error messages when trying to add records
to a basket from an external source.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix compile time warning in member.pl
Colin Campbell [Mon, 27 Sep 2010 09:59:25 +0000 (10:59 +0100)]
Fix compile time warning in member.pl

variable to declared twice

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMissed adding the beta release
Chris Cormack [Fri, 1 Oct 2010 02:39:02 +0000 (15:39 +1300)]
Missed adding the beta release

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoUpdating history doc
Chris Cormack [Fri, 1 Oct 2010 02:39:01 +0000 (15:39 +1300)]
Updating history doc

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5090: New order from empty record does not save publication year and ISBN
Katrin Fischer [Sun, 8 Aug 2010 15:23:55 +0000 (17:23 +0200)]
Bug 5090: New order from empty record does not save publication year and ISBN

- make publication year save for MARC21
- make ISBN save
- fix small template issue with label for vendor note

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoRevert "Bug 5081 - let the ISBN be saved on new manual orders"
Galen Charlton [Wed, 6 Oct 2010 10:49:13 +0000 (06:49 -0400)]
Revert "Bug 5081 - let the ISBN be saved on new manual orders"

Reverting in favor of a more comprehensive patch.

This reverts commit 4bd749251893e680a166b7cf31cd6e0d24b443fc.

13 years agoMerge branch 'translation' of git://git.workbuffer.org/git/koha into master
Galen Charlton [Wed, 6 Oct 2010 10:31:43 +0000 (06:31 -0400)]
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug: 4904: Problem with printing fines in overdue notices
Katrin Fischer [Tue, 14 Sep 2010 08:38:24 +0000 (20:38 +1200)]
Bug: 4904: Problem with printing fines in overdue notices

my $formatted_fine = currency_format("$1", "$fine", FMT_SYMBOL);
is already utf-8.

Resend with additional change, removing 2 lines (no strict, use strict) from the code.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 2664: Add item should preselect logged in branch
Colin Campbell [Tue, 5 Oct 2010 11:48:25 +0000 (07:48 -0400)]
Bug 2664: Add item should preselect logged in branch

An earlier fix to stop branch values being overwritten in
edit items was causing the branch value to be unset when adding items

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5265, error message on lists is misleading
Owen Leonard [Mon, 4 Oct 2010 15:11:11 +0000 (11:11 -0400)]
Fix for Bug 5265, error message on lists is misleading

The check to see if an item exists always evaluates as true.
Correcting this lets the script handle the error as it
was designed to.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5081 - let the ISBN be saved on new manual orders
Robin Sheat [Thu, 16 Sep 2010 12:11:35 +0000 (08:11 -0400)]
Bug 5081 - let the ISBN be saved on new manual orders

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5201 Patron surname dropped
Frédéric Demians [Thu, 16 Sep 2010 12:37:38 +0000 (08:37 -0400)]
Bug 5201 Patron surname dropped

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for Bug 5222 - 600 t not showing with xslt on
Owen Leonard [Thu, 16 Sep 2010 14:29:29 +0000 (10:29 -0400)]
Fix for Bug 5222 - 600 t not showing with xslt on

Original commit message was for 650 field, but fix works for 600.  See bug report.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 4305 Get Amazon book covers for ISBN13
Frédéric Demians [Sat, 25 Sep 2010 14:47:18 +0000 (10:47 -0400)]
Bug 4305 Get Amazon book covers for ISBN13

The way Koha get book cover from Amazon doesn't work from biblio records
having ISBN13 because Amazon expect an ISBN10. This patch transforms
ISBN13 into ISBN10 before sending it to Amazon.

Warning! On some devel installations, you will have to install by hand a
new CPAN depency:

  Business::ISBN

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5187: Show place of publication (MARC21, 260$c), XSLT
Katrin Fischer [Wed, 29 Sep 2010 01:26:14 +0000 (21:26 -0400)]
Bug 5187: Show place of publication (MARC21, 260$c), XSLT

Show place of puplication in
- OPAC result list
- OPAC detail
- staff detail

The normal display does already show the place of publication, but it's missing from the XSLT controlled displays.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix Bug 5261 broken link in Local Use sysprefs
Jared Camins-Esakov [Wed, 29 Sep 2010 08:13:14 +0000 (21:13 +1300)]
Fix Bug 5261 broken link in Local Use sysprefs

This patch eliminates the sysprefs-menu.inc include file and changes the
systempreferences.pl and systempreferences.tmpl files to work with the
prefs-menu.inc instead. This will centralize the syspref tabs and make it
easier to modify tabs in the future if necessary.

This commit also changes the default tab to Acquisitions, since the Local Use
tab does not work with preferences.pl at present.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoAdd 3 more links to Ohloh to about page
Katrin Fischer [Thu, 30 Sep 2010 21:36:14 +0000 (17:36 -0400)]
Add 3 more links to Ohloh to about page

- Markus Enger (asked for permission)
- Jared Camins-Esakov (asked for permission)
- Katrin Fischer

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5194 - Patron notification on new issues not working
Katrin Fischer [Tue, 5 Oct 2010 19:53:49 +0000 (08:53 +1300)]
Bug 5194 - Patron notification on new issues not working

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoFix for syntax error in the spanish opac file
Chris Cormack [Wed, 6 Oct 2010 10:11:50 +0000 (23:11 +1300)]
Fix for syntax error in the spanish opac file

13 years agoBug 4867 - cannot clone subfields in marc editor, other clone/unclone weirdness
Chris Nighswonger [Tue, 14 Sep 2010 15:02:42 +0000 (11:02 -0400)]
Bug 4867 - cannot clone subfields in marc editor, other clone/unclone weirdness

When the clone/unclone plus/minus were replaced with images the <span> tags were inadvertantly deleted
causing the js to loose its ability to identify the clone/unclone links and properly udpate the indexes.
The resulting incorrect indexes caused various weirdnesses to result when one attempted to clone/unclone
subfields.

This patch simply adds classes to the two links and updates the js to identify the links based on class.

Thanks to owen for his help in chasing this down.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoLanguage updates
Chris Cormack [Wed, 6 Oct 2010 10:03:21 +0000 (23:03 +1300)]
Language updates

13 years agoBug 5191 Patron notification was being reset to none
Colin Campbell [Mon, 13 Sep 2010 23:15:22 +0000 (01:15 +0200)]
Bug 5191 Patron notification was being reset to none

The value of the letter variable was not being correctly passed
to the edit template instead it was reset to none
Also compressed some verbage from letter_loop generation
(if you want a scalar use one)
removed an unused $count variable (?!)
and put a couple of lone )s back on the line they came from

Resend to remove wrong utf-9 header.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMore language updates
Chris Cormack [Mon, 20 Sep 2010 20:09:25 +0000 (08:09 +1200)]
More language updates

13 years agoBug 4310 Map orders to new budget structure
Colin Campbell [Mon, 6 Sep 2010 14:07:36 +0000 (15:07 +0100)]
Bug 4310 Map orders to new budget structure

Map orders to newly created budgets
creates a temporary file fundmapping
which is not dropped so that conversion can be
checked subsequently

As acquisitions historically let you do some odd things
with dates and funds. This probably needs close checking
if you are converting active data

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5205 Fix compile time warnings in tools/batchMod.pl
Colin Campbell [Wed, 8 Sep 2010 13:30:15 +0000 (14:30 +0100)]
Bug 5205 Fix compile time warnings in tools/batchMod.pl

$dbh was declared twice
prototypes used in a subroutine that was not declared before use

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agobug 4084: remove \r from header line for sake of consistency
Galen Charlton [Wed, 29 Sep 2010 22:18:16 +0000 (18:18 -0400)]
bug 4084: remove \r from header line for sake of consistency

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years ago(bug #4084) fix offline circ
Nahuel ANGELINETTI [Mon, 1 Feb 2010 11:31:35 +0000 (12:31 +0100)]
(bug #4084) fix offline circ

this add the function C4::Circulation::GetOpenIssue and delete \r chars when processing koc files.

Cherry picked from 3.0.x commit 5af80ab

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5183' into to-push
Galen Charlton [Tue, 28 Sep 2010 13:09:01 +0000 (09:09 -0400)]
Merge remote branch 'koha-fbc/k_bug_5183' into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoMerge remote branch 'koha-fbc/k_bug_5182' into to-push
Galen Charlton [Tue, 28 Sep 2010 13:08:48 +0000 (09:08 -0400)]
Merge remote branch 'koha-fbc/k_bug_5182' into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
13 years agoBug 5249 - Guide boxes do not print when selected for a layout
Chris Nighswonger [Fri, 24 Sep 2010 18:41:32 +0000 (14:41 -0400)]
Bug 5249 - Guide boxes do not print when selected for a layout

13 years agoBug 5247 - Text does not wrap properly on labels
Chris Nighswonger [Fri, 24 Sep 2010 14:48:24 +0000 (10:48 -0400)]
Bug 5247 - Text does not wrap properly on labels

The apparent fix is to have the text wrap alogrithm to calculate based
on a label width reduced by approx. 3/16" when there is no left text margin.

This is probably not the proper fix as it appears that this algorithm is being
affected by adjustments in the label width for label creep and perhaps offset
as well. But this does fix the symptom and is all the time available for this
problem at present.

Documentation Changes:

It might be good to add a note to the effect that if the user does not supply
a left text margin in the layout, a 3/16" (13.5 point) left text margin will
apply by default.

13 years agoBug 5203 - Creating a label template causes fatal error if description field is empty
Chris Nighswonger [Thu, 23 Sep 2010 17:52:40 +0000 (13:52 -0400)]
Bug 5203 - Creating a label template causes fatal error if description field is empty

This is due to the underlying script not having any defaults hard coded which results
in skewed hash elements when the parameter array is coerced into a hash at a later point.

This also occurs in layouts and profiles. This patch adds defaults to all three.

No documentation changes are necessary.