[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.07-6-g339f815

[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.22.x has been updated
       via  339f8156a7656e0dfd09a4775fc640d24b601585 (commit)
       via  c265f1ea30bd5fe3fcd310d14b9fe54e3ae55881 (commit)
      from  5aed72e3a53df3f305776b3ee7b4edee01fec003 (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 339f8156a7656e0dfd09a4775fc640d24b601585
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 16 12:10:56 2016 +0100

    Bug 16454: Remove another occurrence in comment
    
    Note that few other occurrences exist in DB.
    
    This patch also replaces a tab with 4 spaces.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 68280172e1446eaba07cf7ab5ac0135eff742b35)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit c265f1ea30bd5fe3fcd310d14b9fe54e3ae55881
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Thu May 12 04:46:54 2016 +0000

    Bug 16454: Use 'inventory' instead of 'inventory/stocktaking'
    
    To test:
    1) Go to the tools home page. Confirm it says 'Inventory' instead of
       'Inventory/stocktaking' in heading and in description
    2) Click Inventory. Confirm heading now says 'Inventory' instead of
       'Inventory/stocktaking'
    3) Confirm that it now says 'Inventory' instead of
       'Inventory/stocktaking' in the tools menu along the left of the page
    4) Click Help in top right corner. Confirm help heading now says
       'Inventory' instead of 'Inventory/stocktaking'
    5) Go to user account page, go to Set Permissions
    6) Expand Tools option and confirm it says 'inventory' instead of
       'inventory (stocktaking)'
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5d3ea96e578fa4b0a143cc26330c7d4ff689ef4b)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                                                  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc            |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/member-flags.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt    |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt         |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt        |    4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository