Frédéric Demians [Mon, 20 Dec 2010 14:09:49 +0000 (15:09 +0100)]
Bug 4838 Allow to choose which authority heading to copy into biblio record
With this patch, in biblio record data entry form, when ... is clicked for an
authority controlled field, it's possible to select which heading repetion to
copy if the authority has repeated headings.
When there is just one authority repetition, the first one is displayed to
choose, as previously.
This patch is REQUIRED by French libraries following SUDOC UNIMARC format, and
cataloguing multilingual materials ie all Higher Educational and Research
libraries.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 21 Dec 2010 03:48:42 +0000 (16:48 +1300)]
Merge remote branch 'kc/new/bug_5035' into kcmaster
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>
Robin Sheat [Fri, 17 Dec 2010 03:34:13 +0000 (22:34 -0500)]
Bug 5522 - allow google preview to open in a new window
If the OPACURLOpenInNewWindow system is set, then google preview links
will obey it.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 20 Dec 2010 19:51:31 +0000 (08:51 +1300)]
Merge remote branch 'kc/new/enh/bug_2965' into kcmaster
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>
Chris Cormack [Mon, 20 Dec 2010 19:34:51 +0000 (08:34 +1300)]
Merge remote branch 'kc/new/enh/bug_4473' into kcmaster
Chris Cormack [Mon, 20 Dec 2010 19:31:07 +0000 (08:31 +1300)]
Bug 4473: Making a change to TmplTokenizer.pm to stop translation error
Chris Cormack [Mon, 20 Dec 2010 00:24:40 +0000 (13:24 +1300)]
Merge remote branch 'kc/new/bug_5143' into kcmaster
Liz Rea [Fri, 17 Dec 2010 00:20:25 +0000 (19:20 -0500)]
Bug 5143: Help file revisions per Owen Leonard
Nice changes, thanks. :)
LR
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 19 Dec 2010 21:44:03 +0000 (10:44 +1300)]
Merge remote branch 'kc/new/enh/bug_5283' into kcmaster
Chris Cormack [Sun, 19 Dec 2010 21:42:59 +0000 (10:42 +1300)]
Bug 5283 Follow up, fixing broken template syntax
Owen Leonard [Thu, 16 Dec 2010 11:42:51 +0000 (06:42 -0500)]
Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page
Revised version of Liz Rea's fix adding homebranch by default. This
revision displays the homebranch name instead of branchcode.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 19 Dec 2010 21:08:02 +0000 (10:08 +1300)]
Revert "Merge remote branch 'kc/new/bug_5373' into kcmaster"
This reverts commit
bf5a328af645f8de06bba1b71e58f29ab2a17159, reversing
changes made to
a904a9bac745c696d998c28b8eb82961ddde9207.
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>
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>
Chris Cormack [Sun, 19 Dec 2010 08:26:06 +0000 (21:26 +1300)]
Merge remote branch 'kc/new/bug_5446' into kcmaster
Frédéric Demians [Fri, 17 Dec 2010 11:16:52 +0000 (11:16 +0000)]
Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...
Alert commented.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 16 Dec 2010 09:59:34 +0000 (04:59 -0500)]
Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 09:20:01 +0000 (04:20 -0500)]
Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 19 Dec 2010 08:11:54 +0000 (21:11 +1300)]
Merge remote branch 'kc/new/bug_4908' into kcmaster
Owen Leonard [Thu, 16 Dec 2010 09:15:53 +0000 (04:15 -0500)]
Follow-up patch for Bug 4908, show patron's home library in OPAC
Adding home library to list of details when OPACPatronDetails pref
is set to "don't allow"
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 19 Dec 2010 08:08:41 +0000 (21:08 +1300)]
Merge remote branch 'kc/new/enh/bug_5285' into kcmaster
Owen Leonard [Thu, 16 Dec 2010 08:09:01 +0000 (03:09 -0500)]
Follow-up fix for Bug 5285, adding missing CSS
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sat, 18 Dec 2010 19:22:13 +0000 (08:22 +1300)]
Adding another developer to history
Edward Allen [Sat, 18 Dec 2010 19:05:50 +0000 (20:05 +0100)]
bug 5516: Corrected git url in Install Documentation Corrected the git clone url for INSTALL.ubuntu, INSTALL.ubuntu.lucid
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 08:02:53 +0000 (03:02 -0500)]
Fix for Bug 5470 - improvements to results display in the staff client
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 07:57:42 +0000 (02:57 -0500)]
Fix for Bug 5513 - staff client display screwy if you don't have all permissions
The cause of this bug was the removal of a closing <!-- /TMPL_IF -->
in a recent commit.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sat, 18 Dec 2010 18:32:24 +0000 (07:32 +1300)]
Adding another developer to the history
Robin Sheat [Thu, 16 Dec 2010 07:50:08 +0000 (02:50 -0500)]
bug4891 - sort facets in search sidebar (OPAC and staff client)
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 07:34:47 +0000 (02:34 -0500)]
Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections
Adding jquery tablesorter, sorting on sys pref variable by default
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Srdjan Jankovic [Thu, 16 Dec 2010 06:23:31 +0000 (19:23 +1300)]
Bug 5510: prepend output with system name
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Serhij Dubyk {Сергій Дубик} [Wed, 15 Dec 2010 23:49:51 +0000 (01:49 +0200)]
Deleted old sample budget sql-data for Ukrainian and Russian
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 02:33:59 +0000 (21:33 -0500)]
Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 02:30:38 +0000 (21:30 -0500)]
Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:
- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out
I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Thu, 16 Dec 2010 20:43:17 +0000 (09:43 +1300)]
Merge remote branch 'kc/new/enh/bug_5283' into kcmaster
Owen Leonard [Thu, 16 Dec 2010 02:16:24 +0000 (21:16 -0500)]
Fix for Bug 3859, Attach item clarification
- Modifies hint text
- Adds handling for BiblioDefaultView preference
- Markup and CSS tweaks
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
koha [Thu, 16 Dec 2010 01:41:52 +0000 (20:41 -0500)]
Bug 5283 NEWS ITEM FOR RECEIPT SLIP
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Srdjan Jankovic [Thu, 16 Dec 2010 01:10:12 +0000 (20:10 -0500)]
Bug 5294 - Unescape vendor name when pushing back
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Thu, 16 Dec 2010 20:09:40 +0000 (09:09 +1300)]
Merge remote branch 'kc/new/bug_5373' into kcmaster
Garry Collum [Wed, 15 Dec 2010 23:48:27 +0000 (18:48 -0500)]
Bug 5373: Adds cardnumber to the field list of the Import Patrons NOTES.
Adds 'cardnumber' as an option to the list of possible fields in the NOTES section of the patron import tool.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Thu, 16 Dec 2010 00:47:01 +0000 (13:47 +1300)]
Merge remote branch 'kc/new/enh/bug_5508' into kcmaster
Chris Cormack [Wed, 15 Dec 2010 22:49:36 +0000 (11:49 +1300)]
Bug 5508 : Updating copyright statements
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>
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>
Colin Campbell [Wed, 15 Dec 2010 16:39:31 +0000 (16:39 +0000)]
Fix supplier loop in serials claims
Wrong parameter was being passed to GetLateOrMissingIssues
causing incorrect display of count
Remove superfluous loop creating array we dont use
No need to sort a sorted array
Henri-Damien LAURENT [Mon, 7 Jun 2010 09:13:10 +0000 (11:13 +0200)]
MT3801: Serials not received issues cannot be claimed
waiting issues which where planned for an old date were not "claimable"
This also fixes a bug from commit
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Henri-Damien LAURENT [Mon, 1 Nov 2010 09:15:05 +0000 (22:15 +1300)]
MT3801 followup : Cannot claim for issues
was missing an opening (
Adding test script
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Paul POULAIN [Fri, 29 Oct 2010 02:32:02 +0000 (04:32 +0200)]
fixing unopened closed tmpl_if
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Paul POULAIN [Thu, 23 Sep 2010 07:06:43 +0000 (09:06 +0200)]
MT2743 : add filter on subscription branch to subscription claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Paul POULAIN [Thu, 9 Sep 2010 18:37:29 +0000 (20:37 +0200)]
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>
Paul POULAIN [Thu, 9 Sep 2010 18:35:49 +0000 (20:35 +0200)]
adding some javascript strings for translator
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Paul POULAIN [Thu, 9 Sep 2010 18:03:58 +0000 (20:03 +0200)]
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>
Jean-André Santoni [Tue, 24 Aug 2010 12:48:46 +0000 (14:48 +0200)]
(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>
Christophe Croullebois [Thu, 12 Aug 2010 15:57:01 +0000 (17:57 +0200)]
(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>
Alex Arnaud [Wed, 11 Aug 2010 07:58:04 +0000 (09:58 +0200)]
(MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Matthias Meusburger [Mon, 5 Jul 2010 15:38:19 +0000 (17:38 +0200)]
MT3802: Patron notification is not correctly shown in subscription modification
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Paul Poulain [Thu, 24 Jun 2010 12:48:25 +0000 (14:48 +0200)]
Editing help for subscription-add
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Henri-Damien LAURENT [Tue, 8 Jun 2010 08:20:27 +0000 (10:20 +0200)]
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>
Henri-Damien LAURENT [Mon, 7 Jun 2010 14:20:12 +0000 (16:20 +0200)]
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>
Henri-Damien LAURENT [Thu, 20 May 2010 18:54:59 +0000 (20:54 +0200)]
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>
Henri-Damien LAURENT [Fri, 7 May 2010 16:52:40 +0000 (18:52 +0200)]
merge problem
Nahuel ANGELINETTI [Tue, 9 Mar 2010 10:25:09 +0000 (11:25 +0100)]
(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>
Nicolas Morin [Tue, 2 Mar 2010 09:26:06 +0000 (10:26 +0100)]
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>
Jean-André Santoni [Mon, 22 Feb 2010 11:56:37 +0000 (12:56 +0100)]
Fixed a bug about hidden checkboxes in claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Jean-André Santoni [Mon, 22 Feb 2010 11:53:48 +0000 (12:53 +0100)]
Added table filter to claims.tmpl
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Jean-André Santoni [Mon, 22 Feb 2010 10:54:10 +0000 (11:54 +0100)]
Replaced CGI dropdown box call wich is deprecated
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Jean-André Santoni [Mon, 22 Feb 2010 09:50:16 +0000 (10:50 +0100)]
Fixed the checkall checkbox
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Henri-Damien LAURENT [Tue, 23 Feb 2010 07:56:27 +0000 (08:56 +0100)]
(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>
Jean-André Santoni [Fri, 26 Feb 2010 11:32:53 +0000 (12:32 +0100)]
Checks serials item form
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Colin Campbell [Wed, 15 Dec 2010 11:01:00 +0000 (11:01 +0000)]
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
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>
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>
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>
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>
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
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>
Chris Cormack [Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)]
Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506
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>
Chris Cormack [Tue, 14 Dec 2010 07:10:59 +0000 (20:10 +1300)]
Fix for intranet-tmpl had one /TMPL_IF to many
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>
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>
Chris Cormack [Tue, 14 Dec 2010 06:35:42 +0000 (19:35 +1300)]
Merge remote branch 'kc/new/enh/bug_2965' into kcmaster
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>
Katrin Fischer [Tue, 14 Dec 2010 06:26:09 +0000 (07:26 +0100)]
Add missing bracket to updatedatabase.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Chris Cormack [Mon, 13 Dec 2010 23:24:59 +0000 (12:24 +1300)]
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>
Chris Cormack [Mon, 13 Dec 2010 17:31:00 +0000 (06:31 +1300)]
Merge remote branch 'kc/new/biblibre_reports' into kcmaster
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>
Chris Cormack [Mon, 13 Dec 2010 09:55:23 +0000 (22:55 +1300)]
Merge remote branch 'kc/new/bug_4218' into kcmaster
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>
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>