[koha-commits] main Koha release repository branch master updated. v3.14.00-868-gc3a52a9

[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  c3a52a9b200f3e87033ecd8f42938eaa6ddab410 (commit)
       via  773f28ac0d81ce9544fe8052da117e5b0c1da4c7 (commit)
       via  3c54feb1b3e15ddeca23adad1bec45e29dfeb1d5 (commit)
       via  1e808f180540a7552a9c1467ee685ac037d8c042 (commit)
       via  dc3a90c41160493e9dfbf3353d755825c7f403b8 (commit)
      from  123f07cc8ac756c4d3bdeb4f38fa36a9bb6581bf (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 c3a52a9b200f3e87033ecd8f42938eaa6ddab410
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>

commit 773f28ac0d81ce9544fe8052da117e5b0c1da4c7
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>

commit 3c54feb1b3e15ddeca23adad1bec45e29dfeb1d5
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>

commit 1e808f180540a7552a9c1467ee685ac037d8c042
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>

commit dc3a90c41160493e9dfbf3353d755825c7f403b8
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>

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

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