Commit graph

6144 commits

Author SHA1 Message Date
55984a1610 Fix for Bug 6192 - Path to theme directory scoped incorrectly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:32:43 +12:00
Chris Cormack
9d6fbefce6 Merge remote branch 'kc/new/bug_6187' into kcmaster 2011-04-15 10:28:55 +12:00
Chris Cormack
12e15ebb61 Bug 6187 : Stupid typo in previous patch 2011-04-15 10:22:42 +12:00
d44896079b Fix for Bug 6186 - Change to DOCTYPE declaration causing validation errors
In the transition to Template::Toolkit a part of the DOCTYPE includes
got its case switched, making it invalid: XHTML was changed to Xhtml

Correcting the case quiets errors in the validator.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:15:32 +12:00
Chris Cormack
c673f6cf46 Bug 6188 : Gender not showing in the opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 15:38:12 +12:00
Chris Cormack
30ae708978 Bug 6187 : Fixing template issue with opac-authoritesdetail.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 15:30:30 +12:00
b03a6a22a0 Fix for Bug 6179, Extra column on fines in staff client
Template variable scope error fixes the column error.
This patch also includes a fix for the column span
error in the table footer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 15:06:24 +12:00
Chris Cormack
a0c815033a Merge remote branch 'kc/new/bug_6162' into kcmaster 2011-04-14 15:02:02 +12:00
Colin Campbell
28205bfda2 Bug 6162 Fix passing of borrower details to reading history
script was passing borr details incorrectly and in a fix was
then passing them in a one element array
unnecessary complication tends to go wrong sooner or later

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 15:01:17 +12:00
Chris Cormack
7cfa1ca509 Merge remote branch 'kc/new/enh/bug_5952' into kcmaster 2011-04-14 14:41:25 +12:00
49af98afd7 Follow-up fix for Bug 5952, Shows member relatives in issues list
- Moving columns around to match display of patron's own checkouts
- Correcting terminology (issues, borrowers)
- Hiding columns added in previous patch which do not display in
  the standard checkout list: materials, stock number, collection.
  If these are to be added they should be added to all displays.

[edit] Adding display of relative's cardnumber alongside their name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:40:19 +12:00
d00d0721b2 Fix for Bug 6183, "Cancel marked requests" button has become "Renew checked items"
Also includes a fixes for Bug 6168 (Can't delete holds from circulation page)
and Bug 6105 (Cancel a reserve from moremember.pl doesn't work)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:30:59 +12:00
Chris Cormack
d4f2bde054 Merge branch 'new/enh/bug_5917' into kcmaster 2011-04-14 13:36:57 +12:00
Chris Cormack
2fb5b73e6b Bug 5917 : Fixing a bug in the results page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 13:36:25 +12:00
Chris Cormack
9bb2554e39 Merge remote branch 'kc/new/enh/bug_5692' into kcmaster 2011-04-13 16:08:52 +12:00
Chris Cormack
b030ef9f4f Bug 5692 : Adds an alternative cataloguing plugin for 210$c
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 15:48:42 +12:00
Chris Cormack
548a670eaf Bug 5922 : Template changes 2011-04-13 14:46:08 +12:00
Chris Cormack
90962ec380 Bug 5922 : Functional Changes
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 14:45:21 +12:00
Chris Cormack
ce06b67f5e Merge remote branch 'kc/new/bug_6126' into kcmaster 2011-04-13 12:01:53 +12:00
97712c2cca Bug 6126: Slip print doesn't work on Webkit based browsers
Wrap window.print();window.close(); with a function called when body has finished loading. Prevents webkit from closing before page is loaded and print dialog presented to the user.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 12:00:31 +12:00
Colin Campbell
f11ba1343c Bug 6174: Fix ordering of existing title
basketno was treated as local to the resultsloop
also changed the tt variable name for readability

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 11:56:52 +12:00
Colin Campbell
2ea74bef65 Bug 6170: restore more options to staff adv search
Some globals were assigned as search box attributes in conversion
causing elements to be suppressed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:57:18 +12:00
Colin Campbell
b8384c95ee Bug 6170 restore more options to advanced search
Template conversion was treating some globals as attributes of searchbox

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:57:18 +12:00
Chris Cormack
6073bd86e2 Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-13 08:35:41 +12:00
Christopher Hall
1d3273595c comma fix 2011-04-13 08:34:15 +12:00
dfa4127db1 Bug 6171 Can't edit items
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 19:52:00 +12:00
2c82c8e905 Fix for Bug 6162, name missing on reading history in opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:33:14 +12:00
9f7542dbab Fix for Bug 6159 - Variable scope errors prevent placing holds in the OPAC
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:27:37 +12:00
3c8536a398 Fix for Bug 6160, my details not showing tabs
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:19:44 +12:00
Jared Camins-Esakov
66fb80f436 Bug 6158: Permissions scoped wrong for T::T
Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:16:27 +12:00
Chris Cormack
961e9fec87 Bug 5917 : Fixing a bug with categorie.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 16:37:49 +12:00
Chris Cormack
297649c8ec Bug 6085 : Can now change language in the preferences menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 12:58:04 +12:00
Jared Camins-Esakov
6e2260c739 Bug 5917 follow-up: Fix errors on OPAC results
This patch fixes the following problems with the OPAC search results:
* The facet links were constructed wrong following the change to
  Template::Toolkit

This patch also changes the OPAC sorting dropdown to work in the same way as the
staff dropdown. This seemed preferable to having the two use different variables
for deciding which option to select, and it is unclear why Search.pm was not
passing the appropriate variables to the staff client.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:40 +12:00
Jared Camins-Esakov
f1e96f4590 Bug 5917 follow-up: Fix staff client results display
The change to Template::Toolkit broke a number of things on the Staff Client
results display. This patch:
* Fixes the formatting of the results table, which had an unnecessary colspan=2
* Enables the display of the "Edit record" and "Edit items" links
* Corrects the display of item counts, so that labels for "Available,"
  "On loan," and "Unavailable" only appear when appropriate
* Corrects facet links, which were starting new searches rather than limiting
  due to a variable scoping error
* Changes the resort dropdown so that it will show the currently-selected
  sorting

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:40 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Chris Cormack
77167b3b17 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-10 20:00:04 +12:00
Chris Cormack
0d991c6abe Merge remote branch 'kc/new/enh/bug_6013' into kcmaster 2011-04-10 19:47:16 +12:00
Nicolas Morin
93d8a890c0 Bug 6013 : removed z3950 host in label when cataloguing
removed the full host in the label of the z3950
targets: it made for very very long labels, which
were unecessary since we allow librarians to
provide a user friendly name for the host.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:46:27 +12:00
Matthias Meusburger
cba9b427a4 Bug 5984 : Follow up Adding OpacHiddenItems syspref
- Adds the syspref in opac.pref

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:36:20 +12:00
Chris Cormack
f078103e33 Bug 5984 : Allowing the librarians to hide items in the Opac using a system preference
Squashed commit of the following:

commit 72b578928b287ba3b5fa8965e42ff1ccbdf9013a
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Oct 20 11:26:46 2010 +0200

    Bug 5984 : MT4587, Follow-up: Hiding rules are now in a syspref

commit d95329955f976900afdafa82fe0a1699e8e892dc
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Tue Oct 19 15:19:16 2010 +0200

    Bug 5984 : MT4587, Follow-up: Adds yaml config file for custom opac items hiding

commit 6777c1a97700b77095e4e499ca73040bf94271e2
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Mon Oct 18 11:14:03 2010 +0200

    Bug 5984 : MT4587 : Adds yaml config file for custom opac items hiding

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:32:06 +12:00
b8d3cfa91b Bug 5546: Follow-up / fixes
Suggested by Owen.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:27:51 +12:00
726a00fd7e Bug 5546 Javascript driven ability to hide MARC documentation links
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 19:27:49 +12:00
Henri-Damien LAURENT
8902dadf06 Bug 5980 : Adding location to search indexes
Adding location to search indexes in search pages

Original patch amended to change Location to Shelving Location.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:51:27 +12:00
Paul Poulain
7e1077b51b Bug 5961: Filling a basket from the reservoir
creating a form order to import all records from a staged file at once.
All lines of the choosen staged file will be created with the same budget
and item (if applicable depending on AcqCreateItem syspref)

BibLibre bug #4007

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Bug 5961: follow-up : use matchingrules selected in manage-stage-import instead of FindDuplicate

Now, bulk importing the iso2709 result in adding biblio or connecting to an existing one

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

BZ5961: follow-up, save currency

Cait noticed that currency was not saved properly in the aqorders table.

note a surprise, as the 3.2 had no currency feature and 5961 had been written against 3.2
anyway, this patch fixes the problem

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:45:50 +12:00
Stéphane Delaune
1fafaafc9a Bug 5728: adding note and manager_id fields to accountlines
Biblibre bug #1874

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 21:25:18 +12:00
db6ab6a6fd Fix for bug 5498, Standardize markup and style of pagination menus
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:25:36 +12:00
Magnus Enger
004d2a10c5 Bug 5671 Revised Patch #2 - Add a column of custom HTML to my summary
Fix JS error in /koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:23:09 +12:00
Chris Cormack
c1181b780b Merge remote branch 'kc/new/pending_qa/enh/bug_3644' into kcmaster 2011-04-09 19:16:45 +12:00
Katrin Fischer
ac2da44b69 Bug 5431: Separate state field for library addresses
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 12:01:48 +12:00
Katrin Fischer
3224b92743 Bug 5422: Add missing fields to deletedborrowers and change datatype to text
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
b0f74b68bd Bug 5422: Small layout correction to borrower search result list
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
f81726249b Adding state to output of patron search results screen
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
e82f88d5d9 Additional fixes for Bug 5422, Separate state field for patron's adresses
Adding state variable to various circ and member pages so that
sidebar display of patron details includes state.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
Katrin Fischer
21727e00f5 Bug 5422: Separate state field for patron's addresses
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:52:07 +12:00
298919981c Bug 4394 Adding preference definition change to opac.pref
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:43:10 +12:00
Jane Wagner
ac4e83161c Bug 4394 REVISED Allow opaccolorstylesheet syspref to use an external URL
Previous code would only allow for an auxiliary stylesheet on the same server.  This checks for
http in the opaccolorstylesheet syspref.  If it's found, sets a different variable pointing to the
remote server location.  If not found, retains the previous css directory path.

Also modifies the description of opaccolorstylesheet in the installer files to reflect current
usage as an auxiliary stylesheet.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:43:09 +12:00
Alex Arnaud
7cc7fb8c99 bug #6054 - Add a filter by active budget on acqui-home
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:24:08 +12:00
Alex Arnaud
4268fd376f Bug #6049 - Add a filter by date in overdue.pl
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:18:44 +12:00
Paul Poulain
5b16634c0c BZ6087: remove duplicate budget link
this feature doesn't exist yet, so the link is useless

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:56:21 +12:00
b29e6e8609 Fix for Bug 5950 - changing frameworks doesn't change anymore
Selecting a framework from the dropdown menu has never (AFAICT)
auto-submitted the form to change the framework. This patch
reformats the form in order to make it clearer that this menu
 is part of the search function.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:50:38 +12:00
Chris Cormack
2cf3e24797 Merge remote branch 'kc/new/bug_5234' into kcmaster 2011-04-09 10:22:46 +12:00
8464104fb2 Fix for Bug 5234 - Remove unused CSS files
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 10:22:06 +12:00
Chris Cormack
1e7c5166aa Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-08 14:29:21 +12:00
Chris Cormack
8307a1f79d Merge remote branch 'kc/new/enh/bug_5921' into kcmaster 2011-04-08 14:25:08 +12:00
Jared Camins-Esakov
13ef254d21 Bug 5921 follow-up: fix text wrapping
On records with hundreds of items, the "Serial enumeration/chronology" label
wraps onto a second line, which is very unattractive. Changing the label to
"Serial enumeration" fixes this.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 14:22:23 +12:00
Colin Campbell
9210aac8cf Bug 3803 Show ISSN in orderline of basket display
Where an item possesses an ISSN is may be of equal or greater
importance to acquisitions staff as the ISBN so include it in
the display

Sponsered by UNFAO, Rome

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:40:44 +12:00
Srdjan Jankovic
b390c657b8 Bug 6024 : add "Run report" link on the new report creation success page
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:29:58 +12:00
Alex Arnaud
0b96414ce3 Bug 6095: Add UTF8 encoding in template
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:23:53 +12:00
Chris Cormack
36efd0d4d0 Merge remote branch 'kc/new/bug_5949' into kcmaster 2011-04-08 13:22:54 +12:00
Katrin Fischer
760babcf4c Bug 5949: Hide 'Edit record' link when creating new order
The 'Edit record' link only makes sense, when you want to modify
an order after creating it. Before there is no biblionumber the link
can link to. Patch adds check for existing biblionumber so link is
only shown when there is an existing record to be edited.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:21:29 +12:00
4747f5adb2 Bug 4189 : Searching z39.50 without selecting any servers results in error message
This patch makes z3950_search.pl handle the situation properly, and z3950_search.tmpl
show a proper message instead of a program error. All this, in case the javascript
checks that alert the user (that at least one target has to be chosen)  are by-passed.

Regards
To+

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small translation problem in javascript alert message.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:19:20 +12:00
Paul Poulain
c0ecd7df4f Bug 6072: fixing permission inconsistencies MT5306
In large libraries, some librarian may have permission only
to recieve shipments This patch fixes some permission :
* booksellers page = accessible to anyone that has at least 1 acq permission
* parcels = accessible to anyone with order_recieve
* supplier detail = accessible to anyone that has at least 1 acq permission,
  but modifying accessible only if vendor_manage

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:10:12 +12:00
bd4bf5485c Fix for Bug 6109, Hey!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:04:20 +12:00
Chris Cormack
f098258e8c Merge remote branch 'kc/new/bug_4912' into kcmaster 2011-04-08 13:02:55 +12:00
d269389839 Bug 4912: Follow-up fix for Bug 4912, redirect user to correct lists
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:01:49 +12:00
a079522f54 Fix for Bug 6114 - Conflicting warnings about Koha to MARC links
Removing incorrect message from marc_subfields_structure.tmpl and
moving the correct message from marctagstucture.tmpl into its place.

Also correcting the help file for marc_subfields_structure.mpl

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:35:18 +12:00
Stéphane Delaune
a59b1d23bb Fix for Bug 6037, Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:32:32 +12:00
Colin Campbell
0cf2eccfe9 Bug 5529 Absence or Presence of lists not being reliably returned
C4::VirtualShelves::GetRecentShelves contained some rather confused
code The contents of the requested list are returned in an arrayref
which was in its turn being wrapped needlessly in an array
As a result the returned array always consisted of a single element
irrespective of the number of lists.
Made the routine return the arrayref, which can now be tested directly
Unfortunately rather than fixing this we had previously coded around it
assuming it to be a "design" decision. Have amended other calls of
the subroutine resulting in some hopefully less obscure code

Fixed logic error in the results template which displayed new list
within a test for the presence of lists

Removed the offset parameter from the sql in the routine as it was hardcoded
to 0 i.e. the default value

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:51:47 +12:00
Chris Cormack
fe331a0209 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-08 07:12:06 +12:00
69d4d8f1cc Bug 6084: Follow up - fix more translation markers
grep -R 'alert("' *

was not enough. I needed

grep -R "alert('"

too!.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:47 +12:00
33c7b21cde Bug 6084: Missing translation markers in javascript alert messages
I ommited commented lines and "if $debug" lines too.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:45 +12:00
Alex Arnaud
2ca3edc690 Bug 6105 - Fix a problem when cancel a reserve from moremember.pl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:42:21 +12:00
Paul POULAIN
aaa6ecf2b6 Bug 5951 : consistency change: s/planning/statistic/
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:45:05 +12:00
Henri-Damien LAURENT
21404359d4 Bug 5923 : Authorities list :removing link on Summary
removing the link to authority details on authority List directly from summary
And adding a generic link to details

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:25:18 +12:00
Paul Poulain
d58092dd96 Bug 6077: qty not incremented for AcqCreateItem=recieve
When you want to create items on order recieve, the qty was not incremented
when the librarian adds an item with the +

This was because the js was expecting the qty field to be id=quantity

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:35:01 +12:00
Alex Arnaud
0f6270d310 Bug 5946 : (MT1177) aqplan.pl, fix the problem of calculating the total remaining.
Bug 5946 followup : (MT1236) aqplan.pl - Fixe the problem of unrounded sums

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:30:41 +12:00
9bb36148fd Fix for Bug 5156, JavaScript error when adding list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:26:20 +12:00
Henri-Damien LAURENT
99b49e2b1a Bug 6014 : MT3138 Adding some permission management to viewlog
If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.

C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated

circ-menu.inc:
Fixing information passed to the viewlog from circ-menu

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 13:14:17 +12:00
Chris Cormack
b00c36989f Merge remote branch 'kc/new/bug_4276' into kcmaster 2011-04-07 10:41:37 +12:00
Jared Camins-Esakov
0f39c4fcc3 Bug 4276 follow-up: quote strings with curly braces
Previous fix used the wrong characters for quoting. I should have used curly
braces instead of double quotes. Some searches using double quotes will fail
(the problem seems to be punctuation, although there may be other circumstances
where double quotes fail as well).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 10:37:53 +12:00
Nicole Engard
fcbcdcf4ce bug 4837 make circ print page show item type description
Signed-off-by: Guillaume Hatt <guillaume.hatt@€nc.sorbonne.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 19:31:46 +12:00
Alex Arnaud
99f49c1108 Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 17:05:23 +12:00
Paul Poulain
2a28b30a3c BZ6065: confirmation when deleting an order
when clicking on "delete order", there is no confirmation box, the order line is
deleted without any question !

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 16:13:07 +12:00
Katrin Fischer
9cab9be3d6 Bug 6056: Notes were not shown when modifying order line
To test:
- add a new order in acquisitions with some content in the notes field
- save order
- modify order - Notes field will be shown as empty

The template variable for notes is missing from the template.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-06 15:26:44 +12:00
Chris Cormack
363ea5ce08 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-05 15:39:12 +12:00
Matthias Meusburger
a1a8945c2f Bug 5970: Adds the ability to use a free delivery address for basket
When editing a basket group, user can choose a library for delivery
place, or enter address of his choice in a text field.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will send a follow-up for missing change in kohastructure.sql
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 15:10:17 +12:00
f1869ec064 Fix for Bug 5593, Change cart markup to allow for easier icon styling
Replacing inline cart image with a span with a unique ID. Adding
styling to the deafult CSS to give that span a background of the
same cart image as before. Custom CSS can override this with a
different image.

Example for OPACUserCSS preference:

  background-image : url("/opac-tmpl/prog/famfamfam/silk/basket.png");
  width:16px;
  height:16px;
}

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

    background-image: url("/opac-tmpl/prog/famfamfam/silk/basket.png");
}

Will also change the cart image in opac detail view.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 15:04:07 +12:00
Srdjan Jankovic
5bcb1529bc wr76595 (bug 4157): Control barcode display with a borrower attribute
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:50 +12:00
Srdjan Jankovic
0ccc89990b Bug 4157: Display of barcode in checked out items in OPAC
wr76595: barcode display

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:33 +12:00
Christophe Croullebois
6a7470341a Bug 5963 : Add the ability to filter budgets using the active column
(MT #4717) Add the capability to have a filter by active budget

the sub GetBudgetHierarchy return aqbudgetperiods.budget_period_active to have acces to a new filtering way,
 more the neworderempty.pl page have a check box "shox all".

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Bug 5963: Modify GetBudgetsHierarchy to returns all funds

GetBudgetHierarchy now returns all funds, not only those that are part
of an active budget.
Fixed a layout problem.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:38:41 +12:00
Christophe Croullebois
1f323c00a1 Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics
(MT #2391) : acqui/neworderempty.pl

Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:20:59 +12:00
0dba0e0d3c Bug 3628: opacSerialDefaultTab
This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:14:13 +12:00
4f2dbc193b Fix for Bug 5991 - Javascript error on purchase suggestion pages
Rebased on master 2011-04-04

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:10:42 +12:00
koha-preprod
9dc69cf47f Adding a javascript function to check the validation of a record with a budget.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 22:51:10 +12:00
Christophe Croullebois
b9d434c18f Bug 5948 : Creation of a quantity column in receipt summary
In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 21:39:23 +12:00
Chris Cormack
7c01b670dd Bug 5462 : Fixing more spaces in variable names 2011-04-04 16:10:57 +12:00
Chris Cormack
1cf496b4d3 Bug 5462 : More fixes for template toolkit, should have no visible difference
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 14:38:56 +12:00
Chris Cormack
7e62b5f22a Bug 5917 : Missed one dash
Conflicts:

	koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
2011-04-04 13:09:28 +12:00
Chris Cormack
4594a053bd Bug 5917 : Removing spaces in variable names 2011-04-04 12:55:50 +12:00
Chris Cormack
ead56def26 bug 4865: Enable session storage in Memcached
Note: this requires CGI::Session::Driver::memcached to be installed

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 10:38:50 +12:00
Jared Camins-Esakov
f0b17df29a Fix two small typos in MARC21 field 006 value builder
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 08:56:14 +12:00
Chris Cormack
eb4ad6e44e Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-03 22:35:24 +12:00
Chris Cormack
228587f19b Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644 2011-04-02 19:46:30 +13:00
Paul Poulain
940ee0882a Bug 5870 : suggestion management enhancements
* changing suggestedy management
* adding a new status field & filter

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 19:38:56 +13:00
Chris Cormack
75aa5398c5 Merge remote branch 'kc/new/enh/bug_4421' into kcmaster
Conflicts:
	C4/XSLT.pm
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl
2011-04-02 07:15:47 +13:00
Jared Camins-Esakov
f1663ada48 Bug 4421: Add alternate holdings display and prefs
This patch adds the ability to specify a field with alternate holdings
information for display when a biblio has no items associated with it.

Two sysprefs are added:
* AlternateHoldingsField specifies what field/subfields contain the alternate
holdings information. When blank, the alternate holdings information is not
displayed. The default is blank, as this is a new feature.
* AlternateHoldingsSeparator specifies the string to be used to separate
multiple subfields in the alternate holdings display. The default is ' '.

Example use case:
A library which does not have a 1-1 relationship between uncontrolled 852 fields
from a legacy system and actual physical items on the shelf wishes to display
holdings information from the 852, but does not want to create item records
which are almost certain to be inaccurate. By enabling the alternate holdings
feature (AlternateHoldingsField = '852abcdhi' and AlternateHoldingsSeparator =
' -- '), the library is able to gradually add item records as they locate the
physical items, without losing the holdings information presently stored in the
uncontrolled 852 fields.

To test:
1) Set AlternateHoldingsField to '852abcdhi'
2) Set AlternateHoldingsSeparator to ' -- '
3) Change the hidden value of subfields 'a', 'b', 'c', 'd', 'h', and/or 'i' of
   field 852 to 0 so that they display
