[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.12-2-g628f777

[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, 17.05.x has been updated
       via  628f77746e8d471ec288574c1437dc5e56b0b657 (commit)
       via  ccb318bbf76bc10737706c9db99a18eed32ca7d4 (commit)
      from  203da9a2777ea98d5aaacdef7a7ef02d93e92014 (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 628f77746e8d471ec288574c1437dc5e56b0b657
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Jun 3 10:09:23 2018 +0200

    Bug 20861: Correct EDI permissions on EDI messsages
    
    The permission for EDI is edi_manage, but 2 pages asked
    for manage_edi, allowing users not to access those.
    
    To test:
    - Add edi_manage to your permissions
    - Try to access the EDIFACT messages from the
      acq start page
    - Verify it doesn't work
    - Apply patch and try again
    - You should be able to access the page now
    - Try to access the other page directly (if you don't
      have EDI data):
      /cgi-bin/koha/acqui/edimsg.pl
    - Verify you can access the page and don't get a
      permission error
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 7883b19de5f24551b36bf29133b04bc71ad4d56a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit cbeed6cf3db342e025b4d837ab135136d39a140e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ccb318bbf76bc10737706c9db99a18eed32ca7d4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 28 11:40:20 2018 -0300

    Bug 20827: Display Fund's owner name when selected
    
    When a fund is created or edited and does not have a owner yet, the
    name of the patron will not be displayed when selected.
    
    The HTML element the JS code expects is not present in the DOM.
    
    Test plan:
    - Create a fund, set a owner
    - remove the owner, edit, etc.
    - Save
    - Edit again
    Make sure it works as expected.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit dc396756a050bf3fe07bb3141df6535a27fd9afb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b344b81e24b63e4451c49909436a98cfcc71a622)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 acqui/edifactmsgs.pl                                       |    2 +-
 acqui/edimsg.pl                                            |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository