Merge remote branch 'kc/new/bug_4991' into kcmaster

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_5301' into kcmaster

Bug 5192 Enhancement to add new index for 658 curriculum field

Creates new curriculum index for 658 subfields a,b,c and search option in Advanced search (under More Options).  Also modifies the installer files to make 658abc display (they were hidden in the frameworks) and to create the new indexes.

The 658 already displays as part of the staff/OPAC subject display line.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5243: avoid crash when saving authority records on certain setups

This does not seem to occur on all platforms - C4::Search
exports SimpleSearch() by default - but adding the 'C4::Search::'
qualifier certainly doesn't hurt things.

Patch by Fridolyn Somers <fridolyn.somers@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 4991: follow-up tweaks

* make some strings translatable
* display library name instead of code in add/edit
  holiday panel
* minor textual fixes to hints

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fix for Bug 4991, Overhaul of Calendar interface

- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
  forms in Koha
- Change the way dynamically displayed hints are shown to better
  match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
  only description could be edited).
- Add links to the list of existing single-day holidays and
  exceptions which opens the calendar to that month/year

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Merge remote branch 'kc/new/bug_5162' into kcmaster

bug 5162: follow-up patch to not clear hidden input setting attribute type

Otherwise, can't saved new attributes set from a cloned
input or select control.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5162, patron attributes 'new' link should create blank value

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/for-3.4/enh_bulkmarcimport' into kcmaster

Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster

bug 5050 move language prefs to I18N/L10N tab

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5151 removed bolded terms in breadcrumbs

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5237: Testing renewals on patron barcodes with + signs at the end

According to notes in bug, patch was originally by Chris Cormack.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5163 change title of holds to pull page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5258 change 'order' to 'order line' on receive page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5224 Remove the adjective Shopping from basket

New orders breadcrumbs were using the inappropriate term
Shopping basket whereas basket is used elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

BUG 5239 add space between number and words in acq search

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5221 - Preselect tab containing itemtype/authval image in use

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_5236' into kcmaster

Fix for Bug 5236 - "hide my tags" link does nothing

Removing the link. The suggested functionality doesn't
seem useful.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Enhancement 5074 (Adding possibility to cleanup_database.pl to purge only older sessions) [UPDATED for master]

Currently, the misc/cronjobs script cleanup_database truncates the session table (deleting all records, including active sessions).
With an additional parameter sessdays, this behavior could be changed or (perhaps better) extended. If the parameter sessdays is passed along with a number of days, the script only deletes older session records. This is accomplished by examining the values of lasttime, atime or ctime in the record.
So, calling the script like:
  ./cleanup_database.pl -v -sessions -sessdays 7
will only delete sessions records older than 7 days. The "old style" call
  ./cleanup_database.pl -v -sessions
still works too and truncates the table as before.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5301: improve escaping of XML characters in bib output

<, >, ', or " in an item call number will no longer make
the bib displays break when using XSLT mode.

Added a new routine to C4::Koha, xml_escape(), to implement
converting &, <, >, ', and " to their corresponding
entities.

Patch loosely based on work done by Daniel Latrémolière <daniel.latremoliere@bulac.fr>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5318: fix value of r4 rank weight

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

remove unused template include

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/background_jobs_tested' into kcmaster

Merge branch 'signoffs' into kcmaster

Fix for Bug 5223, 'related subjects' should read 'subjects'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 4261 - keyword mapping should show which framework the map is for

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

history updates - recent releases

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5327: follow-up to fix SIP tests

* removed t/SIP_SIPServer.t - despite the file name,
  C4/SIP/SIPserver.pm is not actually a module and
  cannot be 'used' or 'required'
* set module search path so that t/SIP_ILS.t and
  t/SIP_Sip.t will pass

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5327: More basic unit tests for C4 modules

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

History updates

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

remove extraneous semicolon

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Updated links in Main Page Help

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5327: Add unit test for ItemType.pm

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

unit test stub for Z3950.pm

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Create Unit Test for ImportBatch

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug5075' into kcmaster

bug 5146: patron import files require header row

Fixed help text on this point as well as options for
supplying dates in the input file.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5327: Add basic unit tests to some C4 modules

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5327: Add basic unit tests to some C4 modules

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

create unit test files

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Adding a simple test for Service.pm

At the advisement of the great Chris Cormack. (thanks for the lesson)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5322 - Added pwgen dependency

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5309: tweak so that background progress doesn't exit immediately

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

fix use of outdated boilerplate

* New code *must* have an accurate copyright statement;
  it isn't 2000-2002 any more.
* Enable warnings in new code, don't do

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 5309: Adjust progres bar

Also added some test facilities
wr73785

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug5027: skip unticked checkboxes when submitting in the background.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fix for Bug 5075 - Terms not highlighted w/ xslt on

- XSLT didn't contain the class markup which acts as a hook
  for the JavaScript highlighting system.
- Standard results page also contained a typo which
  prevented data other than title and author from
  being highlighted

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fix for Bug 5223, 'related subjects' should read 'subjects'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5227 [3.4] Enhance the label batch edit interface

This patch adds the ability to enter items into label batches via
barcode scanning

Work sponsored by Tamil - http://www.tamil.fr

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fix for Bug 4261 - keyword mapping should show which framework the map is for

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fix for Bug 5254 - no need to scroll left to right on acq z search

- Adding inline preview/import menu to match cataloging z39.50 search
- Improving behavior of inline menu on both pages
- Adding white space to ISBN/ISSN output on both pages to allow
  line breaks, improving table width and horizontal scrolling.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 5235 : circ receipt should include name

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5315: Remove references to obsolete variable nbstatements

Trying to see the wood from the trees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3211: fix some errors that crept into the cleanup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Further fixes for Bug 3211, cataloging value plugin forms should be valid XHTML

- Adding page heading
- Adding "Cancel" link to close popup
- Correctly marking up <label> <input> pairs
- Correctly escaping JavaScript blocks
- General markup corrections

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 5128: fix syntax errors in previous patch

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

update AUTHOR in Makefile.PL

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

DB revision 3.02.00.004 - general release of Koha 3.2.0

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Release notes for Koha 3.2.0

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

standardize name of ILS-DI:AuthorizedIPs syspref

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

updated to installation instructions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3597: DelItemCheck now refuses to delete items in transit for holds

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3597: "delete all items" no longer deletes  checked out or waiting items

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 5128: leave record.abs to French defaults

Compromise so that the majority of the English UNIMARC
framework can be accepted into 3.2.

Non-French UNIMARC users should observe the comment
at the bottom of record.abs.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5128 [3.2] Unimarc default for holdings. Written with French default

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 4972 Fix table creations failing due to foreign key checks

create tables were failing with cryptic 1005 error from mysql
wrapped creation of aqbasketgroups and aqcontract in
FOREIGN_KEY_CHECKS=0 and FOREIGN_KEY_CHECKS=1

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3881: remove unused OpacPrivacy syspref

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

fixing various links to point to *.koha-community.org

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3756: remove disused system preference from database

This leaves a few system preferences displayed on the
local use tab in the syspref editor that should be displayed
elsewhere, but all of the ones left are actually in use.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Update changelog and build script in preperation for 3.2.0 release

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 4176: remove references to unimplemented system preference MIME

The intended functionality of this system preference was never
implemented.  To avoid template changes prior to 3.2.0, put in
hard-coded string 'CSV' to (accurately) identify the type of
the output files in the affected reports.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3756: remove more references to disused sysprefs

OPACSubscriptionDisplay
OPACDisplayExtendedSubInfo
OAI-PMH:Set
OAI-PMH:Subset
ILS-DI:AuthorizedIPs
libraryAddress
kohaspsuggest
OrderPdfTemplate
marc
acquisitions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

remove last vestiges of NOTMARC mode

MARC, the metadata exchange format for the 20th century!

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

bug 3756: start removing references to disused sysprefs

holdCancelLength
PINESISBN
sortbynonfiling
TemplateEncoding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

remove two disused functions

html2marc and html2marcxml are not used, and html2marcxml
is the last user of the dead syspref TemplateEncoding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

remove a couple duplicate lines

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

(bug 3536) fix homeorholdingbranch on return

this patch create a new systempreference "homeorholdingbranch"-like used only for returns.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
An additional edit was made to circ/returns.pl by Ian Walls of ByWater Solutions to force the dialog message for the return to
use the branch specified by the new HomeOrHoldingBranchReturn system preference, rather than always Homebranch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5303 Overdue notices subject is improperly encoded

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Fixing a double count of a developer and adding a new one to the history

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 4305 - prevent errors when handling invalid ISBN13 values

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push

Translations

Bug 5130 - Misspelled words: biblographic delimeter extention

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Misspells: deleteing -> deleting

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5134 - Misspelled words: exisiting anomolies genereated

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5133 - Misspelled words: reservior notifiying deleete + recieving

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5132 - Misspelled words: Acquistion Succesfully professionnal

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5124 - Duplicate and Misspelled words: periodicy outputing

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5123 - Misspelled words: Depdending Commited flutucations

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Additional fix Bug 5122 - Misspelled word: transfered

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5122 - Misspelled word: transfered

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5121 - Misspelled words: stripts biographyl Begininning

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5119: Misspelled word correspounding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5117: Misspelled word Organisztion

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Bug 5118: Misspelled word: Currencey

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Misspell: Quanity -> Quantity

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Merge branch 'enh_bulkmarcimport' of git://gitorious.org/koha/mainline into to-push