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

Bug 6104: Modify item looses branch

If the $value is provided by the item, use it, don't use the librarian branch !

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 6188 : Gender not showing in the opac

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

Bug 6187 : Fixing template issue with opac-authoritesdetail.tt

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

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>

Fix for Reserves.t allow the tests to run without a logged in user

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

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>

Merge remote branch 'kc/new/enh/bug_5952' into kcmaster

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>

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>

Merge branch 'new/enh/bug_5917' into kcmaster

Bug 5917 Trying to fix the js parsing for translation

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

Bug 5917 : Fixing a bug in the results page

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

Merge remote branch 'kc/new/enh/bug_5692' into kcmaster

Bug 5692 : Adds an alternative cataloguing plugin for 210$c

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

Bug 5922 : Template changes

Bug 5922 : Functional Changes

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

Fixing typo in fix for tests

Bug 6154: Default sorting by title doesn't work

If you have the default sorting set to title ascending or title descending,
your search results will not automatically be sorted because the syspref uses
title_asc and title_dsc, whereas Search.pm wants title_az and title_za. The same
issue is present when the default sort is on author.

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

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

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>

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>

When running the tests a user is not logged in so C4::Context->userenv
does not exist, stopping the tests erroring

Bug 5067 Add a cleanisbn param to bulkmarcimport.pl

Import script shouldn't remove an information present in entering biblio
records. With this patch, by default, ISBN are not cleared anymore.

[2011.04.12] Rebased on HEAD

DOCUMENTATION: There is a new paramater --isbn|--noisbn

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

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>

Bug 6170: Do not prematurely group results

If OPACGroupResults preference was set it was
shortcircuiting the template selection logic and
we didn't go to the advanced options field

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

comma fix

Bug 6169: Inventory tool fails when ignoreissued set

Due to incorrect parameters passed to C4::Items::GetItemsForInventory, checking
the "Skip copies on loan" box resulted in the inventory failing to run.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

Bug 5917 : Fix for xgettext.pl

Bug 6171 Can't edit items

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 2505: quiet warnings in tools/inventory.pl

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

Bug 6163 : Fixing typo in updatedatabase

Fix for Bug 6162, name missing on reading history in opac

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

Bug 6164 Send Borrower Data to template consistently

messaging and notices patron tabs were not passing borrower
info in a manner consistent with other tabs

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

Fix for Bug 6159 - Variable scope errors prevent placing holds in the OPAC

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

Fix for Bug 6160, my details not showing tabs

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

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>

Bug 6167 - can't use 008 or 006 plugin in cataloging

Due to changing to T-T $template->pama("lang") return undef,
now is $template->{param} the right value.

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

Merge remote branch 'kc/new/enh/bug_5431' into kcmaster

Bug 5431 : Follow up patch fixing ModBranch

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Adding 2 more developers to the history, 141 now

 Bug 6155 : Fixing bug with lists not showing

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

Bug 5917 : Fix for translating XSLT

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

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

Bug 6085: Fix typo in earlier patch

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

Bug 5917 : Fixing the translation script

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

Bug 5917 : Fixing a bug with categorie.tt

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

Bug 6085 : Fixing the utf8 weirdness

I am not very happy with this fix, but it does mean the template are
translatable and we don't get double encoding issues with them anymore

Please test

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

Bug 6085 : setting the binmode broke the files rather than fixing them

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

Bug 6085 : utf8 fixed for xslt, and parameters, broken for utf8 included in templates

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

Bug 6085 : Fixing missing last tag in translation and comments, utf-8 issues to fix now

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

Bug 6085 : Can now change language in the preferences menu

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

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>

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>

Bug 5917 follow-up: Quiet errors in C4::Templates

There were a few errors about unitialized variables in C4::Templates.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5917 : Fixing a bug with switching languages

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

Updating database version

Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

Bug 5917 : Updating dependencies

Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

bug 6031: play with options passed on to rebuild-zebra.pl

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

Bug 5917 : Swapping templates over

Bug 5917 / Bug 6085 : Fixing not being able to change language

Bug 5917 : Catching  pref,css and js changes

Bug 5917 : Updating templates

Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/updatedatabase.pl

Bumping database version

Merge remote branch 'kc/new/enh/bug_6013' into kcmaster

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>

Fixing updatedatabase

Bug 5984 : Follow up : Catching the rest of the languages sysprefs

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

Bug 5984 : Follow up Adding OpacHiddenItems syspref

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

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>

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>

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>

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>

Bumping database version

Bug 5728: Adding kohaversion and fix syntax error in updatedatabase.pl

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

Fixing a typo in systempreferences

Bug 5637 : MT3044 : Fix CSV export when rer are blank characters

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

Bug 5631 : (MT #2993) add EAN, PUC and Music-Number indexes

This fix add different "music" identifier to zebra indexes, for example it permit search through CDs via EAN.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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>

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>

Merge remote branch 'kc/new/pending_qa/enh/bug_3644' into kcmaster

Updating database number

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>

Bumping database version

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>

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>

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>

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>

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>