[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-37-ga93fca9

[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, 18.05.x has been updated
       via  a93fca9b201d37b5887444cf23b169ea2516f923 (commit)
       via  11abf890e9b0d4843b5594060987028817104589 (commit)
       via  ea3972c08090619c462354cb1c37bdd2947bd0ad (commit)
      from  5315b2de1e35f49c470b225467af464252dcbaae (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 a93fca9b201d37b5887444cf23b169ea2516f923
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jan 28 11:32:55 2019 +0000

    Bug 21877: (RM follow-up) Move space into conditional
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 582a84a6c7328efe78bbacaad293e4e21e6785ca)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 11abf890e9b0d4843b5594060987028817104589
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jan 22 09:45:02 2019 +0100

    Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout
    
    Using only TT plugin for authorised value description is a better code.
    
    Test plan :
    Part 1:
    1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN
    1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach'
    1.3) Define in NOT_LOAN an authorized values 2 with description empty
    Part 2:
    2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow'
    2.2) Edit an item with notforloan=1
    2.3) Checkout this item => You see 'Item not for loan (at the beach)'
    2.4) Edit an item with notforloan=2
    2.5) Checkout this item => You see 'Item not for loan'
    Part 3:
    3.1) Set preference 'AllowNotForLoanOverride' to 'Allow'
    3.2) Edit an item with notforloan=1
    3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)'
    3.4) Edit an item with notforloan=2
    3.5) Checkout this item => You see 'Item is normally not for loan'
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 30895e2c561215fa7c094c9838021a0095a578ba)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit ea3972c08090619c462354cb1c37bdd2947bd0ad
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jan 22 09:47:22 2019 +0100

    Bug 21877: Show authorized value description for withdrawn in checkout
    
    During checkout the withdrawn information is displayed in a message :
    "Item has been withdrawn".
    
    Like in other pages and like notforloan, we should display the withdrawn authorized value description.
    
    This patch adds this display.
    Add <span> so that translation does not change.
    Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS.
    
    Test plan :
    1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN
    2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash'
    3) Define in WITHDRAWN an authorized values 2 with description empty
    4) Edit an item with withdrawn=1
    5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)'
    6) Edit an item with withdrawn=2
    7) Checkout this item => You see 'Item has been withdrawn'
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit c22928630ac2c00501b2bb17d60a3b2ba99481c5)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 circ/circulation.pl                                      |    4 +---
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt    |   14 +++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository