[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-22-g8818b60

[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, 17.05.x has been updated
       via  8818b604696512da7d094101036c8704ba315d96 (commit)
       via  69f0c2ece61abb2b512ba9189369b9fbec22941d (commit)
      from  0b83a18907c8bcefeaa978d44a62736390e4bcf8 (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 8818b604696512da7d094101036c8704ba315d96
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:25:42 2017 +0000

    Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets
    
    To test:
    1 - Create an active budget
    2 - Create an inactive budget
    3 - Ensure they each have a fund with the same code
    4 - Set MarcFieldsToOrder to get the budget_code from a marc field
    5 - Stage a file using the duplicated code
    6 - Add to a basket from the staged file
    7 - Add the items
    8 - Note funds are encumbered from the inactive budget
    9 - Apply patch
    10 - Repeat 5-8 with a new basket
    11 - Note the active budget is now used
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0e2c823e8806c35673505d0e2a03081cac00190a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 69f0c2ece61abb2b512ba9189369b9fbec22941d
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:06:16 2017 +0000

    Bug 18941 - Unit tests
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 22944fb61241239124b4db218d098b8510327276)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Budgets.pm            |    5 +++--
 t/db_dependent/Budgets.t |   24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository