wip/koha-chris_n.git
10 years agoMerge commit 'kc/master'
Chris Cormack [Thu, 24 Jun 2010 22:43:18 +0000 (10:43 +1200)]
Merge commit 'kc/master'

Conflicts:
docs/history.txt

10 years ago(MT2371) basket.tmpl, in basket details, change Open on => Opened on
Alex Arnaud [Thu, 24 Jun 2010 17:26:11 +0000 (19:26 +0200)]
(MT2371) basket.tmpl, in basket details, change Open on => Opened on

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years ago(BUG #4356) Basket.pl: adding a link to the basketgroup
Alex Arnaud [Thu, 24 Jun 2010 17:26:12 +0000 (19:26 +0200)]
(BUG #4356) Basket.pl: adding a link to the basketgroup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years ago(BUG #4521) aqbudgets.pl - Transform undefined budget spent value to 0.00 value
Alex Arnaud [Thu, 24 Jun 2010 17:26:14 +0000 (19:26 +0200)]
(BUG #4521) aqbudgets.pl - Transform undefined budget spent value to 0.00 value

This patch tranform the undefined value of budget spent to a money value which equals 0.00.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoSelect in budget add forum
Jean-André Santoni [Thu, 24 Jun 2010 17:26:13 +0000 (19:26 +0200)]
Select in budget add forum

Sorted the branches select.
Modified display to "branchcode - branchname"
Fixed a bug, selection was inverted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4905 Runtime errors in about.pl
Colin Campbell [Thu, 24 Jun 2010 14:57:21 +0000 (15:57 +0100)]
Bug 4905 Runtime errors in about.pl

Calls to VERSION were generating errors when called on a string.
Use a bit of sleight of hand to avoid this
Added a couple of tests on Installer/PerlModules
Module needs better coverage testing (esp on newer perls)
Sorted to list of modules to make koha_perl_deps.pl more
human-friendly

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agofix two broken calls to _FixPriority
Galen Charlton [Tue, 23 Feb 2010 20:09:46 +0000 (15:09 -0500)]
fix two broken calls to _FixPriority

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 3344: display in-transit status on holds priority list
Galen Charlton [Mon, 22 Feb 2010 03:22:43 +0000 (22:22 -0500)]
bug 3344: display in-transit status on holds priority list

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4224: explicitly mark hold requests as being handled by item in transit
Galen Charlton [Mon, 22 Feb 2010 02:49:09 +0000 (21:49 -0500)]
bug 4224: explicitly mark hold requests as being handled by item in transit

This patch defines a new values of reserves.found, 'T', to indicate that
an item has been allocated to fill a hold request and is currently
in transit from one branch to another.  This explicit value is meant
to filter out hold requests from processing by holds queue batch
job.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4532, Use include file for bibliodefaultview logic
Owen Leonard [Wed, 19 May 2010 15:47:37 +0000 (11:47 -0400)]
Fix for Bug 4532, Use include file for bibliodefaultview logic

Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4821, With multiple 5XX fields, the font display gets progressively smaller
Owen Leonard [Thu, 27 May 2010 19:53:41 +0000 (15:53 -0400)]
Fix for Bug 4821, With multiple 5XX fields, the font display gets progressively smaller

Prevent the generation of empty label spans for various
bib details fields.  A construct like

<span class="results_summary"><span class="label" />contents note</span>

is consistently misinterpreted in many web browsers, leading to
CSS oddities.  See the bug for more details.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoPartial fix for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
Owen Leonard [Fri, 28 May 2010 18:50:30 +0000 (14:50 -0400)]
Partial fix for Bug 4423, Staff Client XSLT is just a copy of the OPAC one

This patch improves the template logic specifying a layout
based on whether the display is XSLT or normal, and whether
Amazon Content is on or off. Previously XSLT view did not
display Amazon covers when enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMore fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
Owen Leonard [Wed, 2 Jun 2010 19:17:37 +0000 (15:17 -0400)]
More fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one

- Adding material type icons from the OPAC side
- Adding OPAC View link
- Copying revised handling of MU from the OPAC
- Removing OPAC-specific markup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFollowup fix for Bug 4453: Removing invalid template fragment.
Owen Leonard [Fri, 4 Jun 2010 14:53:20 +0000 (10:53 -0400)]
Followup fix for Bug 4453: Removing invalid template fragment.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4278, canceling vendor add refreshes wrong
Owen Leonard [Fri, 4 Jun 2010 16:49:19 +0000 (12:49 -0400)]
Fix for Bug 4278, canceling vendor add refreshes wrong

Patch corrected to follow HDL's suggestion that link check
for existing vendor id and conditionally redirect based
on that.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3895 - Menu on left of Contracts is for Admin Pages
Owen Leonard [Tue, 8 Jun 2010 19:16:30 +0000 (15:16 -0400)]
Fix for Bug 3895 - Menu on left of Contracts is for Admin Pages

- Also adding cancel link to the add/edit view
- Also adding message when there are no contracts to list

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4886, missing 404 redirection on wrong biblionumber for MARC and ISBD...
Owen Leonard [Thu, 10 Jun 2010 17:28:28 +0000 (13:28 -0400)]
Fix for Bug 4886, missing 404 redirection on wrong biblionumber for MARC and ISBD details

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4884, opac-showmarc.pl can't find compact.xsl
Owen Leonard [Thu, 10 Jun 2010 17:09:14 +0000 (13:09 -0400)]
Fix for Bug 4884, opac-showmarc.pl can't find compact.xsl

This patch implements Fridolyn SOMERS' suggested change
to the .xsl file path but copies compact.xsl from the
intranet template dir and points to that instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4859, Formatting cleanup for merge biblio record interface
Owen Leonard [Tue, 8 Jun 2010 19:43:35 +0000 (15:43 -0400)]
Fix for Bug 4859, Formatting cleanup for merge biblio record interface

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4869 - Non-staff patrons logging into the OPAC don't have option to place...
Owen Leonard [Thu, 10 Jun 2010 18:14:26 +0000 (14:14 -0400)]
Fix for Bug 4869 - Non-staff patrons logging into the OPAC don't have option to place holds from Public Lists

The template was originally designed so that form controls were
hidden from users who didn't have permission to modify a particular
shelf  because the form controls were only used for deleting from
lists. Now that users can place holds and add tags via the check-
boxes, the controls must be available to all users.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug3916 : Batch Modify tool overwrites branches fields
Henri-Damien LAURENT [Wed, 23 Jun 2010 16:15:49 +0000 (18:15 +0200)]
Bug3916 : Batch Modify tool overwrites branches fields

This was owed to the Item modification construction and the change in GetBranchesLoop behaviour which selects the user branch by default.
Adding a void branch selected
Changing default value to ""

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4474 swap options for sys pref singleBranchMode
Katrin Fischer [Tue, 22 Jun 2010 05:22:54 +0000 (07:22 +0200)]
Bug 4474 swap options for sys pref singleBranchMode

Resend with corrected spelling.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4902: Add missing b_phone and b_email to borrower details
Katrin Fischer [Mon, 21 Jun 2010 21:09:41 +0000 (23:09 +0200)]
Bug 4902: Add missing b_phone and b_email to borrower details

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4900: add in missing value for usedaysmode pref
Nicole Engard [Mon, 21 Jun 2010 14:32:21 +0000 (10:32 -0400)]
bug 4900: add in missing value for usedaysmode pref

The usedaysmode preference was missing the option to
calculate due date by finding the next open date on the
calendar instead of ignoring all days the library is
closed.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4897: Invalid XHTML in opac-userupdate.tmpl.
Garry Collum [Mon, 21 Jun 2010 01:50:50 +0000 (21:50 -0400)]
Bug 4897: Invalid XHTML in opac-userupdate.tmpl.

Removes several duplicate name tags.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agofixes to xt/sysprefs.t test case
Galen Charlton [Sat, 19 Jun 2010 19:56:07 +0000 (15:56 -0400)]
fixes to xt/sysprefs.t test case

* use root of source tree as base directory
* ignore case when comparing system preference codes;
  at present this is also case-insenstive in the database
* added German sysprefs file
* corrected paths to Russian and Ukrainian system preference files

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agofixed permissions for item batch deletion and modification for French
Galen Charlton [Sat, 19 Jun 2010 19:51:25 +0000 (15:51 -0400)]
fixed permissions for item batch deletion and modification for French

Solves bug where granular permissions for batch deletion and modification
would not work correction for a fresh installation using the French
translation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agofixed problems in xt/permissions.t test case
Galen Charlton [Sat, 19 Jun 2010 19:48:28 +0000 (15:48 -0400)]
fixed problems in xt/permissions.t test case

* now looks for permissions SQL files in the current
  source tree, not in intranetdir; tests in xt/ and
  t/ are meant to be run without requiring a full Koha
  installation
* added path to German
* fixed paths to permissions SQL for Russian and Ukrainian
* handles case where SQL script contains more than just
  inserts into to permissions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4895: Add missing granular permissions
Katrin Fischer [Sat, 19 Jun 2010 13:20:15 +0000 (15:20 +0200)]
Bug 4895: Add missing granular permissions

Add missing granular permissions for serials to userpermissons.sql
de-DE, pl-PL

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoset DBversion to 139
Galen Charlton [Sat, 19 Jun 2010 13:03:45 +0000 (09:03 -0400)]
set DBversion to 139

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 3682: change message_attributes.message_name from varchar(20) to varchar(40)
Katrin Fischer [Thu, 17 Jun 2010 21:51:40 +0000 (23:51 +0200)]
Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4868 - Improve controls for cloning and deleting MARC subfields
Owen Leonard [Wed, 9 Jun 2010 18:46:37 +0000 (14:46 -0400)]
Fix for Bug 4868 - Improve controls for cloning and deleting MARC subfields

Changes "+" and "-" controls to actively linked images giving
better feedback about their clickability and an increased click
target area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoPage structure correction, helps Bug 3850 (Page Need Design Work)
Owen Leonard [Tue, 8 Jun 2010 16:03:00 +0000 (12:03 -0400)]
Page structure correction, helps Bug 3850 (Page Need Design Work)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFixes bug 3619: _send_message_by_email not respecting AutoEmailPrimaryAddress = ...
Ian Walls [Mon, 14 Jun 2010 14:26:09 +0000 (14:26 +0000)]
Fixes bug 3619: _send_message_by_email not respecting AutoEmailPrimaryAddress = 'OFF'

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBUG 4883: Staff - remove \n from strings for translation
Katrin Fischer [Thu, 17 Jun 2010 19:51:22 +0000 (21:51 +0200)]
BUG 4883: Staff - remove \n from strings for translation

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4833: OPAC - remove \n from strings for translation
Katrin Fischer [Thu, 17 Jun 2010 19:51:21 +0000 (21:51 +0200)]
Bug 4833: OPAC - remove \n from strings for translation

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4895: Add missing granular permissions to ru-RU, uk-UA
Katrin Fischer [Thu, 17 Jun 2010 20:46:47 +0000 (22:46 +0200)]
Bug 4895: Add missing granular permissions to ru-RU, uk-UA

Files are different from en files, combining userpermissions.sql and userflags.sql.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4895: Add missing granular permissions to de-DE, pl-PL
Katrin Fischer [Thu, 17 Jun 2010 20:46:46 +0000 (22:46 +0200)]
Bug 4895: Add missing granular permissions to de-DE, pl-PL

Added missing permissions, files are translations of en.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBut 4890: Fixes invalid XHTML in basket.tmpl
Garry Collum [Sat, 12 Jun 2010 15:50:38 +0000 (11:50 -0400)]
But 4890: Fixes invalid XHTML in basket.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4889: Fixes minor XHTML error in booksellers.tmpl.
Garry Collum [Sat, 12 Jun 2010 03:02:17 +0000 (23:02 -0400)]
Bug 4889: Fixes minor XHTML error in booksellers.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4827: Fixes library drop-down list in aqbudgets.tmpl
Garry Collum [Fri, 11 Jun 2010 01:53:56 +0000 (21:53 -0400)]
Bug 4827: Fixes library drop-down list in aqbudgets.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4896: granular permissions now always on (DB rev 138)
Galen Charlton [Sat, 19 Jun 2010 11:53:59 +0000 (07:53 -0400)]
bug 4896: granular permissions now always on (DB rev 138)

Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha.  This patch removes
the GranularPermissions system preference.

[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFollow up patch, removing missed conflict marker
Chris Cormack [Wed, 16 Jun 2010 04:42:14 +0000 (16:42 +1200)]
Follow up patch, removing missed conflict marker

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoCherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the...
Chris Cormack [Wed, 16 Jun 2010 04:38:31 +0000 (16:38 +1200)]
Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Conflicts:

installer/data/mysql/en/mandatory/userpermissions.sql
installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
installer/data/mysql/updatedatabase30.pl
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
serials/member-search.pl
serials/serials-edit.pl
serials/subscription-add.pl
serials/subscription-bib-search.pl
serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMissing indexes and a missing column
Chris Cormack [Sat, 19 Jun 2010 08:14:22 +0000 (20:14 +1200)]
Missing indexes and a missing column

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMissing tables in the kohastructure.sql table.
Chris Cormack [Sat, 19 Jun 2010 08:02:29 +0000 (20:02 +1200)]
Missing tables in the kohastructure.sql table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoChanging <p> to <span> per gmcharlt's suggestion re: Adding <p class="noholdstext...
Liz Rea [Wed, 9 Jun 2010 18:27:35 +0000 (13:27 -0500)]
Changing <p> to <span> per gmcharlt's suggestion re: Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAdding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for...
Liz Rea [Wed, 26 May 2010 19:28:47 +0000 (14:28 -0500)]
Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.

A later patch might come that changes the text entirely, as it does not match the OPAC, and is often confusing for staff.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4472 - Missing / in img tags breaking xslt (and other img tags)
Chris Cormack [Mon, 14 Jun 2010 22:01:54 +0000 (10:01 +1200)]
Bug 4472 - Missing / in img tags breaking xslt (and other img tags)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoUpdated history file, 2 more committers
Chris Cormack [Tue, 15 Jun 2010 05:25:32 +0000 (17:25 +1200)]
Updated history file, 2 more committers

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix depreciation warnings in acqui/z3950_search.pl
Colin Campbell [Tue, 15 Jun 2010 17:42:18 +0000 (18:42 +0100)]
Fix depreciation warnings in acqui/z3950_search.pl

Perl generates depreciation warnings on compilation
caused by use of ambiguous syntax. Seemed that an
underlying confusion as to row's type

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4472 - Missing / in img tags breaking xslt (and other img tags)
Chris Cormack [Mon, 14 Jun 2010 21:59:40 +0000 (09:59 +1200)]
Bug 4472 - Missing / in img tags breaking xslt (and other img tags)

10 years agoMerge commit 'kc/master'
Chris Cormack [Sun, 13 Jun 2010 21:15:00 +0000 (09:15 +1200)]
Merge commit 'kc/master'

10 years agoBug 2789 Fix UNIMAC leader plugin
Frédéric Demians [Fri, 4 Jun 2010 15:04:18 +0000 (17:04 +0200)]
Bug 2789 Fix UNIMAC leader plugin

The plugin was returning a 25 characters length leader rather than 24
characters. So leader was recreated automatically, removing user update,
before writing biblio record.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years ago(bug #4853) change rights needed to renew loans
Nahuel ANGELINETTI [Mon, 7 Jun 2010 09:09:19 +0000 (11:09 +0200)]
(bug #4853) change rights needed to renew loans

Use "circulate" right, instead of "borrower".

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 2505: Enabled warnings in patron-attr-types.pl
Garry Collum [Sat, 5 Jun 2010 22:29:40 +0000 (18:29 -0400)]
Bug 2505: Enabled warnings in patron-attr-types.pl

Fixed all resulting  errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFinal batch of POD cleanups.
Andrew Elwell [Mon, 7 Jun 2010 14:12:18 +0000 (16:12 +0200)]
Final batch of POD cleanups.

Should fix any remaining warnings with 'podchecker'

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoPOD Cleanups
Andrew Elwell [Mon, 7 Jun 2010 10:06:44 +0000 (12:06 +0200)]
POD Cleanups

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMore POD cleanups
Andrew Elwell [Sun, 6 Jun 2010 17:47:14 +0000 (19:47 +0200)]
More POD cleanups

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoPOD Cleanups - Few minor ones this time
Andrew Elwell [Sat, 5 Jun 2010 21:17:11 +0000 (23:17 +0200)]
POD Cleanups - Few minor ones this time

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAnother batch of POD cleanups
Andrew Elwell [Sat, 5 Jun 2010 21:17:10 +0000 (23:17 +0200)]
Another batch of POD cleanups

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoThe start of some POD cleanups in C4/*.pm
Andrew Elwell [Sat, 5 Jun 2010 11:16:51 +0000 (13:16 +0200)]
The start of some POD cleanups in C4/*.pm

If these are acceptable I'll continue - target is to get rid of all warnings
and errors with podcheck and make sure that any man and html formatted pod
docs look 'OK'

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoapplied paranoia
Galen Charlton [Wed, 9 Jun 2010 12:33:19 +0000 (08:33 -0400)]
applied paranoia

RM note: we've had our fun; next patch will be to trim
the comment to something that makes sense in context.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBuild with pdebuild, not debuild.
Lars Wirzenius [Tue, 8 Jun 2010 02:37:38 +0000 (14:37 +1200)]
Build with pdebuild, not debuild.

This checks build dependency declarations more thoroughly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoRemove dependencies on perl-base.
Lars Wirzenius [Fri, 4 Jun 2010 02:52:44 +0000 (14:52 +1200)]
Remove dependencies on perl-base.

perl-base is a required package, so it is always installed on a Debian
system, and Debian packages should not depend on it, unless they need
it a specific version, and I don't think we do.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug #4864 Add SIPServer Perl Module Dependencies
Colin Campbell [Wed, 9 Jun 2010 11:14:15 +0000 (12:14 +0100)]
Bug #4864 Add SIPServer Perl Module Dependencies

SIPServer requires Net::Server and UNIVERSAL::require

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMerge commit 'kc/master'
Chris Cormack [Tue, 8 Jun 2010 10:08:13 +0000 (22:08 +1200)]
Merge commit 'kc/master'

10 years agoset DBrev to 136 for previous patch to add edit_items
Galen Charlton [Fri, 4 Jun 2010 01:04:17 +0000 (21:04 -0400)]
set DBrev to 136 for previous patch to add edit_items

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMT2938 : Adds a permission for editing items
Henri-Damien LAURENT [Thu, 27 May 2010 20:03:36 +0000 (22:03 +0200)]
MT2938 : Adds a permission for editing items

This patch adds a permission on edit_items

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3081, Url's contain spaces
Owen Leonard [Fri, 28 May 2010 14:49:46 +0000 (10:49 -0400)]
Fix for Bug 3081, Url's contain spaces

My investigation finds that the problem in Internet
Explorer was not with the spaces in the URL but
with the spaces in the "name" attribute of the pop-up
window. Converting spaces to underscores allows
the plugin links to work correctly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3770, 'Add to list' page only allows adding to private lists
Owen Leonard [Thu, 3 Jun 2010 17:54:21 +0000 (13:54 -0400)]
Fix for Bug 3770, 'Add to list' page only allows adding to private lists

This patch is a reformat of chad@pennmanor.net's submission to
the bug report on 2010-02-16.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3722 - Branch deletion results in incorrect message
Owen Leonard [Thu, 3 Jun 2010 17:37:33 +0000 (13:37 -0400)]
Fix for Bug 3722 - Branch deletion results in incorrect message

A fix was submitted by Nahuel on 23 Nov 2009 and pushed, but
it combined messages for existing patrons and existing items.
This patch defines separate messages for the various cases and
corrects a typo in the original fix which left existing patrons
unreported.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3926, inadvertantly resurrected by me.
Owen Leonard [Thu, 3 Jun 2010 15:12:50 +0000 (11:12 -0400)]
Fix for Bug 3926, inadvertantly resurrected by me.

The template-side fix for Bug 3926 was overwritten by
another template change I submitted later. My bad.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted
Owen Leonard [Wed, 2 Jun 2010 18:45:18 +0000 (14:45 -0400)]
Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4205 remove extra 'plan by' option
Nicole Engard [Mon, 31 May 2010 23:56:23 +0000 (19:56 -0400)]
bug 4205 remove extra 'plan by' option

There wasn't a conditional in place to stop the planning
pull down from showing a blank 'plan by' option.

This patch also makes the other 'plan by' options look
cleaner by removing the all caps.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoBug 4844 Remove a circular dependency in koha_perl_deps.pl
Colin Campbell [Tue, 1 Jun 2010 16:52:12 +0000 (17:52 +0100)]
Bug 4844 Remove a circular dependency in koha_perl_deps.pl

Remove 'use Installer' which had external dependencies we're trying to
report on. Instead call Installer::PerlModules directly

added use warnings and strict
updated FSF address in License statement

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix for Bug 4504, Confirmation messages in opac account not translated
Owen Leonard [Wed, 2 Jun 2010 16:55:53 +0000 (12:55 -0400)]
Fix for Bug 4504, Confirmation messages in opac account not translated

Strings within JavaScript onclick attributes are not getting picked
up by the translator:

onclick="return confirmDelete(_('Are you sure you want to cancel this
hold?'));"

This patch converts those to use variables defined in the main
script block:

onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4845 change language from reserves to holds
Nicole Engard [Mon, 31 May 2010 04:56:00 +0000 (00:56 -0400)]
bug 4845 change language from reserves to holds

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoGerman web installer files, including translation of MARC21 frameworks
Katrin Fischer [Wed, 26 May 2010 20:11:47 +0000 (22:11 +0200)]
German web installer files, including translation of MARC21 frameworks

Translation of MARC21 frameworks according to http://www.d-nb.de/standardisierung/formate/marc21.htm

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4445: Upping the daily limit for XISBN
Chris Cormack [Fri, 30 Apr 2010 21:45:56 +0000 (09:45 +1200)]
bug 4445: Upping the daily limit for XISBN

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4445 update OCLC text tips on preferences
Nicole Engard [Mon, 31 May 2010 23:40:06 +0000 (19:40 -0400)]
bug 4445 update OCLC text tips on preferences

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4834 split joined preferences
Nicole Engard [Thu, 27 May 2010 03:55:52 +0000 (23:55 -0400)]
bug 4834 split joined preferences

these prefs : FilterBeforeOverdueReport & DisplayClearScreenButton shouldn't be
lumped together - they do two very different things and have nothing to do with
each other.

this patch splits them into two individual preferences.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agobug 4027 fix testStatus typo to textStatus
Nicole Engard [Tue, 1 Jun 2010 00:36:38 +0000 (20:36 -0400)]
bug 4027 fix testStatus typo to textStatus

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoDisable a new site created with --request-db.
Lars Wirzenius [Thu, 3 Jun 2010 03:45:45 +0000 (15:45 +1200)]
Disable a new site created with --request-db.

This way, the various cron jobs will not try to do things to it.
They can't, since it is not yet really created.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMerge commit 'kc/master'
Chris Cormack [Thu, 3 Jun 2010 02:11:49 +0000 (14:11 +1200)]
Merge commit 'kc/master'

10 years agoUpdate FSF address in debian/copyright.
Lars Wirzenius [Wed, 2 Jun 2010 05:51:38 +0000 (17:51 +1200)]
Update FSF address in debian/copyright.

This makes lintian be a bit more quiet.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoUpgrade Koha instance database schema when package is upgraded.
Lars Wirzenius [Wed, 2 Jun 2010 05:34:24 +0000 (17:34 +1200)]
Upgrade Koha instance database schema when package is upgraded.

If the new version of Koha requires a newer version of the database
schema, the Koha instances will work immediately after the package
is upgraded, rather than after the sysadmin has run koha-upgrade-schema
manually.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoFix bug 4818: Add note to koha README.Debian to maybe disable default vhost.
Lars Wirzenius [Wed, 2 Jun 2010 04:56:47 +0000 (16:56 +1200)]
Fix bug 4818: Add note to koha README.Debian to maybe disable default vhost.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAdd YAML as a dependency, since C4/Record.pm uses it.
Lars Wirzenius [Wed, 2 Jun 2010 04:42:43 +0000 (16:42 +1200)]
Add YAML as a dependency, since C4/Record.pm uses it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAdd missing build-dependencies (python, python-debian).
Lars Wirzenius [Wed, 2 Jun 2010 04:42:44 +0000 (16:42 +1200)]
Add missing build-dependencies (python, python-debian).

Also, debian/control gets re-generated, from debian/control.in and
PerlDependencies.pm.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAdd tools to update debian/control's build dependencies.
Lars Wirzenius [Fri, 28 May 2010 04:29:48 +0000 (16:29 +1200)]
Add tools to update debian/control's build dependencies.

The canonical list of Perl module dependencies are in
C4::Installer::PerlDependencies::PERL_DEPS now. Add a script
(debian/list-deps) to turn that into a list of Debian package names.

Because that is a slow process, and the output rarely changes, do
not do that at build time. Also, doing it at build time would require
modifying debian/control in evil ways.

Instead, add another tool, debian/update-control, which reads the
new file debian/control.in, and adds the output of debian/list-deps to
Build-Depends and creates a new debian/control.

debian/control.in is the master file. If changes are needed, that should
be edited. For performance and convenience reasons, the output is also kept
in git, but don't edit debian/control directly, please. Such changes
might get lost by the next commit by someone else.

Whenever PERL_DEPS changes, debian/update-control should be run as well
and the result committed to git.

This is not quite as automatic as it might be, but should be good enough.
It avoids keeping the list of Perl modules in two places.

Note that since it seems impossible to automatically figure out the Debian
package version that corresponds to a Perl module version, I have not
tried to do that at all.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoMerge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
Galen Charlton [Wed, 2 Jun 2010 11:05:23 +0000 (07:05 -0400)]
Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoSystem Preference updates
Chris Cormack [Mon, 31 May 2010 10:11:40 +0000 (22:11 +1200)]
System Preference updates

10 years agoRaft of language updates
Chris Cormack [Mon, 31 May 2010 10:10:17 +0000 (22:10 +1200)]
Raft of language updates

10 years agoLanguage updates
Chris Cormack [Tue, 30 Mar 2010 03:50:08 +0000 (16:50 +1300)]
Language updates

10 years agoMerge branch 'master' of git://git.koha-community.org/koha
Lars Wirzenius [Fri, 28 May 2010 01:49:20 +0000 (13:49 +1200)]
Merge branch 'master' of git://git.koha-community.org/koha

10 years agoMerge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha
Lars Wirzenius [Thu, 27 May 2010 23:26:59 +0000 (11:26 +1200)]
Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha

10 years agoBug 4817: Point to README.Debian in koha package description, postinst output.
Lars Wirzenius [Thu, 27 May 2010 04:42:41 +0000 (16:42 +1200)]
Bug 4817: Point to README.Debian in koha package description, postinst output.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoWhitespace removal, removal of U+FEFF character
Owen Leonard [Wed, 26 May 2010 18:32:41 +0000 (14:32 -0400)]
Whitespace removal, removal of U+FEFF character

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
10 years agoAdded "dialog alert" class to "No Results Found" message on the patron
Cindy Murdock Ames [Wed, 26 May 2010 16:56:26 +0000 (12:56 -0400)]
Added "dialog alert" class to "No Results Found" message on the patron
search so the alert stands out.  Previously no css was applied to it so
it was just plain text.  Librarians weren't noticing it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>