[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.05-1-40-g5ca21e3

Git repo owner gitmaster at git.koha-community.org
Fri Dec 20 18:40:34 CET 2019


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, 19.05.x has been updated
       via  5ca21e35c66917b4a25d2cacef2518f0dcd6acb0 (commit)
       via  6b25590ea133c0450ff4b28300f61dec05dad003 (commit)
      from  837604d935f355904b46a878469390ab4a858c03 (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 5ca21e35c66917b4a25d2cacef2518f0dcd6acb0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Nov 29 14:45:25 2019 +0100

    Bug 24138: Fix calculation of suspension days when a limit is set
    
    If there is a limit for the number of suspension days
    (maxsuspensiondays), the calculation is wrong. We are reducing the
    number of days before taking into account the suspension charging
    interval.
    
    For instance, a checkin is 1 year late and the circ rules are defined to
    charge 7 days every 15 days.
    It results in 365 * 7 / 15 days of suspension => 170 days
    
    Before this patch the calculation was:
    365 * 7 limited to 333, 333 / 15 => 22 days
    
    Test plan:
    Given the examples in the commit messages and the description of the bug
    report, setup complex circulation rules and confirm that the debarment
    dates are calculated correctly
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 17eabbf4bf4b48f0ff938f3ac05bcbe40f5970d2)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 6b25590ea133c0450ff4b28300f61dec05dad003
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Nov 29 13:55:27 2019 +0100

    Bug 24138: Move the calculation out of the sub
    
    No changes expected here. For the next patch we are going to need to add
    test and calculate the new debarment date. To ease the writing of these
    tests the calculation is moved out of the existing subroutine.
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 1bf0904d2817c250ec7ef70667c7631e4f24d12f)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 C4/Circulation.pm                                  |  142 +++++++++++---------
 .../Circulation/IssuingRules/maxsuspensiondays.t   |   57 +++++++-
 2 files changed, 133 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list