]> git.koha-community.org Git - koha.git/log
koha.git
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>
13 years agoFix for 5143, now with IE debug removed
Chris Cormack [Tue, 14 Dec 2010 19:20:42 +0000 (14:20 -0500)]
Fix for 5143, now with IE debug removed

Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work

adds:
 - the subtitles into the title link (originally Chris Cormack)
 - barcodes for every listed hold
 - denoted which items were only item and which could be filled by any item on that bib.
 - added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)

[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3789 Set off shelving location in staff and OPAC title display
Jane Wagner [Tue, 14 Dec 2010 16:39:12 +0000 (11:39 -0500)]
Bug 3789 Set off shelving location in staff and OPAC title display

Koha puts the shelving location immediately after the library name in the
"Location" column of the title display.  If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location.  I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates.  This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.

[Edit] Re-implemented some changes which wouldn't merge after so long

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4937: Fixes XHTML in the pagination links of a saved report.
Garry Collum [Tue, 14 Dec 2010 14:38:19 +0000 (09:38 -0500)]
Bug 4937: Fixes XHTML in the pagination links of a saved report.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4977 add missing order links to 'no results found' page
Nicole Engard [Tue, 14 Dec 2010 13:57:46 +0000 (08:57 -0500)]
bug 4977 add missing order links to 'no results found' page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoRevert "Ergonomy improvement in smart rule management"
Chris Cormack [Tue, 14 Dec 2010 20:03:11 +0000 (09:03 +1300)]
Revert "Ergonomy improvement in smart rule management"

This reverts commit fefd158f424939fc473f54a2ffe4ee0e39ffba08.

This was causing quite major errors, read the details at bug 5496
(cherry picked from commit 3705965cd71bc30ed4ba325cde115764fa1afe44)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAlternate fix for Bug 2981, removing onclick redirect
Owen Leonard [Mon, 13 Dec 2010 19:26:35 +0000 (14:26 -0500)]
Alternate fix for Bug 2981, removing onclick redirect

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5033: Add a reference to xml_sax to the Makefile.PL
Robin Sheat [Mon, 19 Jul 2010 02:06:32 +0000 (14:06 +1200)]
bug 5033: Add a reference to xml_sax to the Makefile.PL

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for intranet-tmpl had one /TMPL_IF to many
Chris Cormack [Tue, 14 Dec 2010 07:10:59 +0000 (20:10 +1300)]
Fix for intranet-tmpl had one /TMPL_IF to many
(cherry picked from commit e83beb048201fdc3be9286006173973eb73d6ce0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixes bug 5125: Default focus on circulation-home page
Ian Walls [Fri, 10 Sep 2010 16:43:18 +0000 (12:43 -0400)]
Fixes bug 5125: Default focus on circulation-home page

Fix created by Owen Leonard, related over IRC chat (rather than a patch file).

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoPossible fix for Bug 2307, Calendar widget cannot be translated
Owen Leonard [Tue, 14 Dec 2010 06:24:16 +0000 (07:24 +0100)]
Possible fix for Bug 2307, Calendar widget cannot be translated

This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 2965: Allow due date in the past - small template fix
Katrin Fischer [Tue, 14 Dec 2010 05:33:27 +0000 (06:33 +0100)]
Bug 2965: Allow due date in the past - small template fix

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5084 - hide funds that are part of an inactive budget
Robin Sheat [Wed, 4 Aug 2010 03:48:10 +0000 (15:48 +1200)]
Bug 5084 - hide funds that are part of an inactive budget

Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 2965: Allow due date in the past
Srdjan Jankovic [Mon, 13 Dec 2010 21:34:07 +0000 (22:34 +0100)]
Bug 2965: Allow due date in the past

Raise warning rather than disallowing
Remove due date js validation when checking out

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec451729d74e3fa6282e1726a0a74969)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5000, Uncertain prices misses option to choose display language
Owen Leonard [Mon, 13 Dec 2010 21:14:11 +0000 (22:14 +0100)]
Fix for Bug 5000, Uncertain prices misses option to choose display language

- Adding missing footer include for language chooser
- Correcting markup and structure errors

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoVariable redeclared in same scope
Colin Campbell [Mon, 13 Dec 2010 17:05:06 +0000 (17:05 +0000)]
Variable redeclared in same scope

lexical variable declared twice causing run time warnings

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5255 change 'document type' to 'item type'
Nicole Engard [Mon, 13 Dec 2010 16:13:58 +0000 (11:13 -0500)]
bug 5255 change 'document type' to 'item type'

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4252 add authorites permission to menus
Nicole Engard [Mon, 13 Dec 2010 15:27:47 +0000 (10:27 -0500)]
bug 4252 add authorites permission to menus

Added to more menu and to the main intranet page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 2170 Supplementary Fix Wrap link in permissions check
Colin Campbell [Mon, 13 Dec 2010 15:31:47 +0000 (15:31 +0000)]
Bug 2170 Supplementary Fix Wrap link in permissions check

Found an edit item link not subject to edit_items permission check

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdated fix for Bug 2170, Adding 'edititems' user-permission
Owen Leonard [Mon, 13 Dec 2010 15:30:07 +0000 (15:30 +0000)]
Updated fix for Bug 2170, Adding 'edititems' user-permission

This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.

Revised for current HEAD

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Chris Cormack [Mon, 13 Dec 2010 11:44:35 +0000 (11:44 +0000)]
Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5150 change issuing to circ & fine rules
Nicole Engard [Wed, 18 Aug 2010 01:22:56 +0000 (21:22 -0400)]
bug 5150 change issuing to circ & fine rules

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5208, Language chooser missing on Batch item deletion/modification
Owen Leonard [Fri, 10 Sep 2010 12:37:55 +0000 (14:37 +0200)]
Fix for Bug 5208, Language chooser missing on Batch item deletion/modification

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b53b14bacfdd276c3188de2f76ed03201a0cab0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5228 - make rebuild_zebra handle fixing the zebra dirs
Robin Sheat [Thu, 16 Sep 2010 07:08:57 +0000 (19:08 +1200)]
Bug 5228 - make rebuild_zebra handle fixing the zebra dirs

If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5313 - allow creation of libraries with hyphens
Robin Sheat [Wed, 20 Oct 2010 01:28:29 +0000 (14:28 +1300)]
Bug 5313 - allow creation of libraries with hyphens

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5416, Template syntax error in moredetails.tmpl
Owen Leonard [Wed, 24 Nov 2010 14:48:24 +0000 (09:48 -0500)]
Fix for Bug 5416, Template syntax error in moredetails.tmpl

Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5041 Allow to delete non-repeatable field
Frédéric Demians [Tue, 20 Jul 2010 12:03:35 +0000 (14:03 +0200)]
Bug 5041 Allow to delete non-repeatable field

Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4218: Fixes display problem introduced by last patch
Katrin Fischer [Tue, 7 Dec 2010 03:47:35 +0000 (04:47 +0100)]
Bug 4218: Fixes display problem introduced by last patch

Adds back missing <!-- /TMPL_IF -->.
Without navigation tabs and holdigns are not displayed in staff detail.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.01.003
Chris Nighswonger [Tue, 14 Dec 2010 05:05:29 +0000 (00:05 -0500)]
Updating Version Number to 3.02.01.003

13 years agoBug 3381 - Add an IntranetUserCSS system preference
Katrin Fischer [Sat, 11 Dec 2010 22:47:47 +0000 (23:47 +0100)]
Bug 3381 - Add an IntranetUserCSS system preference

Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago(bug #3575) fix opac-detail.pl
Nahuel ANGELINETTI [Fri, 11 Sep 2009 14:34:00 +0000 (16:34 +0200)]
(bug #3575) fix opac-detail.pl

This delete an useless "use C4::Serials"(there are 2).

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38a1526a740b506e87c0aa296014f2feb1c00c0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago(bug #5154) fix most checkouts report
Nahuel ANGELINETTI [Thu, 19 Aug 2010 13:48:21 +0000 (15:48 +0200)]
(bug #5154) fix most checkouts report

Ignore null/deleted borrowers

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4218 - Staff client detail page does not show item hold status
Owen Leonard [Tue, 21 Sep 2010 14:45:03 +0000 (10:45 -0400)]
Fix for Bug 4218 - Staff client detail page does not show item hold status

Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdate Debian changelog for 3.2.1 release
Robin Sheat [Sun, 12 Dec 2010 22:20:03 +0000 (11:20 +1300)]
Update Debian changelog for 3.2.1 release

This adds the required changelog changes to keep it current for the
3.2.1 release. It is intended to go straight into 3.2.x, and probably
should go into master also.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5443, Inaccurate highlighting of fields in patron update email
Owen Leonard [Fri, 10 Dec 2010 15:32:20 +0000 (15:32 +0000)]
Fix for Bug 5443, Inaccurate highlighting of fields in patron update email

- email was incorrectly named emailaddress
- string processing was being done to address and B_address
  which didn't seem to be serving a purpose

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4173 - Statuses not appearing in the OPAC
Owen Leonard [Fri, 10 Dec 2010 14:33:36 +0000 (14:33 +0000)]
Fix for Bug 4173 - Statuses not appearing in the OPAC

This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5391 - can't add multiples to batch
Chris Nighswonger [Fri, 12 Nov 2010 19:56:25 +0000 (14:56 -0500)]
Bug 5391 - can't add multiples to batch

This was due to the use of an OR which seems to have caused the
param method to be called in a scalar context thus returning only
the first of multiple repeated cgi params.

This patch retains the intent of the OR by replacing it with a
conditional.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.01.002
Chris Nighswonger [Tue, 14 Dec 2010 03:16:12 +0000 (22:16 -0500)]
Updating Version Number to 3.02.01.002

13 years agoBug 5423: Deleted Patrons are no longer saved in table deletedborrowers
Katrin Fischer [Mon, 6 Dec 2010 07:28:38 +0000 (08:28 +0100)]
Bug 5423: Deleted Patrons are no longer saved in table deletedborrowers

Tested with HEAD
> Should also apply to 3.2.x
( Not tested with 3.2.x)

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding another developer to the Koha history, 120 now!
Chris Cormack [Sun, 12 Dec 2010 09:57:28 +0000 (22:57 +1300)]
Adding another developer to the Koha history, 120 now!
(cherry picked from commit 4fc888572be10bbc3981dfd02f8e9ba0cfa73612)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug5455 (Fix uninitialized-warnings on authorities.pl)
Marcel de Rooy [Thu, 9 Dec 2010 12:36:07 +0000 (12:36 +0000)]
bug5455 (Fix uninitialized-warnings on authorities.pl)

Fix warnings for uninitialized authtypecode on lines 646, 653.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5479 - Update package building scripts
Robin Sheat [Thu, 9 Dec 2010 01:27:43 +0000 (14:27 +1300)]
Bug 5479 - Update package building scripts

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4935: fix for allowing authorized values to be "unset"
Liz Rea [Wed, 8 Dec 2010 20:15:10 +0000 (15:15 -0500)]
Bug 4935: fix for allowing authorized values to be "unset"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating test for systprefs to give more useful output
Chris Cormack [Sun, 12 Dec 2010 07:48:56 +0000 (20:48 +1300)]
Updating test for systprefs to give more useful output
(cherry picked from commit 423138606eabcae2b9960d1a9841f0ca51f9fd46)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 2808, Hold queue not alphabetizing
Owen Leonard [Mon, 6 Dec 2010 21:07:02 +0000 (22:07 +0100)]
Fix for Bug 2808, Hold queue not alphabetizing

White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5475 Wrong messages date formating on Check Out page
Frédéric Demians [Mon, 6 Dec 2010 19:52:06 +0000 (14:52 -0500)]
Bug 5475 Wrong messages date formating on Check Out page

On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoErgonomy improvement in smart rule management
Jean-André Santoni [Mon, 6 Dec 2010 18:00:21 +0000 (18:00 +0000)]
Ergonomy improvement in smart rule management

Added a jQuery table filter, usefull when you have a lot of rows. This filter works on the entire row and allows you for exemple to type "Adul Perio 5".
Indentation cleaning.
Added tabs to filter colums on 4 axes: All, Issues, Fines and Reserves.
Moved the table filter to the right of the tabs.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4500 - remove commas from price formatting
Robin Sheat [Mon, 6 Dec 2010 15:58:04 +0000 (16:58 +0100)]
Bug 4500 - remove commas from price formatting

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 692786b51922e75dae76403a7a3317f7aae13905)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5022 Supplements were not saved correctly
Colin Campbell [Mon, 6 Dec 2010 15:48:47 +0000 (16:48 +0100)]
Bug 5022 Supplements were not saved correctly

No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa6ce934d9fc3eb260211292c44ae941fe214330)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for 4832 - Re-editing a suggestion changes the item type
Owen Leonard [Mon, 6 Dec 2010 15:41:17 +0000 (16:41 +0100)]
Fix for 4832 - Re-editing a suggestion changes the item type

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c9f3f2872f8ca15eed8bcd73fcd498f81ad7d5df)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5467: Kits shown wrong as visual material in XSLT displays
Katrin Fischer [Mon, 6 Dec 2010 14:55:03 +0000 (09:55 -0500)]
Bug 5467: Kits shown wrong as visual material in XSLT displays

- reused icon for mixed materials for kits
- fixed missing icon for mixed materials

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5446 Item creation in Acquisition module doesn't control mandatory field
f.demians at tamil.fr [Fri, 26 Nov 2010 07:22:45 +0000 (08:22 +0100)]
Bug 5446 Item creation in Acquisition module doesn't control mandatory field

Add some JS validing form, so saving an order is blocked if any item mandatory
field is empty.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
(cherry picked from commit 76264638ccd16600fa063fe19475e73177763916)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdd BSZ to Koha's About page
Katrin Fischer [Wed, 15 Sep 2010 12:47:55 +0000 (14:47 +0200)]
Add BSZ to Koha's About page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoIncremental fix for Bug 3285 - Location on Add Subscription should be pull down
Owen Leonard [Mon, 6 Dec 2010 11:56:12 +0000 (11:56 +0000)]
Incremental fix for Bug 3285 - Location on Add Subscription should be pull down

- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5460: AutoEmailPrimaryAddress set to invalid value in sysprefs.sql
Ian Walls [Thu, 2 Dec 2010 14:45:29 +0000 (09:45 -0500)]
Bug 5460: AutoEmailPrimaryAddress set to invalid value in sysprefs.sql

Fixes de-DE, en, fr-FR, pl-PL, ru-RU and uk-UA default install values for this system preference (changing from '0'
to 'OFF', the preferred value).

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5457: gather_print_notices.pl requires explicit stylesheet
Ian Walls [Thu, 2 Dec 2010 14:29:27 +0000 (09:29 -0500)]
Bug 5457: gather_print_notices.pl requires explicit stylesheet

Adds a conditional around the opening and closing of STYLESHEET, testing on whether the $stylesheet variable is set
or not.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4908: rename temlate variable to branchname
Galen Charlton [Sat, 13 Nov 2010 19:08:59 +0000 (14:08 -0500)]
bug 4908: rename temlate variable to branchname

Using branchname is more accurate and could avoid
a bug if/when the patron update function is made more
sophisticated.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bb032138e72a6428e404d9f3593430b7fd989f45)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4908 - OPAC patron details page doesn't show patron's home library
Owen Leonard [Sat, 13 Nov 2010 19:08:58 +0000 (14:08 -0500)]
Fix for Bug 4908 - OPAC patron details page doesn't show patron's home library

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d86c4aa8943054be2b94990c9778eacff9ec4259)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5397: display renew count consistently
Galen Charlton [Sat, 13 Nov 2010 03:00:27 +0000 (22:00 -0500)]
bug 5397: display renew count consistently

Display the renewal count for loans consistently; in particular,
for loans that have never been renewed, display 0.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 02524213b3eba1166121bc7e2831f02e93ac941a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4983 - Add edit record / edit item links to search results
Owen Leonard [Sat, 13 Nov 2010 18:06:50 +0000 (13:06 -0500)]
Fix for Bug 4983 - Add edit record / edit item links to search results

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 05dd542cebf0e33b4dd1ee30d5b4190a6f18e277)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4851 - Batch delete shouldn't show delete button if no items were found
Owen Leonard [Sat, 13 Nov 2010 18:42:35 +0000 (13:42 -0500)]
Fix for Bug 4851 - Batch delete shouldn't show delete button if no items were found

- Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e6ebf10bba5d9ebec0f8d9995df16d2eb384f44f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5048, Error in menu/submenu for select language in intranet
Owen Leonard [Sat, 13 Nov 2010 19:14:39 +0000 (14:14 -0500)]
Fix for Bug 5048, Error in menu/submenu for select language in intranet

Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1024eceec715fed2f5c38ac6998ff9be75240280)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5030 - Improve handling of duplicate patrons
Owen Leonard [Sat, 13 Nov 2010 19:34:42 +0000 (14:34 -0500)]
Fix for Bug 5030 - Improve handling of duplicate patrons

- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
  of moremember.pl to display more patron details than the previous
  version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f0495238de31cbdcacabe8f3986081f150ae2cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5444 Fix misc/translate script for 'standard' Koha install
Frédéric Demians [Thu, 25 Nov 2010 07:55:05 +0000 (08:55 +0100)]
Bug 5444 Fix misc/translate script for 'standard' Koha install

[3.2] Should apply

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4449: AllowHoldPolicyOverride does not override all hold policies
Ian Walls [Tue, 30 Nov 2010 07:19:49 +0000 (02:19 -0500)]
Bug 4449: AllowHoldPolicyOverride does not override all hold policies

This patch provides a universal override to any hold policy if the AllowHoldPolicyOverride is set.
Amongst other overrides, this patch allows missing, non-checked out items to be placed on hold even with AllowShelfHolds turned off.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5029 - Update patron deletion error page
Owen Leonard [Sat, 13 Nov 2010 19:42:05 +0000 (14:42 -0500)]
Fix for Bug 5029 - Update patron deletion error page

- Styling error message with "dialog alert" class
- Adding sidebar patron details to match other patron pages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7b3b0c75b3dd21dd9c1899f0e5103c3b8798810)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5405: remove disused script catalogue/suggest.pl
Galen Charlton [Sun, 14 Nov 2010 03:37:10 +0000 (22:37 -0500)]
bug 5405: remove disused script catalogue/suggest.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9753368626e631ebb06929278d408453186c2528)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFurther fixes for Bug 5142 - Untranslatable strings in tag review template
Owen Leonard [Fri, 19 Nov 2010 00:37:16 +0000 (19:37 -0500)]
Further fixes for Bug 5142 - Untranslatable strings in tag review template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 470dc1d37c457b9919200c61e369a4fb6207dbc1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding 3.2.1 release to the history
Chris Cormack [Thu, 25 Nov 2010 20:18:06 +0000 (09:18 +1300)]
Adding 3.2.1 release to the history

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing formatting and links in the history document
Chris Cormack [Thu, 25 Nov 2010 20:05:39 +0000 (09:05 +1300)]
Fixing formatting and links in the history document

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix some compile time errors reported in test suite
Colin Campbell [Fri, 26 Nov 2010 14:39:18 +0000 (14:39 +0000)]
Fix some compile time errors reported in test suite

redeclaration of itemnumber in RotatingCollections
A couple of errors caused by retaining commas in qw()

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5448: Refactor Boolean.pm
Colin Campbell [Fri, 26 Nov 2010 16:31:35 +0000 (16:31 +0000)]
Bug 5448: Refactor Boolean.pm

Remove unnecesssary export
Use Exporter according to best practices
Use Carp not warn so we know where the error string came from
Don't create warnings manipulating undefined input
Replace package variables by lexicals

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5448 Use Test::More in Boolean.t
Colin Campbell [Fri, 26 Nov 2010 16:31:34 +0000 (16:31 +0000)]
Bug 5448 Use Test::More in Boolean.t

Use Test::More's structure as more readable
Replaced a test of an used function with a use_ok test
of the module

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixes bug 5232: Shelfname won't display on high-numbered lists
Ian Walls [Tue, 30 Nov 2010 07:25:30 +0000 (02:25 -0500)]
Fixes bug 5232: Shelfname won't display on high-numbered lists

This bugfix adds an explicit GetShelf for the specific shelfnumber when viewing that individual shelfnumber.  This captures the
shelfname, which was originally pulled from shelflist->{$shelfnumber}, which may not have been populated if the List in question was
beyond the 20th private or public list in the system.

Also adds a more explicit sort: the sort from the CGI takes top priority, then it falls back to the default sort for the list, and
ultimate falls to 'title' if neither CGI nor default sort exist.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5450 Avoid a name clash in ILSDI modules
Colin Campbell [Fri, 26 Nov 2010 17:27:13 +0000 (17:27 +0000)]
Bug 5450 Avoid a name clash in ILSDI modules

C4::ILSDI::Utility exports a subroutine CanBookBeReserved
Both ILSDI were also importing a subroutine of that name from
C4::Reserves Remove conflict by listing subroutines
imported from C4::Reserves explicitly

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5402, "add to cart" shown on checkbox hover
Owen Leonard [Tue, 30 Nov 2010 15:14:23 +0000 (10:14 -0500)]
Fix for Bug 5402, "add to cart" shown on checkbox hover

This patch removes the title hint altogether. The checkbox might
be used for the cart, lists, holds, or tags, and expressing this
in a title hint seems overly complicated.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4451 followup - don't need /g for this replace
Galen Charlton [Sat, 13 Nov 2010 17:58:55 +0000 (12:58 -0500)]
bug 4451 followup - don't need /g for this replace

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d056b2f62a7f971126590236bee54a344d526fb7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4451 Batch item tool can't process file with Windows line endings
Owen Leonard [Sat, 13 Nov 2010 17:58:54 +0000 (12:58 -0500)]
Fix for Bug 4451 Batch item tool can't process file with Windows line endings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3f5d9537db4b07a993cc0a11fd4c03acb1859d20)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4981, Tweak style of item listing on MARC display
Owen Leonard [Sat, 13 Nov 2010 17:55:02 +0000 (12:55 -0500)]
Fix for Bug 4981, Tweak style of item listing on MARC display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 781b4e5fae89021c69c5de5e621faebb6457dd31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Owen Leonard [Sat, 13 Nov 2010 03:00:26 +0000 (22:00 -0500)]
Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab

Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 083d3b1a929707a84fe4c97d4c815198bef9e1dc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5269 - link to patron edit form when editing turned off
Owen Leonard [Fri, 12 Nov 2010 21:12:11 +0000 (16:12 -0500)]
Fix for Bug 5269 - link to patron edit form when editing turned off

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 16c891092fec9b413fb5cb86cc4a0f8f7c43888f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time
Owen Leonard [Fri, 12 Nov 2010 20:59:47 +0000 (15:59 -0500)]
Fix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time

