Commit graph

14560 commits

Author SHA1 Message Date
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
666a2316d8 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>
2011-08-26 14:58:47 +12:00
Chris Cormack
9c346e2526 Fixing typo in history doc 2011-08-26 13:00:54 +12:00
Chris Cormack
b6293a8e9a 150th developer!!! 2011-08-26 12:49:50 +12:00
Ward van Wanrooij
07838bfcb1 Bug 6723 : import-framework-crlf
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-08-26 12:46:52 +12:00
Srdjan Jankovic
54d38461f0 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>
2011-08-26 11:34:27 +12:00
Colin Campbell
bb251a484f 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>
2011-08-26 10:34:48 +12:00
Nicole C. Engard
13fd914b08 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>
2011-08-26 10:32:57 +12:00
54e0667b23 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>
2011-08-26 10:30:55 +12:00
7b2cd8e636 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>
2011-08-26 10:25:18 +12:00
Frédérick Capovilla
4e44667cd6 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>
2011-08-26 10:15:46 +12:00
Salvador Zaragoza Rubio
6b69260fbd 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>
2011-08-26 08:41:01 +12:00
Chris Cormack
97005758bb Merge remote-tracking branch 'kc/new/bug_5498' into kcmaster 2011-08-25 12:07:49 +12:00
7f884128f6 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>
2011-08-25 12:05:29 +12:00
df2a3a9a3c 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>
2011-08-25 11:49:04 +12:00
Chris Cormack
73081505f5 Fixing executable bit on koha-httpd.conf 2011-08-24 08:49:13 +12:00
Chris Cormack
75a4efa704 Merge remote-tracking branch 'kc/new/enh/bug_6540' into kcmaster 2011-08-23 15:52:52 +12:00
Magnus Enger
31bb901e2b 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>
2011-08-23 15:52:15 +12:00
3270d384c5 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>
2011-08-23 15:14:50 +12:00
cbdb5a823a 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>
2011-08-23 15:07:36 +12:00
Chris Cormack
b78004c8e1 Bug 6703 : Link to invoice broken 2011-08-22 14:05:05 +12:00
Chris Cormack
dff9277d3d Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster 2011-08-21 19:56:57 +12:00
Chris Nighswonger
14a0c39e84 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>
2011-08-21 19:56:00 +12:00
Magnus Enger
142e75c94a 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>
2011-08-21 19:54:25 +12:00
77e1a62efa 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>
2011-08-21 19:44:47 +12:00
02f1058a80 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>
2011-08-21 19:39:16 +12:00
Robin Sheat
73992e2ff4 Bug 6486 - make koha-mysql get installed with the packages
A useful addition I overlooked.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 21:20:57 +12:00
Robin Sheat
7cf4553db1 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>
2011-08-18 21:20:52 +12:00
Chris Cormack
f80185efc4 Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster 2011-08-18 21:13:12 +12:00
a41100a445 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>
2011-08-18 21:11:50 +12:00
Robin Sheat
85e37cb4b5 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>
2011-08-18 21:08:36 +12:00
714c8b924e 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>
2011-08-18 20:57:32 +12:00
preprod34
e0eacd664c 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>
2011-08-18 20:53:56 +12:00
db44c217b2 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>
2011-08-18 20:51:47 +12:00
bc5aa5281d 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>
2011-08-18 11:12:28 +12:00
Chris Cormack
f0dba62bf3 Bumping database version 2011-08-17 10:35:52 +12:00
Chris Cormack
965438cc36 Merge remote-tracking branch 'kc/new/bug_4002' into kcmaster 2011-08-17 10:34:55 +12:00
Paul Poulain
d0c9592592 bug_4002: issues referential integrity
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-17 10:34:15 +12:00