[koha-commits] main Koha release repository branch master updated. v16.11.00-838-gf04c5d5

[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  f04c5d5a2c549bed54036b726965ccda083def7b (commit)
       via  1c7d283aae0952877b871f486c31cd3f04529222 (commit)
      from  36fd40468950950c605b82fd918a5e932e2c6734 (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 f04c5d5a2c549bed54036b726965ccda083def7b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Mar 31 00:24:09 2017 -0300

    Bug 18321: Correctly calculate switch_onsite_checkout
    
    Silly error here, the $switch_onsite_checkout is not correctly
    calculated, it should not only be set to the value of the syspref, but
    meet all the conditions.
    
    Test plan:
    Set a circ rule with number of on-site checkout = 2 and number of
    checkouts = 2.
    Switch on both ConsiderOnSiteCheckoutsAsNormalCheckouts and SwitchOnSiteCheckouts
    
    Do a regular checkout
    Do another regular checkout
    At this point you have reach the maximum number of checkouts allowed.
    Not try another one.
    => Without this patch you will not get the warning
    => With this patch you will see it
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 1c7d283aae0952877b871f486c31cd3f04529222
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Mar 31 00:23:19 2017 -0300

    Bug 18321: Add tests
    
    Clean a bit existing tests by adding default values and add a test to
    highlight the issue.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    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                                  |    4 ++--
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t |   25 +++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository