git.equinoxoli.org Git - koha.git/log

Partial fix for Bug 4870, Damaged status does not prevent items from being selected for reserves

This patch changes the holds queue build process in order to
require that items not be damaged in order to appear in the
holds queue report.

Revision adds a check for the AllowHoldsOnDamagedItems preference to
determine whether a damaged item should be included in the holds
queue report.

Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f7411ceee5887751fb34ad2c72c83216d55f0c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug5555 Corrected search for ISBN / ISSN

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ab7435f964336a18f760b9dd91d4b4506528a051)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5924 : C4::AuthoritiesMarc.pm search enhancement

Heading Main is defined in unimarc record.abs
re enabling that feature

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c19d505abb1b492cc21e6f5b78fb4de91da44419)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4196 - Defintion of popularity index into Unimarc setup

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0c21ab2622d2d9b131c24c2002ed6e65875a6b24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5410 : Adds "do-not-truncate" in the search queries of Heading.pm

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f4edffc16adacb439601f9051bacd89869018f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6040 : Adding some error handling to the opac export

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 58013b6c2ad01b87c778ec56bf02dd58e826200e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6047: Remove check on subfield 3 that prevents biblios from BNF to create corresponding authorities

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96f054e90d4a582b13f1f6d2922b4ae99999a23d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5651: Question marks break searches w/ICU

When a user is doing a simple keyword search, they should not be expected to
deal with the magical behavior of question marks in Zebra. This fix escapes
question marks, and reduces the number of false positives for identifying a
"simple keyword search."

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ad206a73f867f6a184f64d41e4ccfa8e5bb0cd21)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

BZ6058: uncertain price can't be unchecked

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ce71043216f843ad1b1d2fb254db4dd2635e1066)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug #6044 - Authority is deleted when mergeto and mergefrom are the same

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e43da19e34745d734ab6ee5cb5540e4d6e92adf3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating history
(cherry picked from commit ff4645523b7e273438a4211ed4735f59084f5baf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl

In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Add a new fund, leave library empty, owned by yourself
2) Go into the database and change aqbudgets.budget_branchcode to be NULL
3) Check acq home. Before patch the fund will not show up, although it's owned by you.
After patch it will.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5910b59d1d4bdbe6fb6152453536bfe64d490c01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Corrects an error when showing a suggestion linked to a deleted budget.

If a suggestion is associated to a budget that was deleted, an error was
returned because we try to get the name of a budget that doesn't exist.
With this fix, the page is shown without errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a43ba114d0fee9a478def455b926121442a0814)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6046: suggestedby list on she filter was not created properly

The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ff8ad64c2797d73464ef9009acba8744922fc61f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6043: SQL error when IndependantBranches=ON on suggestion

On suggestion page, when IndependantBranch=ON, the SQL built is wrong:
branchcode is ambiguous

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 09e2ee605845e9cb03f21f2596404d60d1e9fc74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6045: Accepted by is empty when accepting from list

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a56e1e1729fbbc1b341bbad7c2fcf94d4642806f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating Version Number to 3.02.06.001

Bug 5860: Adding duplicate stocknumber fails silently

When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8ffb2273b63c398492a7cbd08394adedb2aeadb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5989 - Funds filter does not remember library choice

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f22b8bcd458df8d8fad29070a7b95a63b6d356a2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6026 : export.pl : removing useless condition

Some conditions added AND items.biblionumber=biblio/biblionumber
where JOIN USING (biblionumber) already added that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 63f1ea0c2dcd442ce0cb3b29d40f5015dceb5bab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5625 : adding missing title (needed for lateorders.pl)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 624ebb6e03bbf0f4c9f99298c0faed14bf4ed29b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3727: Corrects the behaviour of the itemtype selectbox in addbiblio.pl

If the subfield is set as mandatory with an empty default value, an
empty value is added in the selectbox and this value is selected by
default. Before, the first element was automatically selected, so it was
easy to forget to set this mandatory value.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7d9ebbff3ab9b620b0c0b80b3dc28c51753ec13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5965 : Normalizing opac-detail.pl

NFC on opac-detail

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 480ca80dd0b38022b106a7b1339bc7c56ca272f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5996 : MT2926: Fix default values for patron import

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ff7affdf43b4850a0ce62c9924246caac69b9030)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4943: Search history cookie size limit

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fd1b757233a6db66a82bbc3ff4d2f40291b96832)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 6004/3270: Sending things "home"

This patch addresses two problems:

Bug 6004:

If an item is returned at other than its' home library, and there is a hold for
it--at any library other than the return library--two prompts come up: one
telling the user to send the item home, and the other, to confirm and transfer
for the hold. Only the latter should be displayed.

Bug 3270:

Cancelling a hold request after transfer initiated orphans item.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a64cfba5e10be80a220f6c8164905788ba5a78b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5305: CCL query, then resort, loses reults.

If you did a CCL query, then attempted resort, you would get the advanced-search page,
because of wonky URL escaping of the q= clause. This patch fixes that.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8548b804f49a5e84a64b7caf2457daf1a83f834b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3629 : search limit by group is not OK

MT4491 : limitation by library group

- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()

author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)

the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 091d3100169a12e9498f6d58c8b61ac01a5a5db6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5253: Add options to runreport.pl

This makes sending reports via e-mail with runreport.pl work properly. It also
adds a --format option to allow the user to select between text, html, csv, and
tsv. At the moment text is not implemented, and falls back to tsv, but that is
still more readable than the HTML that used to be produced.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 412966eff0016c69e5763197f1542e88c74580a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5833, opacstylesheet not loading on all pages

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b5a050d759b08027b210106e90d5714eb02b9032)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4265: Fix padding of short callnumbers and Bib-1 attribute for sorting

1. The current C4::ClassSortRoutine::Dewey turns "306 Les" into "306_Les" for items.cn_sort and MARC-field 952$6, which results in "306.46 Les" being sorted before "306 Les" in the OPAC. With this patch, "306 Les" is turned into "306_000000000000000_Les".

2. Currently, call_number_asc and call_number_desc are set up to sort by 1=20, but this is mapped to Local-classification in ccl.properties, which is mapped to 952$o in record.abs.

This patch changes these sorts to use 1=8007, which is mapped to cn-sort and 952$6.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aef8358cf2ce8db9803d94c14f6728cdf9ebd0d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4366: Improve COinS support for MARC21

This patch begins the process of improving the COinS support in Koha to take
advantage of all the metadata available in the MARC format. COinS still doesn't
work quite right, but at least it seems to be following the standard now. The
COinS exported by C4::Biblio::GetCOinSBiblio now correctly identifies articles
from journals and books as such.

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>
(cherry picked from commit 8958f152e7273d3b1fc45a6f7494ab6066aab55e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3326: Staff results still displayed &

In certain circumstances, ampersands would not be displayed properly in the
Staff client search results. This patch fixes that by ensuring that all the
doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
correct single ampersand entity.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5817: Follow-up fixing callnum: on staff results

This patch changes the call number links on the staff results page so that
searching will work. The underlying problem described by bug 5274 remains an
issue, but this fixes some of the more problematic symptoms.

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>
(cherry picked from commit b853b79001ceefc897eac781a6ebf28e7cc29c85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens

This patch enables the ACCTDETAIL notices (and any branch-specific derivatives) to use
<<branches.*>> and <<borrowers.*>> tokens

This patch also attempts to send the email from the branch email first, falling back to
KohaAdminEmailAddress if no branch email exists.

To test:

1. Enable AutoEmailOpacUser system preference
2. Add <<branches.*>> tokens to the ACCTDETAIL notice
3. Create a new patron, including:
   a. test email address in the field matching your AutoEmailPrimaryAddress syspref value
   b. username and password (required to send a notice)
   c. any other required fields to save the record
4. Check you inbox.  Notice should send instantly (no need to run process_message_queue.pl)

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1d6f791541686dfa409843f8f5b1624f1be6e8cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5960 : Itemtype icons not showing correctly in staff search results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 42f316ae480100572e996a7a4de76b9528db3d23)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5940: Update Patron Help Files

This patch updates the help files in the patron area of Koha.

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>
(cherry picked from commit b8f3120bf5f5e7f2da73c213ed74bb003cf5da25)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3098 follow-up: Clean up formatting

This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 009036b53722881f607ed01b5701bd300abd6735)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5883 : Prevent re-encoding the items if they are already in UTF-8 in ModBiblio.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cce98a2914c85ce1e1c5563b64a986c880024079)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5902: additem.pl should default to set library

This patch makes the additem screen default to selecting the currently set
library. If the library is unset, it will default to the first branch
alphabetically.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d8e239c23e23eb34eb2552cc036b364c869ceec2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5909 : SetUTF8Flag on any incoming data

This prompts NFC normalization on adding record
Therefore, any saved record will be NFC normalized

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b4512d5c40b552a45fced0f48635af355d55efa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5907 : MT 2538 : Using default authtypecode for authority display

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2498992447ba36f4af2aea5df2c2b2130cbe95f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5889: Messages name in english for notifications on public interface.

Modification of template to allow multilanguage support. Alsa fixing columns overflow.

BibLibre bug #5939

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5390: OPAC loses library selection

This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.

To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.

This patch also fixes bug 5852 and bug 3778.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a1f05a5a2cbe0bb5665c824c0cbcf1a0851a6fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5834: Holds link missing when 942$c is not for loan

Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.

To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter

After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan

Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1654e1aa148303fde0d30360f533be26b3029d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4878 - Command-line tool for getting and setting sysprefs

New script misc/admin/koha-preferences - Allows getting and setting of
sysprefs one-at-a-time or in bulk. More info:

misc/admin/koha-preferences help

or:

misc/admin/koha-preferences manual

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba6b2e148667d7fc1bd382d8f65c06e28768631)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Adding 2 more developers to the history 137 now!
(cherry picked from commit c523ae2d646350996efa9cfc1e6149e1f1fac722)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer

It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".

Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer

Fix error on comma for IE

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0499633a6b27d44bf002bc4d99b82ee63237a001)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5892 : opac-user: minor spelling/html changes

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 01b6e7a6ddfbaaca59215f7a88d8aa1010053217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5864: link biblio => serials subscription is wrong

The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.

The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.

This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 632277e453fa80797e1cfc9dc32f1d1d8cc089af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML
(cherry picked from commit 528cfd918c2f8f57a392302897977804c5f7e7c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML
(cherry picked from commit 04869d0fd08c4bad9403f18365d3648ba1410452)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3735: Wrong search results for a few fields in ccl.properties

This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 975aea1372de1def413ad02330916942e4160533)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5890 Correct Mismatched operator in comparison

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f0a326da5bb347310e60103bd3486b22a495743)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b1fe1c9c33a4ac0924c96fd1aacf076c4f2fa23)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5879 : Biblio.pm : fix isbd syspref and default location

- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 620ae78f847ba3c42bcbfd0e0f9a530daa79e65b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5646: Translated sql files break messaging

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1411a929360d1ad667b2178b3d42b82996642bfc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5816: XSLT doesn't display enhanced contents

This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit de4619b849e4cc6f7bdc821bd52581876a02b7d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Follow up for Bug 3326: previous fix broke searches when

This fix ensures that searches will still work when -x is not used when
reindexing Zebra.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e18ddca9d4a6c741a918be28bb3e2cc3e2b30030)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3595 (partial): Items seen at checkin are not filling holds well

In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary.  If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*.  But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.

This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned.  One caveat:  If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned.  This is, however, an edge case!

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 784b9df4f240302d3946089862ca6bf6f33c08a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3326: Work around Zebra's handling of & entities

When using XSLT mode, the OPAC results display will show "&" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d52f3680f482a42cc98ad9810c011c8775d9b3ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5865 - Labels wrap incorrectly when paper width is greater than height

This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.

Note: This should be backported to 3.2.x

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5a924cc530658f3ab11cf1a219fd9ba4e602f1e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating Version Number to 3.02.06.000

Release Notes for 3.02.06.000

Translation strings update for 3.2.6
(cherry picked from commit ea918baa655554d058645cd02b8ea9d363177be4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9b5e18c4ee05941eab435d83c510d931dde34370)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating Version Number to 3.02.05.003

Bug 3670: change 'Item DUE' to 'Item Due' in English dbs

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 07b9125861c2d57f787f3bd3d598dcbd652b030b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5819 : No toolbar in record view when quotes present in title - fix

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6e580439be3382af88aed5e3ba9f7e3e8876f0b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug4438/MT5496 budget Exceeds total allocation

This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e297c6cb8e7b6b73b9df2e2ae1ba3dd0bc014e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5595 : Fixing a security glitch (please always use placeholders or
dbh->quote and fixing the tests
(cherry picked from commit 8215cc8bad33ff1dd327ac17fbfecd59e6f06989)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Adding release dates and 2 new developers
(cherry picked from commit 4b2ccab56871749016bfffabc32fee44c58f7c78)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5736: Fixing some zebra configuration errors in marc21/biblios/record.abs

Patch adapted for 3.2.X only. Signed in master.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 728b3725df5b48d47693b7b37454c7b6ab4c6110)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4072 Lost items aren't hidden on OPAC result page

When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 326222e3f109d816a8fa3118c068df7a3f706f52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5846: fix detection of Javascript to compress by mod_gzip

Update to default Apache config; should result in a slight
performance benefit.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 12cc56a9c7f2527e126fc32c920d141cf2fdd034)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5595: (MT #5757)adding additional attributes support on patrons's search

Restores ability to search on extended borrower attributes that are configured to be searchable

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ee0cc18b314d0123d8436a798bb02c5c1448494)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug_5064 Rework data retrieval in booksellers.pl

loops were slightly illogical and db accesss was excessive
and repetitive. caused it not to scale well on large datasets
Routines in Acquisition.pm seem to have inconsistent views
of the data.
rework logic to utilize db and processing better

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0fd3b7f112c419629c3999d830ee04218dc55730)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

update INSTALL* to acknowledge the use of mod_deflate

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 002baadaf4cde6a397ca93cda35fadd012b40629)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5527: Fix some problems in inactive borrowers report

- 'Not checked out since:' date was not added to query
- borrowers with only checkouts and no returns since this date were considered inactive

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f2cf6c2db3e126541b10d9c1d9d7458c6766a071)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5703: Hide the $9 subfield (linked authid) when showing series for a MARC record in normal view.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b39466c965dc216680d6ff12d3044e9e5174ea4a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3624 : Follow up patch, to catch any installs that still have the missing columns

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

BZ3624, proposed patch for kohastructure.sql rewritten

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 306871578edc592b2b1ff20c19b33d801e2573fc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 2975: whitespace and formatting cleanup

Not part of the bugfix per se, but taking this chance
to clean up some inconsistent tabbing.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2e963dc416f533a0acb857f022295da42ceed1ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 2975: fix calculation of due dates by offline circ

Offline circ no longer tries to calculate the due date
directly, instead relying on the AddIssue and AddRenewal
APIs to do so.  This corrects a bug where the due date
would be calculated incorrectly if the item-level_itypes
system preference is turned on.

This change also has the effect of causing the issue date
for loans uploaded via offline circulation to be set
to the time stamp recorded by the offline circulation client.

Test plan:

* Turn on item-level_itypes
* Create an example item whose loan policy per
  the item's item type would be different from
  the default policy based on the bib-level type.
* Create a test KOC file with a loan of the test
  item and the checkout date artificially set
  to yesterday.
* Upload the file:
  - Before the fix, the due date would be set
    to the default due date.  Also, the issue date
    will be set to the date of the upload.
  - After the fix, the due date would be calculated
    correctly based on the item's item type.  Also,
    the issue date will be set to the date recorded
    by the offline circulation client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 935635aba5dc0ab62f9476986cc418ae8c980b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5831: rebuild_zebra.pl doesn't respect -r

Reimplements support for -r, as well for -reset

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8dc56a0d2c5f33f6d14e2039c7cad9fa9598f14f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5820: Change language to 'Fund' over 'Budget'

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6718e14e7637289db57e80f27dc46be51b0e38f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5693 - mc-ccode parens fix

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c84dad3b187770160a845d77f146870cc0159c63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

(bug #5157) fix borrowers top issues

this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b285cf44d969ccfddf7c208803b1cd679185915)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4853 - Rights needed to renew a document

Correcting check for circulation permission. Also updating
updateitem.pl (for setting lost and damaged statuses) with
circulate permissions.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7a587112f0417f152b2c95f81cb5e0f82df91c73)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4290 - search for author in repository

Reimplementation of Nahuel's patch from 2010-03-02

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ba9aab76bdcc16ff00d8888cbf6a8145a329a07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3341: Fines calculation erroneous when a repeatable holiday is added

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dbe3780fc0e54e637fcbac96bb758781f722ddc4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fixing a utf8 issue with the translator tests
(cherry picked from commit 7c97e0bfe7ae18694437e03814b8f61811493593)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5824: Creating a circ rule for a specific library causes anomalies

The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4735e296cf99dea4dd5217193460f8585d6cf25d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5818, Date picker broken on label batches

Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2dde87679864042fb531c3f580e564a3d6b70f3b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>