4) Create a record which has data in the 852, but no item record
5) Look at holdings tab, where the data you entered should be displayed

Proof-of-concept initially developed for the American Numismatic Society.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:56:02 +13:00
Robin Sheat
dc37fe9730 Small patch to make myself feel important
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:10:44 +13:00
Chris Cormack
ce037a96eb Merge remote branch 'kc/new/enh/bug_5432' into kcmaster 2011-04-02 06:08:43 +13:00
17d9903a96 Follow-up fix for Bug 5432 - Duplicate patron feature
circ-toolbar.inc should get the same modification so that
all patron-related pages have the 'duplicate' button

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:07:41 +13:00
Liz Rea
c9bef775cf Bug 6006 - Move location from current location to home library column on detail.pl
It doesn't make sense to have the home library's location (example: Adult) in
the "current (branch) location" column, since that location is assigned by the
home library.

This patch moves it to the "home location" column, where it belongs.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:56:17 +13:00
Salvador Zaragoza Rubio
689bc19154 Bug 5478 - Automate MARC framework import/export
Module to Import/Export a Framework structure to CSV/Excel-xml/ODS/SQL in Intranet Administration - MARC Frameworks section.
    There are two new links: "Export" to export to a format; and "Import" to import from a file.
    The data exported/imported is the one stored in the MySQL tables marc_tag_structure, marc_subfield_structure.

    Exported works as follows:
    1) CSV: As this format only allows one worksheet, the data from the tables is splitted with a row with #-# cells or with the
    names of the fields of the next MySQL table. Each row has as much cells as fields has the MySQL table. The first row contains the
    field names, the remaining holds the data.
    2) Excel: Excel xml 2003 format. Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    3) ODS: OpenDocument Spreadsheet compressed format, creates a temporary directory to generate the files needed to create the zip file.
    Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    4) SQL: Text file, the first row for each table is a delete and the remaining are inserts.

    Importing reads the rows from the spreadsheet/text-file as follows:
    1) CSV: Each row inserts or updates the associated MySQL table for this framework. At the end of the importing for a MySQL table, deletes the rows in the database that don't possess a correspondence with the spreadsheet.
    2) Excel: Imports each worksheet to the associated MySQL table. Works as the CSV for each worksheet.
    3) ODS: Creates a temporary directory to decompress and read the content.xml. This file has the data needed to import.
    Works as the CSV for each worksheet.
    4) Executes the SQL file.
    If the file imported has a different frameworkcode that the framework importing, the framecode is changed along the process.

    The Csv format will be the default.
    It uses perl module Archive::Zip or zip/unzip system command to process ODS files.
    To parse the sql files when importing it uses SQL::Statement or homemade parsing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:17:33 +13:00