This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cc57c2688d73046ee4930869d2d7fabdc8dd37ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.01.001
Galen Charlton [Sat, 13 Nov 2010 21:50:30 +0000 (16:50 -0500)]
Updating Version Number to 3.02.01.001

bug 5127: database update to add the suggestion notification templates

Being especially careful to not scribble over any ones
that the library might have already defined.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5127: sample notice templates for suggestions
Galen Charlton [Sat, 13 Nov 2010 21:35:43 +0000 (16:35 -0500)]
bug 5127: sample notice templates for suggestions

* supply default suggestion status change email
  templates.
* remove the deprecated mail_suggestion_*.tmpl files

There are a couple suggestion statuses referred to
in the code and suggestion management page that currently
do not have notice templates defined: ASK and CHECKED.  These
seem to be internal, so perhaps default message templates
are not needed for these.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 7fd45b986197721f1486bea61a20a717d4217c4a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4211: ensure that suggestion emails have full details
Galen Charlton [Sat, 13 Nov 2010 21:27:47 +0000 (16:27 -0500)]
bug 4211: ensure that suggestion emails have full details

Because of how the ModFoo routines work, if you are only
changing selected columns but are also using the change
as a trigger to place a message in the queue, you need
to fetch the full row before generating the message.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit d3df54d05245b3fa11f052b4c09104bdd2531e31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4211: more fixes to suggestion letter template handling
Galen Charlton [Sat, 13 Nov 2010 20:43:27 +0000 (15:43 -0500)]
bug 4211: more fixes to suggestion letter template handling

* Now displays the correct list of fields to choose
  for suggestion letters.
* Clean up mixture of old and new column selection code
  introduced in commit 88bb1b63, thereby restoring
  the intent of the patch for bug 3522.
* Enable suggestion library to be used in suggestion
  letter templates

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 994d6e2aac6092b7c852546eeca2253f59270e53)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4211: This patch should provide a working way to send out mail from suggestions
Chris Cormack [Thu, 12 Aug 2010 21:44:46 +0000 (09:44 +1200)]
Bug 4211: This patch should provide a working way to send out mail from suggestions

Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc

Squashed commit of the following:

commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:41:34 2010 +1200

    bug 4211 parsing the letter before we enqueue it

commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:32:09 2010 +1200

    Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent

commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:36:26 2010 -0400

    Fix for Bug 4211, Acquisitions actions on suggestions don't generate email

    Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
    notices are added by hand (or from default sql--see Bug 5127) this
    correction should get suggestions notices properly enqueued.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:27:33 2010 -0400

    Fix for Bug 5126 - Suggestions module missing from "add notice" form

    - Adding "suggestions" entry
    - Re-ordering options in alphabetical order

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit b1c2d560b66272ec34c1bbd380db24452be9bc3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.02.01.000
Chris Nighswonger [Mon, 29 Nov 2010 19:43:24 +0000 (14:43 -0500)]
Updating Version Number to 3.02.01.000

Updating version number for 3.2.1 release.

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