wip/koha-chris_n.git
8 years agoEnh 6165: Add OPACResultsSidebar system preference
Ian Walls [Thu, 8 Sep 2011 21:15:39 +0000 (17:15 -0400)]
Enh 6165: Add OPACResultsSidebar system preference

Adds a system preference for displaying content under the "Refine your Search" menu
on OPAC search results.  Arbitrary HTML can be added, like OpacNav, opacheader, opaccredits
and other such system preferences

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6687 - allow people to be moved in the holds queue
Robin Sheat [Wed, 7 Sep 2011 01:45:58 +0000 (13:45 +1200)]
Bug 6687 - allow people to be moved in the holds queue

This fixes a regression introduced by Bug 6526 that told you someone
already had a reserve if you attempted to move their ordering in the
hold queue.

(note: it also cleans a host of trailing whitespace errors that were in
that file)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6256' into kcmaster
Chris Cormack [Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)]
Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster

8 years ago6256 Follow up fixing typo
Marcel de Rooy [Wed, 7 Sep 2011 12:28:45 +0000 (14:28 +0200)]
6256 Follow up fixing typo

Fixing typo for 1062

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6750 Guarantor search broken on translated templates
Frédéric Demians [Thu, 1 Sep 2011 08:09:48 +0000 (10:09 +0200)]
Bug 6750 Guarantor search broken on translated templates

Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6256: Many bib1 attributes missing
Ian Walls [Sun, 28 Aug 2011 01:19:55 +0000 (21:19 -0400)]
Bug 6256: Many bib1 attributes missing

This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped

In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally

Signed-off-by: <dev_patches@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc
Paul Poulain [Tue, 9 Aug 2011 11:51:57 +0000 (13:51 +0200)]
Bug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc

There were some lines in the specific french sysprefs that were not french/unimarc specific at all
I've removed them, the file now only contains french & unimarc specific things

I also have removed NoZebra as it's deprecated, so should not be here anymore

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6537 - squashed version of the previous 5 commits, signed-off
Magnus Enger [Wed, 15 Jun 2011 06:38:40 +0000 (08:38 +0200)]
Bug 6537 - squashed version of the previous 5 commits, signed-off

Bug 6537 - Move installer/data/mysql/en/mandatory/sysprefs.sql to installer/data/mysql/sysprefs.sql

Bug 6537 - Make the web installer use installer/data/mysql/sysprefs.sql

Bug 6537 - New syspref files with only the prefs that differ from the default

I have mostly deleted old syspref files and created new ones, with a new name,
mainly in order to reduce the risk of merge conflicts if the old syspref files
are changed before this patch is pushed, if it is pushed.

See http://wiki.koha-community.org/wiki/Simplified_syspref_handling_RFC for
a description of how the new files were created to reflect sysprefs that
differ from the global default.

.txt files have been moved to reflect the new names of the SQL files they are
associated with.

Bug 6537 - Remove syspref-related tests in xt/

As far as I can see, the previous patches for this bug makes the syspref tests
obsolete, and this patch removes them:

xt/syspref.t
xt/check_sysprefs.t

Bug 6537 - Fix a problem in French syspref file

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFollow up for 6665 : Fixing the hide_marc pref also
Chris Cormack [Mon, 5 Sep 2011 02:50:29 +0000 (14:50 +1200)]
Follow up for 6665 : Fixing the hide_marc pref also

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when catalo...
Chris Cormack [Mon, 5 Sep 2011 02:42:55 +0000 (14:42 +1200)]
Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6555 : only 10 lists show in the staff client
Chris Cormack [Sun, 4 Sep 2011 23:27:40 +0000 (11:27 +1200)]
Bug 6555 : only 10 lists show in the staff client

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 5605 [ENH] SIP: Add Support for the Fee Paid Message
Colin Campbell [Sun, 9 Jan 2011 23:53:05 +0000 (23:53 +0000)]
Bug 5605 [ENH] SIP: Add Support for the Fee Paid Message

Allow fee paid to be supported for those machines which handle it

Development Sponsered by Halton Borough Council

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6732 : Showing the bibliographic title on the manual invoices line
Chris Cormack [Mon, 5 Sep 2011 02:04:26 +0000 (14:04 +1200)]
Bug 6732 : Showing the bibliographic title on the manual invoices line

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
8 years agoUpdating about file and history doc
Chris Cormack [Tue, 6 Sep 2011 20:49:31 +0000 (08:49 +1200)]
Updating about file and history doc

8 years agobug 6724: enable decimals on values greater than 1
Brett Wilkins [Mon, 29 Aug 2011 04:47:48 +0000 (16:47 +1200)]
bug 6724: enable decimals on values greater than 1

Separating perl standard uses from koha uses

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoUpdating history and about file
Chris Cormack [Sun, 4 Sep 2011 08:49:09 +0000 (20:49 +1200)]
Updating history and about file

8 years agoBug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Robin Sheat [Mon, 29 Aug 2011 00:24:45 +0000 (12:24 +1200)]
Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 4877 [ENH] - Update man page for koha-create
Magnus Enger [Sun, 28 Aug 2011 13:02:09 +0000 (15:02 +0200)]
Bug 4877 [ENH] - Update man page for koha-create

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6516 - Make borrowernumber of staff user configurable in koha-create
Magnus Enger [Tue, 9 Aug 2011 08:22:20 +0000 (10:22 +0200)]
Bug 6516 - Make borrowernumber of staff user configurable in koha-create

Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.

Remember to update the wiki if this gets pushed!

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6722: [SIGNED-OFF] Cause build output to appear on the screen
Robin Sheat [Wed, 22 Jun 2011 06:00:24 +0000 (18:00 +1200)]
Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen

This allows the build information to not be suppressed when using
build-git-snapshot. This makes seeing where problems are substantially
easier.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6121: follow-up = using overloo instead of reserveloo
Paul Poulain [Wed, 10 Aug 2011 11:46:18 +0000 (13:46 +0200)]
Bug 6121: follow-up = using overloo instead of reserveloo

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6121: Holds awaiting pickup
Christophe Croullebois [Tue, 8 Feb 2011 16:58:54 +0000 (17:58 +0100)]
Bug 6121: Holds awaiting pickup

On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 5028 - Remove references to catmaintain.pl
Owen Leonard [Tue, 23 Aug 2011 18:57:02 +0000 (14:57 -0400)]
Fix for Bug 5028 - Remove references to catmaintain.pl

catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6768, Two unused include files can be removed
Owen Leonard [Tue, 23 Aug 2011 18:52:37 +0000 (14:52 -0400)]
Fix for Bug 6768, Two unused include files can be removed

Removing error-top.inc and error-bottom.inc

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 4966 - follow up - add xhtml closure for input tags
Alex Arnaud [Fri, 2 Sep 2011 12:36:21 +0000 (14:36 +0200)]
Bug 4966 - follow up - add xhtml closure for input tags

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug4966 - follow up to 4966 changes language from 'end' to 'finish'
Nicole C. Engard [Fri, 5 Aug 2011 14:09:21 +0000 (10:09 -0400)]
bug4966 - follow up to 4966 changes language from 'end' to 'finish'

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug 4966: Add a button in parcel.pl for confirm end receiving
Alex Arnaud [Fri, 5 Aug 2011 13:47:16 +0000 (15:47 +0200)]
bug 4966: Add a button in parcel.pl for confirm end receiving

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_P...
Katrin Fischer [Sun, 17 Jul 2011 15:18:47 +0000 (17:18 +0200)]
Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)

Patch fixes some translation issues and address formatting for printed
hold notices.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Katrin Fischer [Sun, 17 Jul 2011 14:20:00 +0000 (16:20 +0200)]
Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails

Translates the purchase suggestion mails in sample_notices.sql from English to German.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug 6834 followup removing param_map
Henri-Damien LAURENT [Fri, 2 Sep 2011 08:36:29 +0000 (10:36 +0200)]
bug 6834 followup removing param_map

param_map was still to be found in two files.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6834 : Removing last of the $template->{param_map}
Chris Cormack [Fri, 2 Sep 2011 03:31:28 +0000 (15:31 +1200)]
Bug 6834 : Removing last of the $template->{param_map}

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge branch 'new/bug_6479' into kcmaster
Chris Cormack [Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)]
Merge branch 'new/bug_6479' into kcmaster

8 years agoBug 6479 Converts all the serialseq variables to UTF-8.
Frédérick Capovilla [Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)]
Bug 6479 Converts all the serialseq variables to UTF-8.

Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Owen Leonard [Mon, 22 Aug 2011 20:09:05 +0000 (16:09 -0400)]
Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded

Removing unused script.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoRevert "Bug 5630 CAS improvements"
Chris Cormack [Fri, 2 Sep 2011 01:22:20 +0000 (13:22 +1200)]
Revert "Bug 5630 CAS improvements"

This reverts commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c.

8 years agoBug 6822: fix RIS export from OPAC
Steven Callender [Tue, 30 Aug 2011 19:19:23 +0000 (15:19 -0400)]
Bug 6822: fix RIS export from OPAC

Prior to this patch, RIS export was producing
effectively empty output.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6351' into kcmaster
Chris Cormack [Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)]
Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster

8 years agoBug 6351: Cannot delete library-specific holds polices and checkout limits
Ian Walls [Tue, 30 Aug 2011 17:49:51 +0000 (13:49 -0400)]
Bug 6351: Cannot delete library-specific holds polices and checkout limits

Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.

Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6704 : Escaping html in the merging records, so " don't break the merge
Chris Cormack [Mon, 29 Aug 2011 04:46:11 +0000 (16:46 +1200)]
Bug 6704 : Escaping html in the merging records, so " don't break the merge

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6656 : Fix for advanced search not respecting default sort order
Chris Cormack [Mon, 29 Aug 2011 03:35:45 +0000 (15:35 +1200)]
Bug 6656 : Fix for advanced search not respecting default sort order

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6794 : Fixing a bug with member flags in IE
Maxime Pelletier [Fri, 26 Aug 2011 21:09:46 +0000 (09:09 +1200)]
Bug 6794 : Fixing a bug with member flags in IE

Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 5524 : Cant delete list from the second page of lists
Chris Cormack [Fri, 26 Aug 2011 01:42:44 +0000 (13:42 +1200)]
Bug 5524 : Cant delete list from the second page of lists

Includes follow up fixing deleting lists in OPAC

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6528 : Cataloguing search not showing location for available items
Chris Cormack [Mon, 29 Aug 2011 02:14:58 +0000 (14:14 +1200)]
Bug 6528 : Cataloguing search not showing location for available items

Cataloging search now shows holdings information.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct languag...
preprod34 [Fri, 12 Aug 2011 15:44:33 +0000 (11:44 -0400)]
Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.

xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoUpdating about page and history
Chris Cormack [Sun, 28 Aug 2011 07:47:22 +0000 (19:47 +1200)]
Updating about page and history

8 years agoMerge remote-tracking branch 'kc/new/bug_6712' into kcmaster
Chris Cormack [Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster

8 years agoMerge remote-tracking branch 'kc/new/bug_6696' into kcmaster
Chris Cormack [Sun, 28 Aug 2011 07:34:18 +0000 (19:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster

8 years agoFix for Bug 6712 - Remove memberofinstitution markup from templates until it can...
Owen Leonard [Thu, 11 Aug 2011 19:21:35 +0000 (15:21 -0400)]
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6696, New category button broken when no categories defined
Owen Leonard [Wed, 10 Aug 2011 15:44:37 +0000 (11:44 -0400)]
Fix for Bug 6696, New category button broken when no categories defined

The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.

This patch hides the table in cases where there are no
categories and displays an error message instead.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6652, Zip showing in funny place on libraries admin
Owen Leonard [Mon, 1 Aug 2011 11:51:18 +0000 (07:51 -0400)]
Fix for Bug 6652, Zip showing in funny place on libraries admin

This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.

It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:

[name]
[street address]
[postal code + city]

...or any other variation of course.

While I'm in there, also making branch URLs and emails clickable.

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6791 - editing list with apostrophe loses text
Owen Leonard [Fri, 26 Aug 2011 19:14:48 +0000 (15:14 -0400)]
Fix for Bug 6791 - editing list with apostrophe loses text

Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6733 - Change return page after printing routing slip
Colin Campbell [Fri, 26 Aug 2011 16:14:25 +0000 (17:14 +0100)]
Bug 6733 - Change return page after printing routing slip

Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6765: sip2 unicode checksum
Ulrich Kleiber [Fri, 29 Jul 2011 14:35:40 +0000 (16:35 +0200)]
Bug 6765: sip2 unicode checksum

Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216

http://bugs.koha-community.org/show_bug.cgi?id=6765
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 4419 - cannot change module for notice templates
Owen Leonard [Mon, 22 Aug 2011 15:08:59 +0000 (11:08 -0400)]
Fix for Bug 4419 - cannot change module for notice templates

Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge branch 'new/bug_4330' into kcmaster
Chris Cormack [Sat, 27 Aug 2011 07:34:36 +0000 (19:34 +1200)]
Merge branch 'new/bug_4330' into kcmaster

8 years agoBug 6662: Remove Dewey Specific References in Sort
Nicole C. Engard [Sat, 20 Aug 2011 23:33:18 +0000 (19:33 -0400)]
Bug 6662: Remove Dewey Specific References in Sort

The sort option used to include tooltips for call number
that were Dewey specific.   This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years ago6747 Checks in opac-export
Marcel de Rooy [Mon, 22 Aug 2011 12:02:03 +0000 (14:02 +0200)]
6747 Checks in opac-export

Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBumping database version
Chris Cormack [Fri, 26 Aug 2011 03:32:55 +0000 (15:32 +1200)]
Bumping database version

8 years agoBug 5866 : Updated patch to speed up holds awaiting pickup
Chris Cormack [Thu, 25 Aug 2011 03:21:01 +0000 (15:21 +1200)]
Bug 5866 : Updated patch to speed up holds awaiting pickup

This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
8 years agoFix for Bug 4893, Add an input field for Check In on main Staff Client page
Owen Leonard [Mon, 8 Aug 2011 16:36:07 +0000 (12:36 -0400)]
Fix for Bug 4893, Add an input field for Check In on main Staff Client page

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6753' into kcmaster
Chris Cormack [Fri, 26 Aug 2011 03:12:32 +0000 (15:12 +1200)]
Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster

8 years agoFollow-up fix for Bug 6753, Markup corrections and improvements for label export...
Owen Leonard [Fri, 19 Aug 2011 14:23:58 +0000 (10:23 -0400)]
Follow-up fix for Bug 6753, Markup corrections and improvements for label export window

Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
8 years agoBug 6748 - Add link to fast add framework while circulating, if a barcode is not...
Chris Cormack [Fri, 19 Aug 2011 03:18:47 +0000 (15:18 +1200)]
Bug 6748 - Add link to fast add framework while circulating, if a barcode is not found

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
8 years agoMerge remote-tracking branch 'kc/new/bug_6726' into kcmaster
Chris Cormack [Fri, 26 Aug 2011 03:01:09 +0000 (15:01 +1200)]
Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster

8 years agoFollow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Owen Leonard [Wed, 24 Aug 2011 13:50:19 +0000 (09:50 -0400)]
Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned

Corresponding fix for the OPAC

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFixing typo in history doc
Chris Cormack [Fri, 26 Aug 2011 01:00:54 +0000 (13:00 +1200)]
Fixing typo in history doc

8 years ago150th developer!!!
Chris Cormack [Fri, 26 Aug 2011 00:49:50 +0000 (12:49 +1200)]
150th developer!!!

8 years agoBug 6723 : import-framework-crlf
Ward van Wanrooij [Mon, 15 Aug 2011 12:38:40 +0000 (14:38 +0200)]
Bug 6723 : import-framework-crlf

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
8 years agoBug 6721 - improve searching in the acquisitions system
Srdjan Jankovic [Mon, 15 Aug 2011 06:17:52 +0000 (18:17 +1200)]
Bug 6721 - improve searching in the acquisitions system

This allows a basket to be searched for by name or invoice number from
anywhere in the acquisitions system. It is accessible by clicking on
"orders search", clicking the '[+]' and filling in the basket or invoice
no. fields.

Author:    Srdjan Jankovic <srdjan@catalyst.net.nz>
Author:    Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6562: Silence runtime error in reserve/request.pl
Colin Campbell [Mon, 4 Jul 2011 15:20:59 +0000 (16:20 +0100)]
Bug 6562: Silence runtime error in reserve/request.pl

Not defining action just causes logging of noisy
runtime warnings.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug 6538 update letter.pl help file
Nicole C. Engard [Tue, 28 Jun 2011 19:24:45 +0000 (15:24 -0400)]
bug 6538 update letter.pl help file

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6695 - Layout of patron category add/edit form slightly broken
Owen Leonard [Wed, 10 Aug 2011 15:16:42 +0000 (11:16 -0400)]
Fix for Bug 6695 - Layout of patron category add/edit form slightly broken

The markup for the fields for enrollment period "in months" and "until date"
was non-standard I think because the two fields are supposed to be visually
and functionally linked (having the same purpose and being mutually
exclusive).

This patch changes the markup so that the two fields share a fieldset
having "choose one" as the legend. The "hint" is now hidden unless
it is triggered by the javascript validation on submit.

I wanted to trigger the validation of the two fields onblur instead
of just onsubmit, but found that the datepicker widget doesn't
consistently trigger a change or a blur event on that field.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Layout problems are fixed
- Layout is more clear about choosing either 'In months' or 'Until date'
- Clear error message shows when you enter values in both fields

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFollow-up to Bug 4868, Improve controls for cloning and deleting subfields
Owen Leonard [Mon, 15 Aug 2011 19:22:21 +0000 (15:22 -0400)]
Follow-up to Bug 4868, Improve controls for cloning and deleting subfields

- Adding similar icons for cloning and deleting tags
- Adding icon for the "Tag editor" links ("...")

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
8 years agoBug 6690: If multiple issues are received in serials-edit.pl, changing the status...
Frédérick Capovilla [Sun, 14 Aug 2011 19:42:52 +0000 (21:42 +0200)]
Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.

If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.

Reimplementation of Patch for 3.4.x
Patch for 3.2.x from Frédérick Capovilla

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
Salvador Zaragoza Rubio [Fri, 19 Aug 2011 10:33:05 +0000 (12:33 +0200)]
Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF

Function _export_table_csv modified to remove CR/LF in the data
from the database to built a correct csv file.

Function _import_table_csv modified to deal with CR/LF in the data
field. When a line is found with an unproper end (a data field has not
end quote), it's concatenated to a temporary buffer until the next
line ends ok and then it's proccessed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_5498' into kcmaster
Chris Cormack [Thu, 25 Aug 2011 00:07:49 +0000 (12:07 +1200)]
Merge remote-tracking branch 'kc/new/bug_5498' into kcmaster

8 years agoFollow-up fix for Bug 5498, Standardize markup and style of pagination menus
Owen Leonard [Fri, 19 Aug 2011 18:40:48 +0000 (14:40 -0400)]
Follow-up fix for Bug 5498, Standardize markup and style of pagination menus

Missed a couple of instances of the pagination menu on the
lists page. Previously the pagination links on the page
listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
unstyled. After this patch the links should be styled.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
Owen Leonard [Mon, 18 Jul 2011 19:38:13 +0000 (15:38 -0400)]
Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns

Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
a new dictionary definition. Before the patch, in Step 4 you would not see
any kind of form field for entering a comparison. After patching Step 4 will
offer you a field labeled "Search string matches."

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes described problem with mediumtext columns.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFixing executable bit on koha-httpd.conf
Chris Cormack [Tue, 23 Aug 2011 20:49:13 +0000 (08:49 +1200)]
Fixing executable bit on koha-httpd.conf

8 years agoMerge remote-tracking branch 'kc/new/enh/bug_6540' into kcmaster
Chris Cormack [Tue, 23 Aug 2011 03:52:52 +0000 (15:52 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_6540' into kcmaster

8 years agoBug 6540 - Followup - koha-create would die without --configfile
Magnus Enger [Mon, 15 Aug 2011 07:00:07 +0000 (09:00 +0200)]
Bug 6540 - Followup - koha-create would die without --configfile

koha-create would fail to check that --configfile was set on the
commandline, before either including it if it existed or dying if
it did not. This patch should make sure the existence of a
configfile is only tested if --config is set.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
This should apply against 3.4 and master.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Owen Leonard [Tue, 16 Aug 2011 12:38:21 +0000 (08:38 -0400)]
Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned

The SMS section of the template was commented out in the patch
pushed for Bug 5889, 'Allow message names to be translatable'
with the comment 'fixing columns overflow.' That seems to have been
a cosmetic fix for what I can only imagine was a different bug?

Also fixing a T:T variable scope error.

After applying this patch the "SMS" column in the Patron messaging
preferences should appear when the SMSSendDriver preference is not empty.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6728, Table sorter for receiving acquisitions
Owen Leonard [Wed, 17 Aug 2011 20:04:55 +0000 (16:04 -0400)]
Fix for Bug 6728, Table sorter for receiving acquisitions

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6703 : Link to invoice broken
Chris Cormack [Mon, 22 Aug 2011 02:05:05 +0000 (14:05 +1200)]
Bug 6703 : Link to invoice broken

8 years agoMerge remote-tracking branch 'kc/new/bug_6678' into kcmaster
Chris Cormack [Sun, 21 Aug 2011 07:56:57 +0000 (19:56 +1200)]
Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster

8 years agoBug 6269 - can't undefine a printer profile
Chris Nighswonger [Wed, 17 Aug 2011 15:23:17 +0000 (11:23 -0400)]
Bug 6269 - can't undefine a printer profile

This patch adds a 'No Profile/N/A' selection to the printer profile
drop-down menu along with code to handle the selection of it. This
selection is the default selection for new templates.

Documentation should be updated to reflect this change.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6678 - Fix some problems with the standard NORMARC framework
Magnus Enger [Sun, 7 Aug 2011 21:38:02 +0000 (23:38 +0200)]
Bug 6678 - Fix some problems with the standard NORMARC framework

- Almost all fields are displayed as expanded in the cataloguing screens,
  because hidden=0 when it should be -1
- Koha-specific fields need to be translated
- some unnecessary punctuation should be removed
- problem with encoding - æøå not displayed correctly

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- created a new database  with all nb-NO sample files, no errors reported
- checked the cataloging frameworks for displaying problems
- saved record and created an item - all koha specific fields translated
No problems found.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6753, Markup corrections and improvements for label export window
Owen Leonard [Thu, 18 Aug 2011 20:25:32 +0000 (16:25 -0400)]
Fix for Bug 6753, Markup corrections and improvements for label export window

The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.

To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6754, Improve breadcrumbs on lists pages
Owen Leonard [Fri, 19 Aug 2011 18:38:37 +0000 (14:38 -0400)]
Fix for Bug 6754, Improve breadcrumbs on lists pages

Breadcrumb navigation on the lists pages should give the user links back to the
category of list they're viewing, public or private.

Patch changes this:

Lists -> Contents of (Your list)

To this:

Lists -> Your lists -> Contents of (Your list)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6486 - make koha-mysql get installed with the packages
Robin Sheat [Thu, 9 Jun 2011 05:15:09 +0000 (17:15 +1200)]
Bug 6486 - make koha-mysql get installed with the packages

A useful addition I overlooked.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6486 - add the koha-mysql command
Robin Sheat [Thu, 9 Jun 2011 05:00:45 +0000 (17:00 +1200)]
Bug 6486 - add the koha-mysql command

This lets you get into the mysql session for this library instance
really easily. Probably most useful for developers.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Chris Cormack [Thu, 18 Aug 2011 09:13:12 +0000 (21:13 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

8 years agoBug 6458 Template Toolkit files test case
Frédéric Demians [Thu, 21 Jul 2011 08:18:29 +0000 (10:18 +0200)]
Bug 6458 Template Toolkit files test case

This test validate Template Toolkit (TT) Koha files.

For the time being an unique validation is done: Test if TT files
contain TT directive within HTML tag. For example:

  <li[% IF

This kind of constuction MUST be avoided because it break Koha
translation process.

This patch transform also translation specific modules into C4 modules
in order to be able to use them in test case:

  C4::TTPaser
  C4::TmplToken
  C4::TmplTokenType

This patch is a Perl adaptation of a Haskell script from Frère Sébastien
Marie.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Notes on testing:
- translate install de-DE - worked ok
- translate update de-DE > translate install de-DE - worked ok
- running the test xt/tt_valid.t - worked ok and pointed out lots of problems.
Found no problems.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6482 - allow the mysql details to be changed during koha-create
Robin Sheat [Wed, 8 Jun 2011 03:10:09 +0000 (15:10 +1200)]
Bug 6482 - allow the mysql details to be changed during koha-create

This allows the database details (username and database name in
particular) to be modified in between a koha-create --request-db and
--populate-db. Most useful when you discover that the username is too
long or something. Now, when populating the database, the connection
information is reloaded from the koha-conf.xml rather than being
generated from the instance name.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6640, Locations not showing in circ reports
Owen Leonard [Tue, 2 Aug 2011 19:23:00 +0000 (15:23 -0400)]
Fix for Bug 6640, Locations not showing in circ reports

An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6714 : Removed the "en" in some paths of opac.css
preprod34 [Fri, 12 Aug 2011 13:44:51 +0000 (09:44 -0400)]
Bug 6714 : Removed the "en" in some paths of opac.css

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6743 - displayFacetCount not working
Owen Leonard [Wed, 17 Aug 2011 19:40:39 +0000 (15:40 -0400)]
Fix for Bug 6743 - displayFacetCount not working

T:T variable scope error.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6744 - Acknowledge the actual es-ES translators
Tomas Cohen Arazi [Wed, 17 Aug 2011 16:45:34 +0000 (13:45 -0300)]
Bug 6744 - Acknowledge the actual es-ES translators

es-ES translator credits are way outdated as of http://translate.koha-community.org/es/34

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBumping database version
Chris Cormack [Tue, 16 Aug 2011 22:35:52 +0000 (10:35 +1200)]
Bumping database version

8 years agoMerge remote-tracking branch 'kc/new/bug_4002' into kcmaster
Chris Cormack [Tue, 16 Aug 2011 22:34:55 +0000 (10:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_4002' into kcmaster