Julian Maurice
d63eda645c Bug 5952: Add another tab for relatives issues
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:15 +13:00
Matthias Meusburger
6b2b62eb57 Bug 5952: Shows member relatives in issues lists
Duplicate of '[PATCH] MT3747: Shows member relatives in issueslists' : Subject was wrong

MT3747, Follow-up: Adds siblings issues

MT3747, Follow-up: Shows member relatives in issues lists

 - Now displays patron's and relatives' issues apart

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in circulation.pl
 - Adds links to moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Remove unuseful warn

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Adds sorting for circulation.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:14 +13:00
e5010b283e Bug 5401, WYSIWYG for Koha news: Testing TinyMCE
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:35:49 +13:00
Katrin Fischer
c0ca9f3413 Bug 5959: Add search link for analytics to serial records
This will work similar to 'Show volumes' links from traced series records and
set records. A link to search for analytics linked to serials.

A new syspref will be added: UseControlNumber.

This syspref will make it possible to determine, if $w and Controlnumber are
used for linking of records in bibliographic records.

If syspref is OFF (default), the search links will not use control numbers
but keywords.
If syspref is ON links will be built using Control-number and rcn index.

NOTE: 773$a is added to index Host-item. For testing on a dev installation:
copy record.abs to your koha-dev folder and reindex!

Rebased against 3.03.00.035 and a small typo fixed by Jared Camins-Esakov.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:23:30 +13:00
Katrin Fischer
284cfbc234 Bug 5897: Add new syspref ShowReviewer
This patch adds a new syspref ShowReviewer.

If ON (default) the reviewer/author of an OPAC comment will show.
If OFF the reviewer's name will be hidden.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:15:46 +13:00
Jared Camins-Esakov
22d9d8afdf Bug 5975: Add id to "Don't have a card" instructions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:07:40 +13:00
Jared Camins-Esakov
0e77d01ae5 Bug 5973: Add spans to staff client results
This patch adds spans with named classes to the results page on the staff client
so that the formatting can be adjusted with CSS and/or jQuery.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:06:20 +13:00
Ian Walls
b2a233f480 Bug 5578: Self checkout by Login enhancement
Enables the library to choose whether to have patrons scan their barcodes for self checkout, or login
with username and password.  Uses 'checkpw' for compatibility with LDAP authentication.

Also introduces a few new system preferences to make Self Checkout more secure and manageable:

  SelfCheckTimeOut:      the number of seconds before the self-checkout login times out for a patron
  AllowSelfCheckReturns: indicate whether or not patrons can return materials via self-checkout
  SelfCheckHelpMessage:  user-configurable HTML to show specific text on the Help page.

Thank you to Marlboro College in Marlboro, VT for sponsoring and testing this development!

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 15:18:40 +13:00
Doug Dearden
6c7f964c27 Bug 5738 Display 856u As Image
Add an option to the OPAC to display the URI that is stored in the 856u field
as an image instead of a text link.  This would be implemented in the OPAC XSLT
style sheets for the Results and Details pages, and would require that the
corresponding OPAC XSLT option be set.

This enhancement is designed to enable the staff to catalog images, then have
them appear on the resulting pages in the OPAC when searching.  Clicking on the
image would open it full size.  If the image option is in use, then the default
link text would be disabled.  Custom text would still appear if entered in the
"URLLinkText" option.

Add system preference "Display856uAsImage" with options of Results page,
Details page, Both Results and Details pages, Neither Results or Details page.

Notes for documentation manager:
There are two system preferences added for this enhancement:
OPACDisplay856uAsImage and Display856uAsImage.  These appear on the OPAC and
Staff Client screens under the System Preferences.

The preference can be set to one of four options:

Both Details and Results pages
Details page only
Neither Details or Results pages
Results page only

In addition to this option being set, the corresponding XSLT option must be
turned on. Also, the corresponding 856q field must have a valid MIME image
extension (e.g., "jpg") or MIME image type (i.e. starting with "image/"), or the
generic indicator "img" entered in the field.

As of 14 March 2011 the UNIMARC xslt display files also require a "0" in the
second indicator location of the 856u field for the links to be activated.  This
is not true for the MARC21 display files.

When all of the requirements are met, an image file will be displayed instead of
the standard link text. Clicking on the image will open it in the same way as
clicking on the link text.

Rebased and three original patches squashed into one on 30 March 2011 by Jared
Camins-Esakov.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Doug Dearden <dearden@sarsf.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 13:38:14 +13:00
Chris Cormack
c2cee4b445 Merge remote branch 'kc/new/enh/bug_6003' into kcmaster 2011-04-01 13:31:53 +13:00
Magnus Enger
b023e7f46d Bug 6003 Display call number on return
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 13:30:41 +13:00
Ian Walls
90392c19cc Bug 5990: Lists and Cart show LOC code not Location Authorized value
Lists in the OPAC, and Cart on both sides, show the LOC code for items, rather
than the appropriate Description from Authorised Values.  This is because the
code uses GetItemInfo, which is a very heavy-weight call to only retrieve some
of the desired information.

This patch introduces a new subroutine in C4::Items, GetItemsLocationInfo, which
returns the branch names for both home- and holdingbranches, the location code,
both opac and intranet location descriptions, itemcallnumber and cn_sort. This
should be used instead of GetItemsInfo in any case where the locational
information is all that's required, as it's much more streamlined and efficient.

In the OPAC Lists, this only applies if OPACXSLTResultsDisplay is 'off' (set to
'normal').

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 12:07:46 +13:00
Ian Walls
c625ff9872 Bug 5957: Making COiNS in OPAC search results optional
Adds a new system preference, COinSinOPACResults, which toggles the inclusion of
COiNS/OpenURL/Z39.88 in the search results display.  Default is 'on', continuing
the current behaviour.

