[koha-commits] main Koha release repository branch master updated. v3.16.00-beta-68-g1387c65

[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  1387c65c0d344ad49206f6e181990e704a542d26 (commit)
       via  dd36f80e2ccfe64c59648543997778b295959a4d (commit)
       via  75f00c3e304738f2eb77acbb60242e3c0fe4d6c2 (commit)
      from  2c5f927689c24323128e88cfa26ffe9adcfbd832 (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 1387c65c0d344ad49206f6e181990e704a542d26
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 19 22:04:45 2014 +0000

    Bug 12168: (follow-up) correct typos in test descriptions
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit dd36f80e2ccfe64c59648543997778b295959a4d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu May 1 14:23:51 2014 +0200

    Bug 12168: Add unit tests for GetBudgetHierarchySpent & GetBudgetHierarchyOrdered
    
    Test plan:
    prove t/db_dependent/Budgets.t
    
    Note: This addition may sound overkill but I found this bug developing
    bug 12164 and I will reuse all of that.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 75f00c3e304738f2eb77acbb60242e3c0fe4d6c2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu May 1 14:12:18 2014 +0200

    Bug 12168: fix spent and ordered budget values are wrong when depth >= 2
    
    A really weird (and old) code process the calculation for the spent and
    ordered sublevel funds.
    
    It only takes into account the direct children.
    
    So if you have:
    fund1 (spent=100) parent of fund11 (spent=10) parent of fund111 (spent=1),
    you get:
    
    fund     | base-level | total spent
    fund1    | 100        | 110
    fund11   | 10         | 11
    fund111  | 1          | 1
    
    which is wrong, it should be
    
    fund     | base-level | total spent
    fund1    | 100        | 111
    fund11   | 10         | 11
    fund111  | 1          | 1
    
    Test plan:
    - Create 1 budget and 3 funds with the same structure as above.
    - Create some orders and receive them (not all).
    - Go on the fund list view and verify the values are correct.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Budgets.pm            |   89 ++++++++++-----------
 admin/aqbudgets.pl       |    3 -
 t/db_dependent/Budgets.t |  194 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 234 insertions(+), 52 deletions(-)


hooks/post-receive
-- 
main Koha release repository