Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster

Bug 4515 (Few very small errors in opac-search.pl) RESENT fixing whitespace warning

Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.

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

Bug 4472 Apply it to MARC21

For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.

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

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

Fix for Bug 5214 - undefined itype images cause broken image icon in request.pl

Also fixes the same bug on the Itemtypes administration page.

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

bug 5236: remove hidemytags from CSS as well

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

bug 5219: tidy cleanup_database.pl

Includes a bit of cleanup of the enhancement patch
for bug 5074 - adding comments about old and new
behavior isn't necessary for such small changes.

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

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

Bug 5370: Fix all the references to koha.org

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

Bug 5370: Fix all references to koha.org

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

Merge branch '5370_koha.org' of git://github.com/kfischer/Koha into new/bug_5370

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

Bug 5372 (v2) Existing value can be replace by default value

The way an existing value was tested was wrong. 0 is a valid value but a
false value for Perl.

=> replace privious proposal.

[3.2] Should also apply.

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

Bug 5370: Fix references to koha.org and other old websites

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

Bug 5370: Fix references to koha.org and other old websites

Adding 3.2 Release Maintainer to Release Team List

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

Bug 5368 Browse Shelf link appears when no itemcallnumber

Suppress Browse Shelf link on OPAC detail page when there is no item
call number.

[3.2] Should also apply on 3.2

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

(MT 2985) simplify CanBookBeReserved

The function was too complex for so simple stuff, not we check if one of all items of the record can be issued.

[Note by Galen Charlton: not only does this patch simplify the routine,
 it also makes it behave correctly.]

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

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

Fixing up a regexp to stop a trivial warn

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

Conflicts:
installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number

Bug 5363 - Removing unused module (C4::Cache::FastMemcached)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 4141: fix upgrade of OPAC XSLT parameters from 3.0.x

Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

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

Updating version number and fixing the xxx in updatedatabase ... my bad

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

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

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

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

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

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 5149: follow-up - remove extraneous character in link

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

bug 5149 fix broken link to noItemTypeImages preference

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

bug 5110 move NewItemsDefaultLocation to cataloging tab

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

Fix for Bug 4963, sys prefs need date hints and/or picker

This patch adds the standard date format hint used elsewhere
in the interface.

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

Bug 4254 - adding new patron advanced notice doesn't save

This was due to poorly constructed SQL which returned duplicate values for
certain fields. This patch corrects that SQL.

NOTE: There is also a formatting problem with the message prefs display table
when it is displayed in moremember.pl. This is due to there being no logic to
tell the table in that context to display checkboxes as appropriate. This patch
does not fix that. Bug 5328 has been opened for this problem.

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

Fix for Bug 5082 - Not translatable name of default framework 'Default' in MARCdetail.tmpl

This patch also fixes an unreported bug where switching from any
other framework to 'Default' would bring up no MARC data.

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

Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable

Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5142, Untranslatable strings in tag review template

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

Fix for Bug 5056, Untranslatable strings in members.js

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

Fix for Bug 5136, Replace SQL with call to GetAuthorisedValues

An embedded query in circulation.pl for BOR_NOTES authorized
values can be replaced with a call to GetAuthorisedValues

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

Fix for Bug 5135 - Authorized value input maxlength should match table column

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>

bug 5171 change 'edit items' to read 'edit item' when next to 1 item

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

bug 5168 change link text from holdings to items

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

Fix bug 3811; Index language as word

An incorrect definition in record.abs was resulting in searches on languages returning incorrect results.  By changing the indexing mode from numeric to word, this patch fixes that problem.

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

bug 5311: correction to database update

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

Update language mappings to fix Bug 5311

This patch updates the language_rfc4646_to_iso639 mapping table with the
correct mappings for several languages that were not mapped correctly to
the codes used in MARC, including Finnish (which was not mapped at all),
and Armenian (which was mapped to an obsolete code). This patch also
changes English and French to use the proper three-letter codes, which
will eliminate false positives when, for example, limiting by French
brings up results in Afrikaans.

This patch adds the changes to the updatedatabase.pl script, and removes
the incorrectly specified DBversion in the previous patch.

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

bug 5190: improve linking to MARC field documentation

* zero-pad tag numbers as needed
* handle special case for linking to UNIMARC 0XX vs. 1-8XX
* add a wrapper function
* add comment about the poor linkability of IFLA's UNIMARC documentation

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

bug 5190: link to MARC21/UNIMARC online doc in the bib editor

Patch from  Tomás Cohen Arazi <tomascohen@gmail.com>

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

bug 5326 fix link to old prefs editor on patron attributes

on the patron attributes page if you have ExtendedPatronAttributes
turned off the error points you to the old sys prefs editor - this
patch fixes that

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

bug 5326 fix extended patron attribute error

the error message if you have ExtendedPatronAttributes turned
off linked to the old sys prefs editor, link has been updated.

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

Fix for Bug 5137, Remove obsolete code counting issues by item type in circ

The removed section of code contained a "my $dbh = C4::Context->dbh"
which was required for the query of BOR_NOTES. That line has been
moved accordingly.

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

Fix for Bug 5008 - "Remove" link missing when Cart in expanded view

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

bug 4986 move serials prefs from cataloging tab to serials tab

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

Fix for Bug 5114 - Can't edit basket in Internet Explorer

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

bug 5019 remove link to funds

This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

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

Bug 5177 Selecting default sort result by syspref

Syspref .pref file was defining a code for descending order which wasn't
expected by .tmpl files... 'desc' instead of 'dsc'.

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

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>

Merge remote branch 'galen/bug5308' into bug_5308

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>

bug 5308: add foreign key constraints as well

Follows up on previous patch to require that routing
list entries be linked to subscriptions and patrons.

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

bug 5308: subscriptionroutinglist more strict

borrowernumber and subscriptionid NOT NULL, UNIQUE(subscriptionid, borrowernumber)

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

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

Merge branch 'signoffs' into kcmaster

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>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

bug 2567: let 008/15-17 and 008/24-27 be set

Fixes bug where the MARC21 008 plugin was falsely
claiming that it set the illustration and nature of
contents positions by deriving it from other fields
in the bib records.

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

tweak wording of merge target

Since the merge functionality is for merging biblio
records, not items, made the language more precise.

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

add missing help file for merging records

Signed-off-by: Galen Charlton <gmcharlt@gmail.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>