Commit graph

12948 commits

Author SHA1 Message Date
Henri-Damien LAURENT
63a8c5bc9d MT3801 followup : Cannot claim for issues
was missing an opening (
Adding test script

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:30:47 +00:00
Paul POULAIN
78038d3cf6 fixing unopened closed tmpl_if
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:22:10 +00:00
Paul POULAIN
c401514b95 MT2743 : add filter on subscription branch to subscription claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:17:13 +00:00
Paul POULAIN
73a140b509 some display changes in subscription add
- removing librarian line
- displaying subscription number only if it's a modif
- some minor html tag changes
- putting month length on top, as default for subscription duration (it's from far the most usual case)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:14:02 +00:00
Paul POULAIN
2f9c8293c8 adding some javascript strings for translator
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:11:06 +00:00
Paul POULAIN
43bfa40307 minor change: reordering branch/location/callnumber display
it's more logical to have branch first, then location, then callnumber (from general to specific)
Previously, it was location/callnumber/branch

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:10:02 +00:00
Jean-André Santoni
ff36d256b7 (bug #4363) Fix subscription search error when no results
There was a template param assignment before template is loaded.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:52:09 +00:00
Christophe Croullebois
01e4b668ca (MT #4108) Notes in serial
The public and nonpublic notes was redundant with two areas in the page, one was inactive, and in edit subscription page, the subscription history area had two redundant blocks for notes, this fix it.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:47:25 +00:00
Alex Arnaud
ba8a2c7e8a (MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:46:48 +00:00
Matthias Meusburger
5fbcf225a4 MT3802: Patron notification is not correctly shown in subscription modification
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:45:34 +00:00
Paul Poulain
44560fc73c Editing help for subscription-add
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:44:19 +00:00
Henri-Damien LAURENT
c7effbe209 MT3667 followup MT3811 : unexpected issues not stored
As a consequence of previous MT3667 patch, the subscriptionid list was processed.
And unfortunately, since array order is the only relevant information from HTML processing,
it caused subscriptionid to be null for a double edition.
This patch only uses uniq for serials-collection and when passing information to serials-collection page.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:39:29 +00:00
Henri-Damien LAURENT
2f318ab841 MT3801: Serials not received issues cannot be claimed
position problem for claimst table
the table was displayed at right handside of the window

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:36:37 +00:00
Henri-Damien LAURENT
fc725ae643 MT3667 : multiple display of same subscription
The same subscription would be displayed multiple times when coming from serials-edit.
This patch fixes that problem

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:33:11 +00:00
Henri-Damien LAURENT
36e766aa4a merge problem 2010-12-15 12:19:41 +00:00
Nahuel ANGELINETTI
99c0d2bf74 (MT #3110) fix repetable titles
This fix in serials search, for repeatables titles.
Now we use biblionumber to detect repeated serials.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:13:04 +00:00
Nicolas Morin
dade9a2a24 correct vocabulary
in GUI, changes technical vocab like "string" to proper user-friendly terms like "Title"

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:11:33 +00:00
Jean-André Santoni
b833e0a70d Fixed a bug about hidden checkboxes in claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:04:05 +00:00
Jean-André Santoni
159c586b3c Added table filter to claims.tmpl
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:02:51 +00:00
Jean-André Santoni
0efaa6a41c Replaced CGI dropdown box call wich is deprecated
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:00:13 +00:00
Jean-André Santoni
df6283ffe9 Fixed the checkall checkbox
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:56:20 +00:00
Henri-Damien LAURENT
04dbd152f8 (MT 3035) subscription created expired
Subscription expiration date was not calculated on creation of a subscription
(cherry picked from commit 263e9217c8cd736924f66d699981949e29b4c200)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:55:00 +00:00
Jean-André Santoni
34673bf4ef Checks serials item form
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:41:12 +00:00
Colin Campbell
12100e13e4 Add jquery.uitablefilter.js
Add jquery plugin included in a number of templates modified by biblibre
Add as a separate commit rather than as part of a feature patch
as we may be merging out of sequence
2010-12-15 11:01:00 +00:00
Chris Cormack
be8f1f3343 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>
2010-12-15 09:31:33 +13:00
Jane Wagner
f05bd5984c 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>
2010-12-15 09:20:52 +13:00
Garry Collum
0fc7e5bfdc 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>
2010-12-15 09:17:37 +13:00
Nicole Engard
5c8ca5129c 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>
2010-12-15 09:13:39 +13:00
Chris Cormack
3705965cd7 Revert "Ergonomy improvement in smart rule management"
This reverts commit fefd158f42.

This was causing quite major errors, read the details at bug 5496
2010-12-15 09:03:11 +13:00
c4ea43f3db 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>
2010-12-15 08:50:16 +13:00
Chris Cormack
718473bdd2 Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
Robin Sheat
9c8f934a2c bug 5033: Add a reference to xml_sax to the Makefile.PL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 20:34:38 +13:00
Chris Cormack
e83beb0482 Fix for intranet-tmpl had one /TMPL_IF to many 2010-12-14 20:10:59 +13:00
Ian Walls
34155975fc 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>
2010-12-14 20:00:14 +13:00
21c516601c 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>
2010-12-14 19:38:52 +13:00
Chris Cormack
2a3bed8e84 Merge remote branch 'kc/new/enh/bug_2965' into kcmaster 2010-12-14 19:35:42 +13:00
Katrin Fischer
872529cb11 Bug 2965: Allow due date in the past - small template fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:33:58 +13:00
Katrin Fischer
6b33299f8f Add missing bracket to updatedatabase.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:31:47 +13:00
Robin Sheat
00dd0ae627 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>
2010-12-14 15:07:51 +13:00
Srdjan Jankovic
4d1762f5ec 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>
2010-12-14 13:49:15 +13:00
21cdd2feb4 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>
2010-12-14 13:44:21 +13:00
Colin Campbell
51dc5b060b Variable redeclared in same scope
lexical variable declared twice causing run time warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:21:06 +13:00
Nicole Engard
40e2b5421a 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>
2010-12-14 13:19:20 +13:00
Nicole Engard
a6799f95fb 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>
2010-12-14 13:16:32 +13:00
Colin Campbell
c53c96fa57 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>
2010-12-14 13:11:00 +13:00
bd7cca935b 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>
2010-12-14 13:10:57 +13:00
Chris Cormack
96330a7b07 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>
2010-12-14 12:59:14 +13:00
Chris Cormack
2b25835464 Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381
Conflicts:
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	kohaversion.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 12:24:59 +13:00
Chris Cormack
5278aa0ca4 Merge remote branch 'kc/new/biblibre_reports' into kcmaster 2010-12-14 06:31:00 +13:00
Nicole Engard
1b36fafe8c bug 5150 change issuing to circ & fine rules
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 23:10:49 +13:00