[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-18-ga1e96eb

[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.18.x has been updated
       via  a1e96eb64579db710b9365d045926da9ef57f54e (commit)
       via  9c8cbd3dc10860012a5bc55fd7dad4d3fc1041cd (commit)
      from  23a326b1f67b0f3a51ce45c6241469022d856924 (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 a1e96eb64579db710b9365d045926da9ef57f54e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 22 09:55:55 2015 +0200

    Bug 13482: Sent biblionumber to the template
    
    The biblionumber is sent to the template as 'itembiblionumber' at 1 place, the template get the 'biblionumber' variable.
    I don't understand why but the easy way is to sent the variable twice.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a510a4515c9a62ad6005f2eb997496d403dd4247)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9c8cbd3dc10860012a5bc55fd7dad4d3fc1041cd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 16 14:10:30 2015 +0200

    Bug 13482: Prevent race condition on printing a ReserveSlip
    
    The problem has been well described by Kyle and Nicole on bug 7255
    description and comment 1.
    
    With this counter patch, I suggest to popup AFTER the return has been
    confirmed. This will remove the race condition and avoid to pass
    itemnumber to the pl file as in the patch submitted by Olli.
    
    Only the borrowernumber and biblionumber are needed (transfer and op are
    never used by circ/hold-transfer-slip.pl).
    
    Test plan:
    It is very hard to know all cases (at least 6) where the popup is
    displayed. Try at least to get the hold and the transfer confirmation
    messages.
    You should get the popup if you click on "print slip" button.
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2796eb21586ea7f23c2ca5d969d242b78b1cfa09)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 circ/hold-transfer-slip.pl                         |    1 -
 circ/returns.pl                                    |   10 ++++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   27 +++++++++++++++-----
 3 files changed, 31 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository