[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.06-122-gaaec664

Tue May 27 15:49:33 CEST 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.14.x has been updated
       via  aaec6643165f218edd9bdf05992149bcf9ed21c5 (commit)
       via  5dcb902c4fc274080bbf0be05edf5626278499c2 (commit)
       via  0ef76204e972f45a40ee3bd7920f65f493d16a09 (commit)
       via  bf50bc430ddfcf7a1f79eb0ee2758d4a7f81392a (commit)
       via  59588d25124cf38f8059d31988ea43dd542ea4d5 (commit)
       via  64a8149be752890e416242e9ae94dde36d39f4a5 (commit)
       via  cbed4cc9c51df398e05d0173992d7057c054022a (commit)
      from  171dcf64957452278719526c68b5de7cbea8fb19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aaec6643165f218edd9bdf05992149bcf9ed21c5
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Mar 10 17:48:54 2014 +0000

    Bug 8918: (follow-up) tidy code and description of CalculatePriority()

    This patch improves the formatting and the description of the new
    CalculatePriority() routine.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e51b44178141ddd32134758d20d388c648fb0dfd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5dcb902c4fc274080bbf0be05edf5626278499c2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Feb 7 12:05:24 2014 +0100

    Bug 8918: (follow-up) support creating brief UNIAMRC bibs in Reserves.t

    Changed title and author field for UNIMARC.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested for MARC21, NORMARC and UNIMARC by adding temporary set_preference..

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5f8bef581d5170a4a5c7a965379264d78935041f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 0ef76204e972f45a40ee3bd7920f65f493d16a09
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Feb 6 15:42:08 2014 +0100

    Bug 8918: (follow-up) allow t/db_dependent/Reserves.t to pass if marcflavour is UNIMARC

    Set marcflavour to MARC21 to make tests pass.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Works for MARC21. But I would prefer a better fix for UNIMARC.
    Will send a follow-up for that.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit adc09764bc90c34300444c5ea43bfd040f0d571d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit bf50bc430ddfcf7a1f79eb0ee2758d4a7f81392a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jan 30 14:16:03 2014 +0100

    Bug 8918: (follow-up)  more unit tests for CalculatePriority

    Adding a few unit tests, including the following situations:
    Placing a hold when there is a wait.
    Placing a hold when there is a future hold.
    Calculating priority with future date.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9b9fd8597945d221d9d89d6ae6517c0c65179232)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 59588d25124cf38f8059d31988ea43dd542ea4d5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Tue Nov 5 16:25:56 2013 +0100

    Bug 8918: Add a unit test for CalculatePriority

    Rebased on January 29, 2014 (marcelr)
    Added text on the two 'is'-statements.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 52924e7b0ecddcceec8d22299e8fa4c5f04a991a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 64a8149be752890e416242e9ae94dde36d39f4a5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Apr 12 11:27:42 2013 +0200

    Bug 8918: (follow-up) improve descriptions of two related sysprefs

    Updating pref descriptions for ReservesNeedReturns and ILS-DI:AuthorizedIPs.
    Just sideway related to this report, but not important enough to separate.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5372082724002476bc7565f7c66a7e6aaa06c24b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit cbed4cc9c51df398e05d0173992d7057c054022a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Oct 15 14:06:04 2012 +0200

    Bug 8918: Fix reserve priority in ILS-DI

    The priority of new hold requests was not calculated when using ILS-DI.

    A new routine is added, C4::Reserves::CalculatePriority(), to calculate
    the priority prior to placing a request.

    A separate bug report, 11640, covers the changes in reserves to
    use this new routine more generally.

    This patch does therefore only affect ILS-DI.

    Note: ILS-DI already allows you to generate multiple holds on a biblio or
    item for the same patron. This patch does not change that behavior.

    Test plan:
    [1] Place multiple holds using ILS-DI HoldTitle service:
        /cgi-bin/koha/ilsdi.pl?service=HoldTitle&patron_id=BORROWERNUMBER&bib_id=BIBLIONUMBER&request_location=test
        Check the priority.
    [2] Do the same using HoldItem service:
        /cgi-bin/koha/ilsdi.pl?service=HoldItem&patron_id=BORROWERNUMBER&bib_id=BIBLIONUMBER&item_id=ITEMNUMBER
        Check the priority again.
    [3] Use a biblio with multiple items. Place item level holds on both.
        Check in one of these items in another branch. Confirm transfer.
        Check in the other item in the original branch. Confirm hold.
        Now you have a waiting and a transit hold.
        Test HoldTitle and HoldItem service again a few times.
    [4] Enable AllowHoldDateInFuture and add a future hold.
        Now test HoldTitle and HoldItem again and check if these holds are
        inserted before the future hold (lower priority).

    January 29, 2014: Rebased this patch and amended it to make a distinction
    between fixing the ILS-DI bug and using the new routine.
    Updated commit message and test plan (marcelr).

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3e344d7e0718e5a8ac810ca5235f68c1e6d3f370)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/ILSDI/Services.pm                               |   26 ++++-----
 C4/Reserves.pm                                     |   45 +++++++++++++++
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 .../en/modules/admin/preferences/web_services.pref |    3 +-
 t/db_dependent/Reserves.t                          |   60 ++++++++++++++++++--
 5 files changed, 114 insertions(+), 22 deletions(-)

hooks/post-receive
-- 
main Koha release repository