]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 5327 shifting database dependent modules and scripts to t/db_dependent
Chris Cormack [Tue, 18 Jan 2011 03:18:37 +0000 (16:18 +1300)]
Bug 5327 shifting database dependent modules and scripts to t/db_dependent
(cherry picked from commit eff21765f9784e09905042dd7080cbef099306d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5327 updated test file
johnboy [Tue, 18 Jan 2011 02:56:38 +0000 (15:56 +1300)]
bug 5327 updated test file

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cc039cdb0f29e800d300a0c3688645fb83075bf9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdded unit tests using a test database for XISBN.
Zach Sim [Tue, 18 Jan 2011 02:54:49 +0000 (15:54 +1300)]
Added unit tests using a test database for XISBN.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 52762c6c798548536a57fb0a10b0b1590e75b925)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoCreated unit testing using the testdatabase for XISBN.
Zach Sim [Tue, 18 Jan 2011 02:25:22 +0000 (15:25 +1300)]
Created unit testing using the testdatabase for XISBN.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f2d575c92c8f445ac41acb2b78c52a5d7be17b6d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdded extra unit tests to Debug.t
Zach Sim [Mon, 17 Jan 2011 22:14:21 +0000 (11:14 +1300)]
Added extra unit tests to Debug.t

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3b22fc6cc0267473fea7f7431ce9bc9861145b0d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5327 started testing
johnboy [Mon, 17 Jan 2011 22:34:39 +0000 (11:34 +1300)]
bug 5327 started testing

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 80f8c41e4c5da0263b25b6c4bfd894f0113777cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5327 Starting tests for BackgroundJob
johnboy [Mon, 17 Jan 2011 22:06:05 +0000 (11:06 +1300)]
Bug 5327 Starting tests for BackgroundJob

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 594a31bfe12465f281bb6e8acaa3e5d6b4083fb9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5327 Starting Unit Tests for Auth.pm
spartaness [Mon, 17 Jan 2011 21:57:31 +0000 (10:57 +1300)]
Bug 5327 Starting Unit Tests for Auth.pm

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3df717479cd7e19fef2d6d18300636391f1d2b5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5327 removing uneeded tests
claudia [Mon, 17 Jan 2011 19:56:33 +0000 (08:56 +1300)]
Bug 5327 removing uneeded tests

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 81f9c4976c171aae6e7f630dc8eb27a3e5424bb0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5399: Follow up style patch, moving exits out of subroutine
Chris Cormack [Mon, 17 Jan 2011 09:53:28 +0000 (22:53 +1300)]
Bug 5399: Follow up style patch, moving exits out of subroutine
(cherry picked from commit 12741cfafa7513ee7b4627863c18346cb8507873)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5399: remove useless eval 'use C4::Foo'
Galen Charlton [Mon, 17 Jan 2011 09:45:41 +0000 (09:45 +0000)]
Bug 5399: remove useless eval 'use C4::Foo'

Also add a couple FIXMEs

Marcel: Signed and updated for current master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4532ca70bc5842667c6ff53d9fec5d7e7b4f4317)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding a new developer to the history
Chris Cormack [Mon, 17 Jan 2011 07:59:11 +0000 (20:59 +1300)]
Adding a new developer to the history
(cherry picked from commit eae38fa6800454db627c4ab7e5a50ec17f42e018)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5403 Remove DisplayISBN and GetPublisherNameFromIsbn
Colin Campbell [Tue, 14 Dec 2010 09:28:53 +0000 (09:28 +0000)]
Bug 5403 Remove DisplayISBN and GetPublisherNameFromIsbn

These two subroutines were no longer being used by any other code
removed them from their respective modules
If we need any ISBN in future we should use Business::ISBN directly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a61db4986d7635e2eadb32f4df7332261e773826)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5327 - Adding UNIT Tests.
Zach Sim [Mon, 17 Jan 2011 03:14:22 +0000 (16:14 +1300)]
Bug 5327 - Adding UNIT Tests.

Squashed commit of the following:

commit 146d14665c52edaa85e38b70aabc9d52be5d64b6
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date:   Mon Jan 17 16:07:24 2011 +1300

    Edited DisplayISBN to cleanup the ISBN using _isbn_cleanup if it is not 13 or 10 digits long.

commit ba97b26d9a25470b0717cdd60a3d4f7a5c459ca9
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date:   Mon Jan 17 16:06:14 2011 +1300

    Added extra unit tests to test C4::Koha::DisplayISBN.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 53a301b8f20ba285c8e483aa6d5a3b2539380ccb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Owen Leonard [Fri, 14 Jan 2011 14:31:24 +0000 (09:31 -0500)]
Fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view

Fixed by doing a pretty dumb copy of GetMarcNotes. Functional,
but it could be there is a more efficient way to do it given
we want one repeating tag rather than a range of tags?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- fixed small typo in opac-detail
- corrected isbd punctuation in opac-detail
- tested with 0, 1, 2, 3 isbns in 020, MARC21
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3459, topissues doesn't take care of ccode
Owen Leonard [Thu, 13 Jan 2011 21:53:51 +0000 (22:53 +0100)]
Fix for Bug 3459, topissues doesn't take care of ccode

- Change conditional to display filter in sidebar without EXPR
- Enhance switch between ccode default and itemtype default searches
- Enable preselect of submitted collection code in filter form,
  stealing code from opac-search.pl

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f45969422c55f34edec3145b7e2fa1a85222932f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4438: incorrect "Budget total exceeds period allocation" error when editing fund
Henri-Damien LAURENT [Thu, 13 Jan 2011 14:04:19 +0000 (09:04 -0500)]
Bug 4438: incorrect "Budget total exceeds period allocation" error when editing fund

The process in check_parent_total for period allocation was not good.
It took all the children of a period.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9bf9e2d9b4408579667d904ec94d064dc0c8f882)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5006 - Invalid XHTML in record matching rules template
Owen Leonard [Thu, 13 Jan 2011 14:38:23 +0000 (09:38 -0500)]
Fix for Bug 5006 - Invalid XHTML in record matching rules template

- Rework JavaScript clone routines to use jQuery, to take
  label "for" into account, to handle incrementing label,
  and to properly place cloned blocks at the bottom of the group
- Rework JavaScript delete routines to use jQuery, to take
  block label numbers into account, and to show the "add"
  link if you have deleted the last block.
- Correcting markup which nests <div> inside <fieldset>
- Ensuring labels' "for" attribute matches input IDs
- Adding "required" style to required fields

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago(bug #3743) fix acquisition stats ordering
Nahuel ANGELINETTI [Wed, 12 Jan 2011 15:08:46 +0000 (10:08 -0500)]
(bug #3743) fix acquisition stats ordering

This patch fix ordering in acquisition stats to order by month number.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8de8b97c66a67427f4b458e2c3f3e43ea43d963)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5611: Simple typo fix in the comments
Chris Cormack [Wed, 12 Jan 2011 19:17:27 +0000 (08:17 +1300)]
Bug 5611: Simple typo fix in the comments
(cherry picked from commit be37db49fb329f8911dabb0d12d2a6e09bb9dc91)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoTypo fix for history file
Chris Cormack [Wed, 12 Jan 2011 18:23:08 +0000 (07:23 +1300)]
Typo fix for history file
(cherry picked from commit 3153abe61b441ee8b4088c9b13f2954c63546cab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding release info, and missing meetings to the history
Chris Cormack [Wed, 12 Jan 2011 17:56:58 +0000 (06:56 +1300)]
Adding release info, and missing meetings to the history
(cherry picked from commit 31993509b21b61f8b0546dd6b71cfa6d9801dc9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding new developers to the history
Chris Cormack [Wed, 12 Jan 2011 17:52:06 +0000 (06:52 +1300)]
Adding new developers to the history

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5611 Tidy up C4::Scrubber
Colin Campbell [Wed, 12 Jan 2011 16:53:22 +0000 (16:53 +0000)]
Bug 5611 Tidy up C4::Scrubber

Remove the unneeded package variables
Remove unnecessary variables
Removed some cargo-cult programming
Tidied the indentation from mix of tabs & spaces
Add a Test that we actually return the required class
of object

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 073fb1aee655f9f29e99cc56ddf584eb6c7813a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5611 INIT block causes failure with mod perl
Bryce Sanchez [Wed, 12 Jan 2011 16:53:21 +0000 (16:53 +0000)]
Bug 5611 INIT block causes failure with mod perl

Per module INIT Blocks are not run in mod_perl so their
variables are not visible. A lexical var is adequate
for this purpose

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e0d76bd88d25e87f9d8f450f1c4e029812eacf02)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5601 :: Add tests for bugfix
Colin Campbell [Wed, 12 Jan 2011 06:34:22 +0000 (07:34 +0100)]
Bug 5601 :: Add tests for bugfix

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d5029ec5b3b95a3e38b67aa1aa1be6196e19dfb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5601 Fix processing of DueDate return
Colin Campbell [Wed, 12 Jan 2011 06:34:21 +0000 (07:34 +0100)]
Bug 5601 Fix processing of DueDate return

item duedate is not a datetime entity but a string retrieved
direct from the db that only needs restructuring
checkout was doing so but item_info was pretending it was in secs
(actually Item.pm manipulated then overwrote it!!)
assume the date in the db is correct (otherwise madness ensues)
dont try to second guess it
As duedates do not yet include a time element assume end of day
as a safety first

[F. Demians] I confirm Joe Atzberger diagnostic. That's a bug reported by a
library. I've tested Colin Campell solution. It fixes the bug.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d4842d45601bd0f9c1bd33bf7978586ae746888f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5055 Use standard file paths in crontab.example
Magnus Enger [Wed, 5 Jan 2011 21:06:54 +0000 (22:06 +0100)]
Bug 5055 Use standard file paths in crontab.example

This is a revised patch, removing the lines pertaining to logrotate.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit af60ade73b0ac5c15308994632b45f99b0b8ae1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4131 have subscription so edit routing if one exists
Nicole Engard [Tue, 11 Jan 2011 07:33:51 +0000 (02:33 -0500)]
bug 4131 have subscription so edit routing if one exists

Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b7fdfc1384a749471f2c9a00b910b063778085e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5486 remove note about HomeOrHoldingBranch being removed soon
Nicole Engard [Tue, 11 Jan 2011 06:55:21 +0000 (01:55 -0500)]
bug 5486 remove note about HomeOrHoldingBranch being removed soon

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 50694f39594f1f4fcfd0efe28a1f47ab6c23bfd7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5603: advance_notice.pl uninitialized element in hash
Ian Walls [Sat, 8 Jan 2011 22:25:56 +0000 (17:25 -0500)]
Bug 5603: advance_notice.pl uninitialized element in hash

Changings one of the LEFT JOINS in C4::Members::Messaging::GetMessagingPreferences
to a JOIN to prevent NULL message_transport_types from being returned

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8185db47878630399eedc8ca227ab0e111a3acad)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5492 update import patrons page title
Nicole Engard [Tue, 11 Jan 2011 06:52:56 +0000 (01:52 -0500)]
bug 5492 update import patrons page title

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4173f2221fd0387e670c40bd4da18223e79f2244)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5604 additional icons in the Seshat icon set
Nicole Engard [Tue, 11 Jan 2011 06:36:40 +0000 (01:36 -0500)]
bug 5604 additional icons in the Seshat icon set

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1ef8313609bb5617a6c3439b55da5e4df96e88f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4945 - Patron search is limited by default to the currently logged-in...
Owen Leonard [Tue, 4 Jan 2011 14:04:41 +0000 (09:04 -0500)]
Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library

I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 98efac4c0a3c6dfd857901ce6c639f93bcda8b76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago(bug #3737) fix title search in order history
Nahuel ANGELINETTI [Mon, 10 Jan 2011 16:37:02 +0000 (16:37 +0000)]
(bug #3737) fix title search in order history

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 15334926adf722083f03553eed575d056e907ad1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5589: Remove duplicated Exports in Suggestions.pm
Colin Campbell [Fri, 7 Jan 2011 11:44:03 +0000 (11:44 +0000)]
Bug 5589: Remove duplicated Exports in Suggestions.pm

Rather bizarrely Suggestions.pm was setting up @EXPORT, @ISA
and $VERSION twice. Have removed one invocation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1172b98d9a2b8dde3c700b0d116816b4d45fa26)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4984, Invalid XHTML in staff client search results
Owen Leonard [Wed, 5 Jan 2011 08:24:53 +0000 (03:24 -0500)]
Fix for Bug 4984, Invalid XHTML in staff client search results

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b344bdbd1475efa0bb4f919521ed3ee0e86874b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdditional fix for Bug 3550, Use GetRecordValue to get the subtitle
Owen Leonard [Fri, 7 Jan 2011 10:34:11 +0000 (05:34 -0500)]
Additional fix for Bug 3550, Use GetRecordValue to get the subtitle

- Adding subtitle to Hold Ratio report output
- Sorting by default on ratio, descending
- Adding author
- Removing description

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 05c240953a7989af72c461bd9e2e37bac0fe2a66)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow up on fix for Bug 5570, item types not showing on other editions
Owen Leonard [Thu, 6 Jan 2011 21:31:00 +0000 (16:31 -0500)]
Follow up on fix for Bug 5570, item types not showing on other editions

Fix for the staff client.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 811023934af8464bf943caa06c3d156a766d1b16)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5570 - item types not showing on other editions
Owen Leonard [Tue, 4 Jan 2011 17:47:29 +0000 (12:47 -0500)]
Fix for Bug 5570 - item types not showing on other editions

The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd50b2d1219c904f3a7db3cfa49feca13bd8278)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5480 Some usual UNIMARC cataloguing plugins doesn't work anymore
Frédéric Demians [Mon, 20 Dec 2010 13:13:41 +0000 (14:13 +0100)]
Bug 5480 Some usual UNIMARC cataloguing plugins doesn't work anymore

[3.2] To be applied

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5583 Rename fieldnumber to blocknumber
Colin Campbell [Thu, 6 Jan 2011 11:37:19 +0000 (11:37 +0000)]
Bug 5583 Rename fieldnumber to blocknumber

Variable fieldnumber does not refer to a field
It is the ISBD block number
Rename to blocknumber
Say what we mean adds to maintainability

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 926ab8c54486a3cd5491d119dd0024ef94980d5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5582 Pass tag nums as a string to Doc Popup
Colin Campbell [Thu, 6 Jan 2011 11:15:41 +0000 (11:15 +0000)]
Bug 5582 Pass tag nums as a string to Doc Popup

Add quotes around tag number when calling doc popup
Otherwise numbers with leading zeroes are interpreted
as octal e.g. 020 returns doc for 016

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 782654d178ada36ea834c1738ec20e4df7956a19)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5585: fix display of current date on receipts and slips
Galen Charlton [Wed, 5 Jan 2011 16:19:57 +0000 (11:19 -0500)]
bug 5585: fix display of current date on receipts and slips

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 80641597e548d3757c8b5c9274b85cc75059415b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoRemoving OPACNoResultsFound Enhancement Syspref
Chris Nighswonger [Thu, 6 Jan 2011 19:24:30 +0000 (14:24 -0500)]
Removing OPACNoResultsFound Enhancement Syspref

This pref was accidentally added during non-English syspref updates.
It is properly a part of enh bug 1997 which will not be included in
the 3.2.x branch.

13 years agoFix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl
Owen Leonard [Thu, 6 Jan 2011 18:56:06 +0000 (13:56 -0500)]
Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl

Changes to list contents view to make it consistent with search results

My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.

The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.

Other changes include:

- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
  rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
  consistent with other instances of pagination navigation

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4950 - checkbox should be removed when can't place a hold
Owen Leonard [Thu, 6 Jan 2011 18:48:40 +0000 (13:48 -0500)]
Fix for Bug 4950 - checkbox should be removed when can't place a hold

- Hiding form controls for titles which can't be placed on hold
- Highlighting hold blocked message for better visibility
- Showing table of blocked holds even if none can be placed on
  hold: hiding the table hides the messages explaining why
  titles can't be placed on hold
- Removing an unused line from the script which was leaving errors
  in the error log
- Consolidating error messages into one box which were displaying
  in two.
- Correcting link to unused opac-userdetails.pl

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5571 - tags as bulleted list too long
Owen Leonard [Thu, 6 Jan 2011 18:38:26 +0000 (13:38 -0500)]
Fix for Bug 5571 - tags as bulleted list too long

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5419: make reason checkouts blocked stand out
Nicole Engard [Thu, 30 Dec 2010 16:57:06 +0000 (11:57 -0500)]
bug 5419: make reason checkouts blocked stand out

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f379638c9d1921e8663e2c8c5bfabe27af42a666)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5497: make all library fields available to circ receipt/slips
Galen Charlton [Tue, 4 Jan 2011 19:38:44 +0000 (14:38 -0500)]
bug 5497: make all library fields available to circ receipt/slips

This allows the receipt template to be more readily customized
to include the library's address, phone number, email address, etc.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4daef50c7a554e6ef2b83e29ac877a70366bddfa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3918 - Add to order lists inconsistent
Owen Leonard [Tue, 4 Jan 2011 19:31:46 +0000 (14:31 -0500)]
Fix for Bug 3918 - Add to order lists inconsistent

- Added new include to contain add to basket options
- Minor markup corrections

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 562653bc8d76414e40fa229afcec3320f3b2cf1a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5375 (Update date/time last transaction (MARC 005) when saving authority record)
Marcel de Rooy [Thu, 16 Dec 2010 01:12:28 +0000 (20:12 -0500)]
Bug 5375 (Update date/time last transaction (MARC 005) when saving authority record)

Update 005 date/time when saving authority record for MARC21 and UNIMARC.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 11908331497c514b8ba224f30dfff00277f7f42b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5374 (update transaction date when saving biblio) RESENT with small fix
Marcel de Rooy [Wed, 15 Dec 2010 23:11:28 +0000 (18:11 -0500)]
Bug 5374 (update transaction date when saving biblio) RESENT with small fix

Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 76338220ddf688f6e38488624dd260e0810db1c3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5562 change 'issues' to read 'checkouts'
Nicole Engard [Thu, 30 Dec 2010 16:59:20 +0000 (11:59 -0500)]
bug 5562 change 'issues' to read 'checkouts'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c71a36fd27ece805705161149bb885aa3e4decdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5563 change note about cover images on enhanced content
Nicole Engard [Thu, 30 Dec 2010 17:02:15 +0000 (12:02 -0500)]
bug 5563 change note about cover images on enhanced content

on the enhanced content tab of system
preferences it says that Koha will pick
the first cover image - but in fact it
shows them all - that note needs to be
updated to properly warn of the expected
behavior.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 606f9784199722bd661d60be1944aa97c6a8971c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoReimplemented fix for bug 5556, OPAC does not display the type of authority
Owen Leonard [Thu, 30 Dec 2010 17:07:11 +0000 (12:07 -0500)]
Reimplemented fix for bug 5556, OPAC does not display the type of authority

Formatting Janusz's suggested changes as a patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4e1f49097c184ec7b199fe8176ccf6b9ae331035)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoReimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Owen Leonard [Thu, 30 Dec 2010 17:20:33 +0000 (12:20 -0500)]
Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a61750bf0a5a6cc5668e0419ab2160cf5d02eac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.02.001
Chris Nighswonger [Mon, 3 Jan 2011 17:25:30 +0000 (12:25 -0500)]
Updating Version Number to 3.02.02.001

13 years agobug 5040 fix misspelling of distance in marc21 framework
Nicole Engard [Thu, 30 Dec 2010 17:32:37 +0000 (12:32 -0500)]
bug 5040 fix misspelling of distance in marc21 framework

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4942 - add validation to patron administration
Robin Sheat [Fri, 31 Dec 2010 14:18:55 +0000 (09:18 -0500)]
bug 4942 - add validation to patron administration

This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d0212cf38b802d510aa03a705b19fb11060a537)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5045 - Help works even when the referrer is being stripped
Robin Sheat [Fri, 31 Dec 2010 16:19:17 +0000 (11:19 -0500)]
bug 5045 - Help works even when the referrer is being stripped

