[koha-commits] main Koha release repository branch master updated. v3.22.00-1509-g30dc04c

[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  30dc04c74a2ef00c22667f722746c2c6be1da6b1 (commit)
       via  d31145ffccaeed7158163953b86f5640e646d2b0 (commit)
      from  8ef63544d71eac3d4f8c8c488e67de405a980115 (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 30dc04c74a2ef00c22667f722746c2c6be1da6b1
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Feb 11 16:02:42 2016 +0100

    Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty.
    
    Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit d31145ffccaeed7158163953b86f5640e646d2b0
Author: Natasha <tasham_8 at hotmail.com>
Date:   Wed Jan 20 23:35:48 2016 +0000

    Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection
    
    To Test -
    1. Make a new rotating collection (under tools) with at least one book in it.
    2. Check out the book/s from rotating collection.
    3. Set library to a different library.
    4. Check in book you just checked out.
    5. Should show a dialog box with no print slip link or city.
    6. Apply patch and repeat steps 1-4. Dialog box should now show the item name, city name and print slip link.
    
    Patch works as expected. (Superfluous white space removed on line 136)
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 circ/returns.pl                                         |    9 ++++++---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository