[koha-commits] main Koha release repository branch master updated. v3.22.00-134-ge863f66

[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  e863f6645e9cfef851066e3bd96145969202ab8d (commit)
       via  0bfd512759b54bef56f279cf195c9186691933e5 (commit)
       via  4587d898dc29c3677eafc250a752a190353d8609 (commit)
       via  9d2e268739f8fc0bd373cc6312dfdd14a713434c (commit)
      from  37b0e2ce9cbc4ba5070d22c96b357ddea1db084b (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 e863f6645e9cfef851066e3bd96145969202ab8d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Dec 28 10:26:10 2015 +0000

     Bug 15049: Simplify code in aqplan.tt
    
    There was no need to duplicate this code in the template.
    The only change with before this patch is that the "Currency = CUR"
    and "Each cell contain both actual and estimated values." are now
    displayed on 2 lines instead of 1.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 0bfd512759b54bef56f279cf195c9186691933e5
Author: Marc Véron <veron at veron.ch>
Date:   Fri Dec 18 16:01:12 2015 +0100

     Bug 15049: (followup) Add warning about "No active currency"
    
    Fix translatibiity issues and use include in admin/aqplan.tt as well.
    See comment #24
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 4587d898dc29c3677eafc250a752a190353d8609
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Oct 29 09:13:26 2015 -0300

     Bug 15049: (Signed off) Hide currency but preserv alert
    
    This follow up hides currency, but the alert pops
    if no currency is active.
    
    To test:
    1) Apply the patch
    2) Unset any active currency
    3) Alert must show on Acquisitons home
    4) Set a currency active, no currency display on Acqui home
    5) Check that currency IS displayed on /cgi-bin/koha/admin/aqbudgets.pl
    or /cgi-bin/koha/admin/aqbudgetperiods.pl
    
    Amended for better translation
    
    Currency does / does not display as described in test plan.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: JM Broust <jean-manuel.broust at univ-lyon2.fr>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 9d2e268739f8fc0bd373cc6312dfdd14a713434c
Author: Marc Véron <veron at veron.ch>
Date:   Thu Oct 22 11:44:23 2015 +0200

     Bug 15049: Add warning about "No active currency" to Acquisitions start page
    
    If no active currency is defined, Acquisitions does not work properly and software
    can occur while receiving.
    This patch adds the warning message about missing active currency to Home > Acquisitions
    
    To test:
    - Apply patch
    - Go to Home > Administration > Currencies & Exchange Rates > Currencies
    - Make sure that no active currency is set
    - Go to Home > Acquisitions
    - Verify that a warning displays:
      - If user has at least permission for parameters_remaining_perissions,
        the warning should display a link to Currencies and exchange rates (currency.pl)
      - If the user has no permission to edit the Currencies and exchange rates,
        no link is displayed.
    - Set an active currency
    - Veryfy that the warning no longer displays
    
    (Amended to remove superfluous line / mv)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Work as described. No errors
    
    Signed-off-by: JM Broust <jean-manuel.broust at univ-lyon2.fr>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

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

Summary of changes:
 acqui/acqui-home.pl                                |    7 +++++++
 .../prog/en/includes/budgets-active-currency.inc   |   15 ++++++++++++++-
 .../prog/en/modules/acqui/acqui-home.tt            |    3 ++-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |   20 +++++++-------------
 4 files changed, 30 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository