Commit graph

1536 commits

Author SHA1 Message Date
Paul Poulain
9a0e4911e6 Bumping version to 3.10.0 and adding sponsors that are were not already written
Sponsored-by: Central Kansas Library System (CKLS), Plum Creek Library System and Washoe County Library System
Sponsored-by: Los Gatos Public Library and Harrison Carmel Public Library
Sponsored-by: Talking Tech
Sponsored-by: VOKAL
Sponsored-by: Brooklyn Law School Library
Sponsored-by: North Central Regional Library (NCRL)
Sponsored-by: Washoe County Library System
Sponsored-by: Corpus Christi Public Libraries
Sponsored-by: Northeast Kansas Library System (NEKLS)
Sponsored-by: Université d'Aix-Marseille
Sponsored-by: Université de Rennes 2
Sponsored-by: Université de Lyon 3
Sponsored-by: Université de St Etienne
Sponsored-by: BdP de la Meuse
2012-11-23 11:34:23 -05:00
Jared Camins-Esakov
64b9bc74bf Bug 9064: Increment version number
Database update for bug 9064 has been given version 3.09.00.067
2012-11-22 09:04:05 -05:00
Paul Poulain
b5474b7f95 Bug 9064: fix statistics.ccode column
From updatedatabase.pl:
    $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower");
From kohastructure.sql:
  `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code

The variant in updatedatabase.pl is probably what was wanted.

This patch fixes the kohastructure and add another updatedatabase.pl, in case someone has a broken install.
This should not happen, because 3.10.0 still not released, but just in case...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:01:30 -05:00
Mirko Tietgen
f5703f8bc7 Bug 9024: Fix typo
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
a0819d9baa Bug 9024: Add missing sample data to existing files
Adds missing authorised values (enhancement)

Adds missing slip notice templates (bug fix)
Koha will complain if you try to print a slip and there is no notice
defined for them, so this is not really an improvement, but kind of a bug fix.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
27e2f67898 Bug 9024: Adding sample patron attributes to German web installer
Adds SHOW_BCODE as sample patron attribute to the German web installer.

To test:
- Run the web installer in German, make sure the new sample data shows up
and can be installed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:13:46 -05:00
Jared Camins-Esakov
8ae00e638b Merge branch 'bug_9023' into 3.12-master 2012-11-20 08:05:28 -05:00
Katrin Fischer
9e5fe6df1e Bug 9023: Update installer text files
Corrected some information about the provided sample data and corrected
text files to obey capitalization rules.

To test:
I suggest taking a look at the patch file and also taking a look at the
English web installer, checking if it works, if there are typos or wrong
information.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:05:04 -05:00
Katrin Fischer
990adad284 Bug 9023: Remove NY Z39.50 servers from installer txt files
Broken Z39.50 targets were removed with patch for bug 3782, but are still
mentioned in the text files.

This patch corrects that mistake.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:04:06 -05:00
Magnus Enger
86eda8c341 Bug 9020 - Translate new permissions for 3.10 nb-NO
To test:
- Apply the patch
- Check that installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
  can be loaded into the DB without errors (you might have to do "DELETE
  FROM permissions" first)
- Check that there are no English strings when you edit the permissions
  of a patron

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:59:16 -05:00
Katrin Fischer
3f2c47ab58 Bug 9020: [SIGNED-OFF] Translate new permissions for 3.10 de-DE
To test:
- Run the web installer in German
- Check that all permissions for a staff patron are translated

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I did not do a complete install, but I:
- Applied the patch
- Loaded installer/data/mysql/de-DE/mandatory/userpermissions.sql
  into MySQL without any trouble
- Logged in to the staff client and found no untranslated permissions
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:58:57 -05:00
Jared Camins-Esakov
90ddc20c07 Merge branch 'bug_9058' into 3.12-master 2012-11-20 07:02:00 -05:00
Magnus Enger
369163925f Bug 9058 - Norwegian default for CalendarFirstDayOfWeek
Sets a sensible default for CalendarFirstDayOfWeek in
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql

To test:
- Do a complete web install in Norwegian
  OR
- Load installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
  into MySQL from the command line
- Check that CalendarFirstDayOfWeek is set to 'Monday' and that
  calendars display Monday as the first day of the week.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:58:52 -05:00
Jared Camins-Esakov
563942ab84 Bug 9107: Increment version number
Database update for bug 9107 has been given version 3.09.00.066
2012-11-20 06:57:22 -05:00
Paul Poulain
c1c3f898cd Bug 9107: remove the syspref from the database, as well
The syspref has been introduced during 3.9, so only a few libraries
should have it, but for consistency it must be removed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:56:58 -05:00
Jared Camins-Esakov
5feeda3e17 Bug 6428 follow-up: Increment version number
Database update for bug 6428 (follow-up) has been given version 3.09.00.065
2012-11-13 09:45:19 -05:00
Nuño López Ansótegui
57239bd345 Bug 6428 [Follow-up] refered column 'items.coded_location_qualifier' does not exist
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-11-13 09:45:09 -05:00
Jared Camins-Esakov
8b3f78a5b9 Bug 6428: Increment version number
Database update for bug 6428 has been given version 3.09.00.064
2012-11-09 20:37:14 -05:00
Nuño López Ansótegui
6b14cd71f6 Bug 6428 - refered column 'items.coded_location_qualifier' does not exist
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:36:04 -05:00
Jared Camins-Esakov
06016055c6 Bug 8832: Increment version number
Database update for bug 8832 has been given version 3.09.00.063
2012-11-08 23:23:46 -05:00
Jonathan Druart
3ca887bed2 Bug 8832: Update the gist pref and hide the tax rate value if not needed
The gist system preference will be updated with the existing values and
with the supplier's gstrate values.
The "Tax rate" part becomes hidden if the syspref is not filled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:12:09 -05:00
18297b04c1 Bug 8253 - Fine doubling
Provides a fix that during database upgrade, fines are correclty
formatted. Once the misc/cronjobs/fines.pl is run in the
upgraded database, it will not result in duplicate fines being
generated.

Signed-off-by: wajasu <matted-34813@mypacks.net>
2012-10-28 19:12:27 +01:00
Paul Poulain
471f05a0c7 Bug 8724 follow-up DBRev number 2012-10-22 15:00:25 +02:00
8626a5bebb Bug 8724 - Upgrade from NoZebra installs is broken
Properly set the relevant NoZebra and QueryRemoveStopwords sysprefs to 0 to fix issues on upgrades.
Also removes the sysprefs from preferences/searching.pref

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 14:55:17 +02:00
Paul Poulain
1fd99527bd Merge remote-tracking branch 'origin/new/bug_4118' 2012-10-17 18:04:30 +02:00
Nicole C. Engard
b0b927f4f2 Bug 4118: Follow up: Add ccode to kohastructure for stats
CCode was added to the statistics table in this bug, but
was not added to kohastructure.sql. This patch adds it
with comment to the kohastructure.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 18:04:14 +02:00
Adrien Saurat
081cb47d26 Bug 8441: hides MODS export by default in French install
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 16:56:09 +02:00
Paul Poulain
d977d0f826 Bug 5409 follow-up DBRev number 2012-10-08 17:03:37 +02:00
Meenakshi.R
a427f95188 Bug 5409 - Call number is not show on Opac search result page.
Fixes Bug 5409, Modified the definition of  'OPACItemsResultsDisplay' in systempreferences and changed the code in opac-search.pl file for 'OPACItemsResultsDisplay'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:00:38 +02:00
Meenakshi.R
907fac80d3 Bug 5409 - Call number is not show on Opac search result page.
Fixes Bug 5409, Set the syspref value to 1 if it is itemdetails and 0 if it
is statuses, leaving it alone if it is already 1 or 0 and change the type
of the syspref to YesNo.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:00:32 +02:00
Nicole C. Engard
c21fd2a983 Bug 6716: Update biblioitems tables
This patch documents the cn_sort and agerestriction fields
in the biblioitems and deletedbiblioitems tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 17:55:26 +02:00
Nicole C. Engard
9ad0006c3e Bug 6716 - Fix alt contact field documentation
The borrowers table has the wrong documentation for the alternate
address3 and city fields. This fixes that.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 17:55:14 +02:00
Paul Poulain
e5183f2ed9 Bug 8585 follow-up DBRev number 2012-10-03 15:19:35 +02:00
762ce7abe6 Bug 8585 : Add System Preference to specify Holds to Pull List Start Date
Currently, Koha creates a default value of 2 days ago (-2) for the start date of the Holds to pull List. This system preference allows users to specify their own default start date for this list, since users might not want to have to manually change the date all the time when they already know the set date period they want to view.

The system preference value is specified as a positive integer, which is then passed as a negative integer in the handler script. This saves users from having to include a qualifer to the sys pref value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-03 15:18:40 +02:00
7a7e018ed3 Bug 3387 - WITHDRAWN items shouldn't check in
Adds a system preference BlockReturnOfWithdrawnItems to control
whether or not Koha should allow a withdrawn item to be returned
or not.

Also fixes the behavior where Koha will attempt to use a withdrawn
item to fill a hold.

Test Plan:
1) Set BlockReturnOfWithdrawnItems to "Block" ( this is the default )
2) Check an item out to a patron
3) Mark item as withdrawn
4) Attempt to return the item, you should still see the item on the
   borrower's record
5) Set BlockReturnOfWithdrawnItems to "Don't Block"
6) Attempt to return the item, you should see the item is no longer
   on the borrower's record.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-01 17:07:53 +02:00
Liz Rea
f7af37233a bug 8110 - add branchcode MPL to sample holidays to facilitate automated testing.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 16:43:51 +02:00
Jared Camins-Esakov
d2cd2e09aa Bug 8726: ExplodedTerms suggestion plugin (functionality)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the functionality.
2012-09-28 17:08:21 +02:00
Paul Poulain
0ccb53477a Bug 5356 follow-up DBRev number 2012-09-24 21:32:48 +02:00
Jonathan Druart
1b4b78a136 Bug 5356: delivery place and billing place centralised in basket management
- adding 2 select option in basdketheader.tmpl (delivery and billing
   place)
- adding 2 more fields in basket csv export

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with patches for bug 7302.
2012-09-24 20:46:39 +02:00
Paul Poulain
9b656b57cb Bug 8523 follow-up DBRev number 2012-09-21 15:16:30 +02:00
Jared Camins-Esakov
83370c519c Bug 8523: Display auth hierarchies w/all marcflavours
This commit adds support for displaying authority hierarchies for all
flavours of MARC, not just UNIMARC. Display now uses the jQuery
jstree plugin, selected with the help of Owen Leonard, resulting in a
much faster experience for users.

Be aware that the jstree file uses tabs rather than 4-space indentation,
which I left as-is so as to make it easier to integrate upstream
releases in the future.

To test:
1) Enable the AuthDisplayHierarchy syspref
2) Create authority records with a hierarchy of see also fields
   (in MARC21/NORMARC, you'll be using 5xx fields for this, with a
   subfield $w=g for broader terms and subfield $w=h for narrower
   terms)
3) View the authorities in the OPAC, noting the hierarchical view at
   the top of the page.

This initial patch does not create bidirection linkages from
unidirectional links in MARC21 authorities. This means that when moving
up the authority hierarchy, lower levels will disappear. This is
intentional, as the first patch is intended merely to ensure that
AuthDisplayHierarchy functions the same for all marcflavours. A future
patch will add a cron job to generate the bidirectional linkages, once
we are sure that the hierarchy functionality for UNIMARC and
MARC21/NORMARC coexists peaceably.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflicts in updatedatabase.pl, sysprefs.sql and in one of
the CSS files.

Test plan:

1) Run t/AuthoritiesMarc.t
New tests complete without any errors.

2) Make sure updatedatabase works correctly.
Update works nicely, new system preference is also added to syspref.sql

3) Make sure new terms are translatable.
Created new po files for de-DE and checked for new terms.
All translations appear correctly.

4) Make sure everything works with AuthDisplayHieararchy OFF
- Add authority
- Edit authority
- Delete authority

5) Test feature with AuthDisplayHieararchy ON
- Add authority
- Edit authority
- Delete authority

6) Add a couple of hierarchically linked authorities
Note: links have to be created in both directions

Example:
151 $aGermany
  551 $a Baden-Württemberg $w h

151 $aBaden-Württemberg
  551 $a Konstanz $w h
  551 $a Germany $w g

151 $aKonstanz
  551 $a Baden-Württemberg $w g
  551 $a Fürstenberg $w h
  551 $a Paradies $w h

151 $a Fürstenberg
  551 $a Konstanz $w g

151 $a Paradies
  551 $a Konstanz $w g

Tree shows up nicely above the authority record
- in staff
- in OPAC
  - on the normal view tab
  - on the MARC view tab

7) Checking the logs for warnings
- no Javascript errors or warnings
- no warnings or errors in log files
2012-09-21 14:52:08 +02:00
Paul Poulain
d0c6c2d068 Bug 5335 follow-up DBRev number
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-21 14:49:18 +02:00
Jonathan Druart
d7faf087a3 Bug 5335 - More granular VAT
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 18:09:53 +02:00
Paul Poulain
a287383153 Bug 2060 follow-up DBRev & updatedatabase 2012-09-19 17:25:19 +02:00
Jared Camins-Esakov
7ad5e203da Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.

To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
   is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
   the name of the file you saved in step 1):
   > misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
   with the batch number you made note of in step 3):
   > misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
   Code: AUTHTEST
   Description: Personal name main entry
   Match threshold: 999
   Record type: Authority record
   Search index: Heading-main
   Score: 1000
   Tag: 100
   Subfields: a
   Offset: 0
   Length: 0
   (note the ID of this matching rule)
8. Stage the authority file again, this time using the following
   command:
   > misc/stage_file.pl --file <filename> --authorities \
     --match <matchingrule>
7. Revert the import with the following command:
   > misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
    tools in exactly the way you would for a bibliographic record,
    but choose "Authority" instead of "Bibliographic" for the record
    type.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Testing plan delivers as it should.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:16:18 +02:00
Jared Camins-Esakov
91be607586 Bug 7475: Update configuration
In order to make matching rules more useful for MARC21 authorities,
this patch adds special indexes on previous see-from headings and
LCCN. This patch does not change UNIMARC authority configuration in
any way. Also modifies the Koha schema in preparation for adding
authority import and matching to the Staging tools.

To install:
1. Run installer/data/mysql/atomicupdate/importauthorities.pl
2. Update the following four files in your koha-dev:
    etc/zebradb/authorities/etc/bib1.att
    etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
    etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
3. Reindex your authorities:
    misc/migration_tools/rebuild_zebra.pl -a -r -v

NOTE TO RM: this patch adds an atomicupdate file that needs to be
incorporated into updatedatabase.pl if bug 7167 is not pushed.

http://bugs.koha-community.org/show_bug.cgi?id=2060

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 1 August 2012
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 11 September 2012
2012-09-19 17:15:25 +02:00
Paul Poulain
7aff89ebff Bug 7751 follow-up adding updatedatabase for sysprefs decreateLoanHighHolds*
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7751#c31 to c34
2012-09-19 12:01:11 +02:00
Paul Poulain
10818eb6f1 Bug 5339 follow-up DBRev 2012-09-19 11:13:36 +02:00
Julian Maurice
bf803c521f Bug 5339: Invoices management improvement
- New pages:
  - invoices.pl: allow to search in invoices on several criteria
  - invoice.pl: permit to view and modify invoice details
    - shipment date
    - billing date
    - shipment cost and budget used for shipment cost

Invoice informations are now stored in their own sql table and aqorders
have a link to it

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-18 22:42:15 +02:00
Colin Campbell
537c746dc4 Bug 7751: Decrease Loans for Items in Demand for Holds
Rebase and merge based on Mark Gavillet's patch to reduce
the loan period given to items on renewal when they are
in high demand for holds

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-09-18 19:01:14 +02:00