[koha-commits] main Koha release repository branch master updated. v3.16.00-889-ga0d1d9d

Fri Oct 31 20:39:09 CET 2014

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  a0d1d9d198ebda382a47f402927240d9660bcb69 (commit)
       via  32bd54a7cadcf90be797afa1a8e9f1bf83c6ee57 (commit)
       via  3c1536ffebc33b7074b1110504d53c2eb0d9730b (commit)
       via  5e2cc5c95899242bb215a22db2d11cbd2cac3733 (commit)
       via  2a838cabce104010a148fd401b98d52d24c0f039 (commit)
       via  e988b5ada31bbbee7200ea5be00ff275b36959f9 (commit)
      from  4dc30d48ad2ef8f5705b2a8064f2c7c5b9528284 (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 a0d1d9d198ebda382a47f402927240d9660bcb69
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Aug 18 14:48:01 2014 +0200

    Bug 11714: A fund is a top-level fund if it does not have any parent

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 32bd54a7cadcf90be797afa1a8e9f1bf83c6ee57
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Feb 7 17:59:01 2014 +0100

    Bug 11714 - GetBudgetHierarchy needs optimization

    The method C4::Budgets::GetBudgetHierarchy() retreives from database budgets in an array containing a tree of budgets (parent -> children -> children, ...).
    The code generating this tree with the SQL results needs optimization because when a lot of budgets exists, it can run during several minutes.

    This patch rewites the code using a recurive method.

    Test plan :
    - Create a active budget "MyBudget" with 1000
    - Click "Add found" on this budget
    - Create a found "Parent" with 1000, set you has owner
    - Click "Add child found" on found "Parent"
    - Create a found "Child" with 100, set you has owner
    - Click "Add child found" on found "Child"
    - Create a found "Grand-child" with 10, set you has owner
    |
    - Create a new acquisition basket
    - Add a new order with "Child budget"
    - Select "Child" found and set all costs to 2
    - Save order
    - Add a new order with "Grand-Child budget"
    - Select "Child" found and set all costs to 2
    - Save order
    - Close basket
    - Perform the receive of the two orders
    |
    - Go to founds of "MyBudget"
    => You see a table with 3 founds
    - in "Fund filters", select no library and uncheck "Show my funds only" and click on "Go"
    => You see a table with "Parent" found
    - Click on small arrow left of the fund code of "Parent"
    => You see a new line with "Child" found
    - Click on small arrow left of the fund code of "Child"
    => You see a new line with "Grand-Child" found
    |
    => You see in "Grand-Child" row "Base-level spent" = 2 and "Total sublevels spent" = 2
    => You see in "Child" row "Base-level spent" = 2 and "Total sublevels spent" = 4
    This confirms the founds are used in a hierarchie.

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 3c1536ffebc33b7074b1110504d53c2eb0d9730b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Oct 28 08:49:47 2014 -0400

    Bug 12958 [Alt. label follow-up] Set a fund owner to a fund hierarchy

    This alternate follow-up modifies the text of the label to
    (hopefully) make it more clear. The markup has been revised someone to
    make it more standard, and a warning has been added about overwriting
    existing data.

    Signed-off-by: Frederic Demians <f.demians at tamil.fr>

    Looks good.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Works as described, passes tests and QA script.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 5e2cc5c95899242bb215a22db2d11cbd2cac3733
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Sep 18 12:13:08 2014 +0200

    Bug 12958: Set a fund owner to a fund hierarchy

    This patch adds the ability to set an owner to a fund hierarchy
    On editing a fund, if it has children, a new checkbox appears "Set this
    owner to all children funds".
    If checked, all the fund hierarchy will herit to this owner.
    This will facilitate the fund owner modifications.

    Test plan:
    - Verify that the new checkbox only appears if the fund has at least a child.
    - Create a consistent fund hierarchy, something like:
        fund1
          fund11
            fund111
          fund12
        fund2
          fund21
    - Try to modify a fund owner without checking the checkbox. Verify the
      children have not been modified.
    - Try to modify a fund owner with checking the checkbox. Verify all fund
      hierarchy has been modified.

    Signed-off-by: Frederic Demians <f.demians at tamil.fr>

    It works as announced.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 2a838cabce104010a148fd401b98d52d24c0f039
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Sep 18 12:40:21 2014 +0200

    Bug 12956: Users are not linked to a fund

    When creating a fund, if you add some users, they are not linked to the
    fund.
    Note that it works if you link them when editing the fund.

    Test plan:
    - Try to link users to a fund on creating it.
    - On editing, you should see the linked user list.

    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit e988b5ada31bbbee7200ea5be00ff275b36959f9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Sep 18 12:25:26 2014 +0200

    Bug 12955: The "show my funds only" should be take into account

    The "Show my funds only" is not take into account if the checkbox is not
    checked.
    So there is no way to show all funds.
    This has been introduced by bug 11578.

    The default is not "only mine". The default is "show all funds".

    Test plan:
    - Create fund where you are the owner and others where you are not.
    - Go on the fund list view and verify the checkbox "show my funds only"
      is take into account.

    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes tests and QA script.

    Note: In order to test this make sure you have funds owned by
    another staff user.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Budgets.pm                                      |  125 ++++++++++----------
 acqui/acqui-home.pl                                |    2 -
 admin/aqbudgets.pl                                 |   18 ++-
 .../prog/en/modules/admin/aqbudgets.tt             |   16 ++-
 t/db_dependent/Budgets.t                           |   65 +++++++++-
 5 files changed, 151 insertions(+), 75 deletions(-)

hooks/post-receive
-- 
main Koha release repository