This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 980de26320d7dc389a0faf88d341f3dc373dd831)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5550 - correct filename referenced in docs
Robin Sheat [Wed, 29 Dec 2010 01:20:19 +0000 (14:20 +1300)]
Bug 5550 - correct filename referenced in docs

Spotted by Reed Wade.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e88cee532643ce0cfbf1127c2b9ee2d6ede1cbb4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5526: Follow up patch removing a warn statement
Chris Cormack [Wed, 29 Dec 2010 07:36:37 +0000 (20:36 +1300)]
Bug 5526: Follow up patch removing a warn statement
(cherry picked from commit c5b55d1c40a967ed3676f9e85a6ec002074d13e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5526, List of lists should be in alphabetical order by list name
Owen Leonard [Mon, 20 Dec 2010 15:56:11 +0000 (09:56 -0600)]
Fix for Bug 5526, List of lists should be in alphabetical order by list name

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5dcc99b6e93ab920a0ef17a7592c8c9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5542: Availability code commented out - Uncommenting
Chris Cormack [Thu, 23 Dec 2010 19:35:53 +0000 (08:35 +1300)]
Bug 5542: Availability code commented out - Uncommenting

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 79fb4a813496f3efb1fe2b95187c6299e50f6c50)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for bug 5451, can add tags with userlogin turned off
Owen Leonard [Fri, 17 Dec 2010 23:11:43 +0000 (18:11 -0500)]
Fix for bug 5451, can add tags with userlogin turned off

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(Corrected to apply to 3.2.x)

13 years agoBug 5531: adding some missing sysprefs
Chris Cormack [Wed, 22 Dec 2010 02:06:51 +0000 (15:06 +1300)]
Bug 5531: adding some missing sysprefs
(cherry picked from commit 2124887428afc6c9198404241a1afd93c456dc8f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5531: Updated Polish, Ukranian and Russian syspref files
Chris Cormack [Wed, 22 Dec 2010 01:59:11 +0000 (14:59 +1300)]
Bug 5531: Updated Polish, Ukranian and Russian syspref files

Retrieved from
http://git.koha-community.org/gitweb/?p=wip/koha-chris_n.git;a=commit;h=f23969c7e1cb87d4bd9552e3d6bc85cc948dedd9
(cherry picked from commit 0482e534519dafb2ff37177f117534d77bc4cbeb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5531: further fix for fr-FR files
Chris Cormack [Wed, 22 Dec 2010 01:44:33 +0000 (14:44 +1300)]
Bug 5531: further fix for fr-FR files
(cherry picked from commit c9db18bf0b084136451ee078cab7c9fffd53f615)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBased on Chris Nighswonger french unimarc_standard_sysprefs.sql
Henri-Damien LAURENT [Tue, 21 Dec 2010 23:00:17 +0000 (00:00 +0100)]
Based on Chris Nighswonger french unimarc_standard_sysprefs.sql
(cherry picked from commit 409dcdfe6aaf3a6d2d90918f54a48c2c326f5f85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4473: Making a change to TmplTokenizer.pm to stop translation error
Chris Cormack [Mon, 20 Dec 2010 19:31:07 +0000 (08:31 +1300)]
Bug 4473: Making a change to TmplTokenizer.pm to stop translation error
(cherry picked from commit f5e65148ace51060f739fce4c26b772d09f35ba6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5143: Help file revisions per Owen Leonard
Liz Rea [Fri, 17 Dec 2010 00:20:25 +0000 (19:20 -0500)]
Bug 5143: Help file revisions per Owen Leonard

Nice changes, thanks. :)

LR

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c25aaf1ca49c2733c22325057037dd5e14e0cfd8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5489: Send hold email to branch email address if it exists instead of koha email...
Amit Gupta [Thu, 16 Dec 2010 11:47:17 +0000 (06:47 -0500)]
Bug 5489: Send hold email to branch email address if it exists instead of koha email address

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cae2609d12075f685f51b66a5821eb41d30c97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3262 - OPAC needs syspref to show homebranch on detail page
Owen Leonard [Thu, 16 Dec 2010 11:42:51 +0000 (06:42 -0500)]
Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page

Revised version of Liz Rea's fix adding homebranch by default. This
revision displays the homebranch name instead of branchcode.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75762a63e940040d3d9bcc26566b0079000078a8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5446 Fix a bug introduces by previous patch
Frédéric Demians [Fri, 17 Dec 2010 11:16:52 +0000 (11:16 +0000)]
Bug 5446 Fix a bug introduces by previous patch

When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...

Alert commented.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9a048e2b12e2004fad51b5b0db3187a8eb6c2a04)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4286 Allow receiving if subscription enddate not set
Colin Campbell [Thu, 16 Dec 2010 09:59:34 +0000 (04:59 -0500)]
Bug 4286 Allow receiving if subscription enddate not set

HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 74e63fe0e602f745e711cf00417b965614f7be68)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page
Owen Leonard [Thu, 16 Dec 2010 09:20:01 +0000 (04:20 -0500)]
Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 276e1c34307b9bcb2986e4bd1b1318b4bfe12d75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up patch for Bug 4908, show patron's home library in OPAC
Owen Leonard [Thu, 16 Dec 2010 09:15:53 +0000 (04:15 -0500)]
Follow-up patch for Bug 4908, show patron's home library in OPAC

Adding home library to list of details when OPACPatronDetails pref
is set to "don't allow"

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c4f8b9d636d8e37069233870b720ccc2ad2eeb3b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5470 - improvements to results display in the staff client
Owen Leonard [Thu, 16 Dec 2010 08:02:53 +0000 (03:02 -0500)]
Fix for Bug 5470 - improvements to results display in the staff client

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be70444f687144063dd6e640dfd93afc2256cf44)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug4891 - sort facets in search sidebar (OPAC and staff client)
Robin Sheat [Thu, 16 Dec 2010 07:50:08 +0000 (02:50 -0500)]
bug4891 - sort facets in search sidebar (OPAC and staff client)

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 13bc505c5ffdd22533b49ddc4d1e79ecce49ed4d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections
Owen Leonard [Thu, 16 Dec 2010 07:34:47 +0000 (02:34 -0500)]
Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections

Adding jquery tablesorter, sorting on sys pref variable by default

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 396c2143d9f0196126af5d24f23e4b286f55d830)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5510: prepend output with system name
Srdjan Jankovic [Thu, 16 Dec 2010 06:23:31 +0000 (19:23 +1300)]
Bug 5510: prepend output with system name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1c86e93cec3749ce5821d237e6d86fa888f62fa3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoDeleted old sample budget sql-data for Ukrainian and Russian
Serhij Dubyk {Сергій Дубик} [Wed, 15 Dec 2010 23:49:51 +0000 (01:49 +0200)]
Deleted old sample budget sql-data for Ukrainian and Russian

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd8f379d70be0afe5e37c843f8b7dd0ab82be1ed)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages
Owen Leonard [Thu, 16 Dec 2010 02:33:59 +0000 (21:33 -0500)]
Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 402240bbe25aaffd205a34a01663e556be01ac15)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4946 - hold warning needs rewording
Owen Leonard [Thu, 16 Dec 2010 02:30:38 +0000 (21:30 -0500)]
Fix for Bug 4946 - hold warning needs rewording

This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 324991fefd1c6f336308b0f7aec8e8f0047e6e1a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3859, Attach item clarification
Owen Leonard [Thu, 16 Dec 2010 02:16:24 +0000 (21:16 -0500)]
Fix for Bug 3859, Attach item clarification

- Modifies hint text
- Adds handling for BiblioDefaultView preference
- Markup and CSS tweaks

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6e83087a479d9d2f552c9a6a2e5554c0f693596)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5294 - Unescape vendor name when pushing back
Srdjan Jankovic [Thu, 16 Dec 2010 01:10:12 +0000 (20:10 -0500)]
Bug 5294 - Unescape vendor name when pushing back

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 750a8a8dae8a445d678f6645b6cbd3405e27924d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5398: make additional pages in staff interface obey noItemTypeImages
Galen Charlton [Wed, 15 Dec 2010 16:26:04 +0000 (11:26 -0500)]
bug 5398: make additional pages in staff interface obey noItemTypeImages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0560aa768cc1b128891259982a25ee2450470e79)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4826 change 'add basket' to 'new basket'
Nicole Engard [Wed, 15 Dec 2010 14:23:14 +0000 (09:23 -0500)]
bug 4826 change 'add basket' to 'new basket'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 07834371f25ab207688e1534c39654049b890951)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.02.00 3.02.02
Chris Nighswonger [Tue, 21 Dec 2010 23:58:29 +0000 (18:58 -0500)]
Updating Version Number to 3.02.02.00

Updating version number for 3.2.2 release.

13 years agoBug 5506 Shorten .po file comment lines
Frédéric Demians [Tue, 21 Dec 2010 20:42:41 +0000 (21:42 +0100)]
Bug 5506 Shorten .po file comment lines

In opac/staff templates .po files, we have comment lines contextualizing
extracted text in templates. Path to template are absolute. For example, we can
have:

  #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/...
     modules/cataloguing/addbiblio.tmpl:585

The first part of the pathname is useless. With this patch, we just keep
relative path to tempalte from Koha template main directory. The above example
becomes:

  #: intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:585

To be applied on [3.2]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f460afbad6566e68bdbaddb5577f13f77a86a877)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5331, fixing Italian sysprefs.sql
Chris Cormack [Tue, 21 Dec 2010 10:01:30 +0000 (23:01 +1300)]
Bug 5331, fixing Italian sysprefs.sql
(cherry picked from commit 2814b535e6672e972d954e823f611378393f624b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5531: Fixing german sysprefs file
Chris Cormack [Tue, 21 Dec 2010 09:47:05 +0000 (22:47 +1300)]
Bug 5531: Fixing german sysprefs file
(cherry picked from commit e20895a9a783eca7a1b8892da291dceac90a6f85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5035 remove default opaccolorstylesheet value for new installs
Nicole Engard [Mon, 20 Dec 2010 13:22:42 +0000 (13:22 +0000)]
bug 5035 remove default opaccolorstylesheet value for new installs

Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.

This patch does not remove the blank color.css file, it only
edits the default system preference.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a45eb8fb7864ed2c41abb449b1671cf715cab3a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding Translations Updated to Release Notes for 3.02.02.000
Chris Nighswonger [Tue, 21 Dec 2010 22:00:45 +0000 (17:00 -0500)]
Adding Translations Updated to Release Notes for 3.02.02.000

13 years agoUpdated .po files for 3.2.2 inclusion
Frédéric Demians [Tue, 21 Dec 2010 19:34:37 +0000 (20:34 +0100)]
Updated .po files for 3.2.2 inclusion
(cherry picked from commit 072f03b2c1399d559c45d89218b68150d71f02d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBeginning of Release Notes for 3.02.02.000
Chris Nighswonger [Tue, 21 Dec 2010 03:57:23 +0000 (22:57 -0500)]
Beginning of Release Notes for 3.02.02.000

13 years agoBug 2965: Follow up - fixing problem with barcode field
Katrin Fischer [Mon, 20 Dec 2010 19:24:31 +0000 (20:24 +0100)]
Bug 2965: Follow up - fixing problem with barcode field

The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.

This patch reverts the template change, so the barcode is deleted.

Please test!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cf4d8519078cf13ff2e67c7baca39f3fb95897a8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdd .packages file for Ubuntu 10.10
Jesse Weaver [Sun, 19 Dec 2010 02:12:04 +0000 (19:12 -0700)]
Add .packages file for Ubuntu 10.10

Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88d3d09897aa8624b20ad5762b0c06699caa766e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5506 Improve translation script
Frédéric Demians [Sun, 19 Dec 2010 09:57:51 +0000 (10:57 +0100)]
Bug 5506 Improve translation script

[1] Update all .po files in once with this command:

    translate update

[2] For sysprefs, quoted text wasn't properly retrieved from .po file and so
    quoted strings wasn't translatable.

[3] The install process (translate -p install de-DE) was rewriting syspref
    .po file which isn't required anymore.

MUST be applied to [3.2] to get all syspref proper translation.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 814795da60318c70059fc1dfbe7be4da37109db0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>