Disabling this feature will result in a significant increase in search speed, since
each call to GetCOinSBiblio requires a separate parsing of the MARC record, and there are
<OPACnumSearchResults> calls to this routine with each search.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 12:00:25 +13:00
b6f51fb79e Fix for Bug 5828 - notes for purchase suggestions not showing in the staff client
- Correcting the markup error that prevented the note from appearing
- Adding a little icon to set the note off from the other data

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 11:51:48 +13:00
root
5d707b5e9b Bug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening additional dialogs"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 21:56:09 +13:00
47a53e9132 Fix for Bug 5988 - SearchMyLibraryFirst preference appears twice in preferences
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 21:10:31 +13:00
731b933d51 Fix for Bug 3523 - Menu of existing lists limited to 10
- adding "more" option to the search results dropdown
- offering a scrolling list on the add-to-list popup
- lists add popup shows the full list of all
  the patron's lists, divided into groups of private and
  public lists.

Can be improved by a fix for Bug 5529

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 21:08:40 +13:00
Chris Cormack
fb4aec265f Merge remote branch 'kc/master' into new/bug_5940 2011-03-31 20:45:52 +13:00
Nicole C. Engard
c597635b36 Bug 5940: Offline Circ & Patron Card Help Files for 3.4
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 20:45:35 +13:00
Nicole C. Engard
fc5ccbf5a3 Bug5940: Authority, Labels, Circ help files for 3.4
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 20:45:34 +13:00
Nicole C. Engard
de58d82465 Bug 5940: Admin Help Files for 3.4
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-03-31 20:45:32 +13:00
Magnus Enger
edf8ad5d5d Bug 3644 Add support for NORMARC
- XSLT for the OPAC
- Value_builders for lesder, 007 and 008
- Default NORMARC framework
- Reverse MARC logic of some subs, so MARC21 is default (and works for NORMARC)
- Add NORMARC as an option to the syspref marcflavour
- Add record.abs for NORMARC
- Add NORMARC and nb as options to Makefile.PL
- Add etc/zebradb/lang_defs/nb/sort-string-utf.chr
- Copy MARC21slim2OAIDC.xsl to NORMARCslim2OAIDC.xsl

Some things are still missing, e.g.:

- XSLT for Intranet
- More MARC21slim2*.xsl transformations
2011-03-30 10:13:37 +02:00
Chris Cormack
8e00f55216 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
2011-03-30 20:53:45 +13:00
Ian Walls
e57dadf762 Bug 5548: Hard Due Dates Circ Rule
Implements the RFC found at http://wiki.koha-community.org/wiki/Hard_Due_Dates_Circ_Rule_RFC.  See squashed commits
messages below for details of implementation.

Squashed commit of the following:

commit 871b91af00871146eb1216ebf5ce673dda2c5925
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Tue Dec 28 15:09:49 2010 -0500

    Hard Due Dates dev part 3: implementing the due dates in circ

    CalcDateDue now calls GetLoanLength, rather than each invocation running separately one after another.  Therefore, instead of
    the 'loanlength' param, CalcDateDue now takes 'itype', and uses the info to get both the issuelength and the hardduedate info (if it exists)

    Global Due Date no longer populates in the sticky due date field in Circ, since it can't be determined before the item is scanned.  Any specified
    due date still overrides the circulation rules, if allowed.

    Hard Due Dates in the past will return an error message, but can be manually specified if truly desired.

    Also, a small fix to updatedatabase.pl to allow the old data to populate if possible.

commit 14d5505f3c01287a2464a759f0076c1d4b665c49
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 18:28:11 2010 -0500

    HardDueDates dev part 2:  adding admin interface

    Adds columns to Smart Rules page, including calendar for easy date selection.

    Removes globalDueDate and ceilingDueDates from system preferences editors

commit 76e3e3d86a7a54c6ce4253e7f68278b4dc75a0bb
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 15:58:05 2010 -0500

    HardDueDates dev part 1: database changes

    Adds two new columns to issuingrules, a hardduedate and a hardduedatecompare.  If globalduedate is set, use that as the universal value
    for all circ rules.  Else, if ceilingduedate is set, use that as the universal value.  Adjust the comparison accordingly (-1 before, 0
    exact, 1 after).  the old system preferences globalDueDate and ceilingDueDate are then removed.

    Rebased onto 3.03.00.032

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 20:35:45 +13:00
Ian Walls
48ee1dcb3f Bug 5547: Hide Lost Items dev
Adds a Hide Lost Items option to the staff client, as detailed in the enhancement request
at http://wiki.koha-community.org/wiki/Hidelostitems_option_for_the_staff_client_RFC

Minor edits: Whitespace

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 20:20:05 +13:00
Paul POULAIN
268f860e24 Bug 5982 : OPAC Serials Minor change in description
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:59:55 +13:00
735d986a0c Fix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:56:54 +13:00
84e43e0615 Fix for Bug 5971, Minor markup error in holds queue report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:55:24 +13:00
Henri-Damien LAURENT
813f5c3f51 Bug 5964 : Translation problem on aqbudgets.tmpl
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:42:53 +13:00