Commit graph

14647 commits

Author SHA1 Message Date
Brett Wilkins
f824121bb1 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>
2011-09-07 08:39:18 +12:00
Chris Cormack
9e93266714 Updating history and about file 2011-09-04 20:49:09 +12:00
Robin Sheat
6534b5cf29 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>
2011-09-04 20:22:18 +12:00
Magnus Enger
1c6cdaf162 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>
2011-09-04 20:21:34 +12:00
Magnus Enger
8d8d2e6b44 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>
2011-09-04 20:18:14 +12:00
Robin Sheat
a57b692a60 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>
2011-09-04 20:14:08 +12:00
Paul Poulain
f6d3cb05dd 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>
2011-09-04 20:04:13 +12:00
Christophe Croullebois
b2138a7ec6 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>
2011-09-04 20:03:37 +12:00
ca16532ea8 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>
2011-09-03 20:46:25 +12:00
7146449ace 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>
2011-09-03 20:43:45 +12:00
Alex Arnaud
ca1906f9c6 Bug 4966 - follow up - add xhtml closure for input tags
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 07:01:07 +12:00
Nicole C. Engard
bb958cc613 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>
2011-09-03 07:00:46 +12:00
Alex Arnaud
955450dd1b 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>
2011-09-03 06:59:49 +12:00
Katrin Fischer
6ba4419be0 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>
2011-09-03 06:50:05 +12:00
Katrin Fischer
ba78d6a850 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>
2011-09-03 06:49:49 +12:00
Henri-Damien LAURENT
1ce78a0c22 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>
2011-09-03 06:39:24 +12:00
Chris Cormack
0dbad3efce 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>
2011-09-03 06:37:50 +12:00
Chris Cormack
afa94246d3 Merge branch 'new/bug_6479' into kcmaster 2011-09-03 06:35:17 +12:00
Frédérick Capovilla
acc684bc01 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>
2011-09-03 06:31:03 +12:00
f9413ca2d2 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>
2011-09-03 06:25:57 +12:00
Chris Cormack
e8f654fcd2 Revert "Bug 5630 CAS improvements"
This reverts commit 9a3950f673.
2011-09-02 13:22:20 +12:00
Steven Callender
a2a9bc5220 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>
2011-09-01 21:39:10 +12:00
Chris Cormack
6be9d2b27d Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster 2011-09-01 21:28:41 +12:00
Ian Walls
cb6c40faf7 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>
2011-09-01 21:26:26 +12:00
Chris Cormack
720e3012a8 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>
2011-09-01 21:10:02 +12:00
Chris Cormack
5a2fc683d8 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>
2011-09-01 21:06:12 +12:00
Maxime Pelletier
6756581cf8 Bug 6794 : Fixing a bug with member flags in IE
Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2011-09-01 21:02:38 +12:00
Chris Cormack
e39de04020 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>
2011-09-01 20:55:16 +12:00
Chris Cormack
ff4b179e14 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>
2011-09-01 20:50:47 +12:00
preprod34
390d1d5be6 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>
2011-08-28 19:54:36 +12:00
Chris Cormack
61758c8bcb Updating about page and history 2011-08-28 19:47:22 +12:00
Chris Cormack
55326fc407 Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster 2011-08-28 19:34:25 +12:00
Chris Cormack
383d0d3a21 Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster 2011-08-28 19:34:18 +12:00
bd744e6f2a 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>
2011-08-28 19:33:16 +12:00
a94a9f7455 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>
2011-08-28 19:31:17 +12:00
3731ec80fc 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>
2011-08-28 19:27:49 +12:00
e73965c62f 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>
2011-08-27 19:41:39 +12:00
Colin Campbell
99b51e0318 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>
2011-08-27 19:40:02 +12:00
Ulrich Kleiber
8a7c916766 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>
2011-08-27 19:38:32 +12:00
eb7456c685 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>
2011-08-27 19:35:44 +12:00
Chris Cormack
a7a4d39697 Merge branch 'new/bug_4330' into kcmaster 2011-08-27 19:34:36 +12:00
Nicole C. Engard
57a0fcb475 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>
2011-08-27 07:50:43 +12:00
223156ea74 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>
2011-08-27 07:09:42 +12:00
Chris Cormack
7192572496 Bumping database version 2011-08-26 15:32:55 +12:00
Chris Cormack
f320582b2f 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>
2011-08-26 15:30:18 +12:00
0cf959123e 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>
2011-08-26 15:13:38 +12:00
Chris Cormack
eac3046dd9 Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster 2011-08-26 15:12:32 +12:00
63d300191e 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>
2011-08-26 15:10:19 +12:00
Chris Cormack
589403d2e8 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>
2011-08-26 15:03:01 +12:00
Chris Cormack
1e395ff152 Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster 2011-08-26 15:01:09 +12:00