[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.10-9-g1925965

[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, 3.14.x has been updated
       via  192596530321c68a2b4d9bbdafa06b4fc9f3b95e (commit)
       via  8a6ba33e6c2dfdfc0768346d928832e44ecf6953 (commit)
       via  373af346a7edb0b30080bcb7e904bebccfbab252 (commit)
       via  4c024dc67b0e0f02e792a2101c1c7ae8672b7fa8 (commit)
       via  5ddd866f2e73c80109185eae104039892c854f5e (commit)
      from  4adc01c36d9ac8439f7e32df7a48551b9174f6be (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 192596530321c68a2b4d9bbdafa06b4fc9f3b95e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Apr 21 04:15:11 2014 +0000

    Bug 7308: (follow-up) tweak style of child fund amounts
    
    This patch changes the styling of the amounts of child funds
    in the funds table to use a more visible indication (i.e.,
    italics rather than a font color of grey) and to use a
    a new CSS class, "child_fund_amount", rather than a hard-coded
    style.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit c3a52a9b200f3e87033ecd8f42938eaa6ddab410)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8a6ba33e6c2dfdfc0768346d928832e44ecf6953
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Oct 28 12:15:27 2013 +0100

    Bug 7308: (follow-up) change color style for fund child
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 773f28ac0d81ce9544fe8052da117e5b0c1da4c7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 373af346a7edb0b30080bcb7e904bebccfbab252
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jul 21 10:07:26 2013 +0200

    Bug 7308: (follow-up) removing line breaks for better translatability
    
    Because of the lines breaks in the table headings the strings
    were separated in translation. Example:
    
    Base-level allocated
     - Base-level
     - allocated
    
    If you look at a smaller screen the table headings will still break
    without the additional <br />.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3c54feb1b3e15ddeca23adad1bec45e29dfeb1d5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4c024dc67b0e0f02e792a2101c1c7ae8672b7fa8
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Oct 11 14:14:20 2012 +0200

    Bug 7308: rework aqbudgets.pl table
    
    admin/aqbudgets.pl should have the following columns:
    
    Base-level allocated (or just Allocated)
    Base-level ordered
    Total sub-levels ordered
    Base-level spent
    Total sub-levels spent
    Base-level available
    Total sub-levels available
    
    Base-level is always calculated for one level, without children.
    Total sub-levels should include child funds.
    Available is calculated as "allocated - (ordered + spent)".
    
    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Seems to work alright for me.
    Passes QA script and tests, after I fixed 2 tabs in admin/aqbudgets.pl.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1e808f180540a7552a9c1467ee685ac037d8c042)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5ddd866f2e73c80109185eae104039892c854f5e
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Apr 13 10:40:35 2012 +0200

    Bug 7308: Show ordered amount in aqbudgets.pl
    
    Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit dc3a90c41160493e9dfbf3353d755825c7f403b8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Budgets.pm                                      |   12 +--
 admin/aqbudgets.pl                                 |   47 +++++-----
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 +
 .../prog/en/modules/admin/aqbudgets.tt             |   96 ++++++++++++++++----
 4 files changed, 109 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
main Koha release repository