[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.07-56-g84786c4

[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.11.x has been updated
       via  84786c4a198649fad6ef61466c72c1db9ccbe6d8 (commit)
       via  ab24f9664e470c5f40bbd3568f098bec8b9664e0 (commit)
      from  cca55714c8ad49c6e4ef8037ae4466ba322c3e35 (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 84786c4a198649fad6ef61466c72c1db9ccbe6d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Feb 15 17:05:29 2018 +0000

    Bug 20216: Correctly populate values in itemtype editor
    
    Caused by a bad merge conflict on bug 12768.
    
    To test:
    1 - Edit an item type, define a replacement cost,processing fee, and
    remote image url
    2 - Save the item type
    3 - Values are correct in list
    4 - Edit again
    5 - note values in fields are not populated
    6 - Save itemtype, values are lost
    7 - Apply patch
    8 - Repeat 1-4
    9 - Values should be correctly populated and saved now
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 20216: (follow-up) - Fix other use of remote_image
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e4301a52b83ca24876ff58fd78bee863df5ce398)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ab24f9664e470c5f40bbd3568f098bec8b9664e0
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Wed Jan 17 14:30:06 2018 -0500

    Bug 20008: Fix restrictions added from memberentry.pl if TimeFormat is 12hr
    
    Test Plan:
    1) Set TimeFormat to 12 hour
    2) Add a restriction with an expiration date via memberentry.pl
    3) Note the restriction exists, but has no expiration date
    4) Apply this patch
    5) Repeat step 2
    6) Note the restriction exists and has an expiration date!
    
    Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e2214f2b256e0a44e0936d3eb8e87ac02b40917e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt |   12 ++++++------
 members/memberentry.pl                                     |    3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository