[koha-commits] main Koha release repository branch master updated. v16.05.00-762-gc4ab843

[Git repo owner]

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, master has been updated
       via  c4ab843429ae56df34c69b3ed76a77fe9b7d3fb2 (commit)
       via  c4fcb0d2a1855d8503a7584e8d7ff053af56aa25 (commit)
       via  666f79ed7412e495726ff65fa4b03f9286abbc97 (commit)
       via  fe563f591102ce54ddcceed443cf8b32d88adf0f (commit)
       via  e018b69dca6e702c4abd2fd58e6e99868eada9aa (commit)
      from  d57d09549eae73b425ce977ed1748f962d42c9e6 (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 c4ab843429ae56df34c69b3ed76a77fe9b7d3fb2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 18 16:33:00 2016 +0000

    Bug 16272 [QA Followup] - Indexer fails on indexing temparary testing records
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit c4fcb0d2a1855d8503a7584e8d7ff053af56aa25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 16 16:59:38 2016 +0100

    Bug 16272: Add description for tests
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 666f79ed7412e495726ff65fa4b03f9286abbc97
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 16 16:52:27 2016 +0100

    Bug 16272: (follow-up) Specific case when switching an on-site checkout to a regular checkout
    
    Same as previous patch but if another circ rule exists
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit fe563f591102ce54ddcceed443cf8b32d88adf0f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Apr 21 21:42:11 2016 +0100

    Bug 16272: Specific case when switching an on-site checkout to a regular checkout
    
    In the case on-site checkouts are considered as a regular checkout in issuing
    rules (i.e. ConsiderOnSiteCheckoutsAsNormalCheckouts is on):
    When after the on-site checkout the maximum limit of checkouts is
    reached and the patron wants to switch an on-site checkout to a regular
    checkout, the C4::Circulation::TooMany subroutine will return a
    TOO_MANY_CHECKOUTS error.
    To avoid that, we need to allow an extra checkout in this subroutine.
    
    Test plan:
    0/ Switch ConsiderOnSiteCheckoutsAsNormalCheckouts and
    SwitchOnSiteCheckouts on
    1/ In the issuing rules, set the total number of checkouts (maxissueqty)
    to 2 and the number of on-site checkouts to 2 (maxonsiteissueqty)
    2/ Check 2 items out ticking the 'on-site checkout' checkbox
    3/ Check one of these items out, to automatically switch it to a regular
    checkout
    => The checkout should be allowed.
    
    Sponsored-by: BULAC - http://www.bulac.fr/
    Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit e018b69dca6e702c4abd2fd58e6e99868eada9aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Apr 21 11:00:20 2016 +0100

    Bug 16272: Automatically switch an on-site checkout to a regular checkout when checked out
    
    Use case: A patron checks some items out on-site and want to take it home.
    To facilitate the librarian work the checkout is directly switched from
    on-site to regular when checked out if the new pref SwitchOnSiteCheckouts is on.
    
    Test plan:
    0/ Let the new pref SwitchOnSiteCheckouts off
    1/ Checkout one items to a patron and tick the "on-site checkout"
    checkbox
    2/ Check the same item out without ticking the "on-site checkout"
    checkbox
    => You should get "This item can not be renewed, it's an on-site checkout"
    3/ Switch the pref on
    4/ Repeat 2
    => The on-site checkout should be automatically switched to a regular checkout
    
    Sponsored-by: BULAC - http://www.bulac.fr/
    Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
    With small changes to apply to master.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/Circulation.pm                                  |   59 +++++---
 Koha/ElasticSearch/Indexer.pm                      |    6 +-
 circ/circulation.pl                                |    6 +-
 installer/data/mysql/atomicupdate/bug_bulac1.sql   |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t |  141 ++++++++++++++++++++
 7 files changed, 196 insertions(+), 24 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_bulac1.sql
 create mode 100644 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t


hooks/post-receive
-- 
main Koha release repository