[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.00-28-g183e10c

[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  183e10c13f6366b29dd79a7a9549f7d105d73f73 (commit)
       via  9c4040f37d705f2705fafc7a338695ddd76c1999 (commit)
       via  a088aad171fda8deefca517517d35bee851f7ffc (commit)
       via  a2b9db00cf468b1712263879f6afeddb3553bf61 (commit)
      from  7883b19de5f24551b36bf29133b04bc71ad4d56a (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 183e10c13f6366b29dd79a7a9549f7d105d73f73
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed May 30 13:07:39 2018 +0000

    Bug 17561: (follow-up) Pass itemnumber on returns and correct itemnumber param in circulation
    
    To test:
    1 - Place two holds on a bib for a single patron
    2 - Check in both items, confirm the screen message and slip are correct
    3 - Checkout both items to another patron, confirm the screen message
    and slip are correct
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 9c4040f37d705f2705fafc7a338695ddd76c1999
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Fri May 18 08:00:03 2018 -0400

    Bug 17561: (QA follow-up) Update existing unit tests
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a088aad171fda8deefca517517d35bee851f7ffc
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Fri May 18 07:20:06 2018 -0400

    Bug 17561: (QA follow-up) Simplify new ReserveSlip code
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a2b9db00cf468b1712263879f6afeddb3553bf61
Author: Benjamin Rokseth <benjamin.rokseth at deichman.no>
Date:   Thu Mar 15 12:57:37 2018 +0100

    Bug 17561: ReserveSlip needs itemnumber for item level holds on same biblio
    
    This patch fixes a regression after bug 14695.
    This patch adds itemnumber and barcode as optional params in ReserveSlip used
    by hold-transfer-slip.pl to generate HOLD_SLIP. This is for ReserveSlip to be
    able to generate correct slips when items in multi-item holds are checked in.
    
    Test plan:
    
    1) activate a circulation rule with multi-item holds
    2) Place two holds on same biblio for patron
    3) for debugging, either use browser console to observe POST request and responses
       or use info from reserves, e.g. reserve_id in the HOLD_SLIP
    4) checkin two items from same biblio on pickup branch
    5) note that both holds are effectuated, but reserve_id is the same on both slips
    6) also note that there is no itemnumber or barcode in the requests from returns.pl
    7) Apply this patch
    8) repeat 2-4
    9) note that reserve_id is now different on the two slips
    
    and/or:
    Run tests:
      t/db_dependent/Reserves/ReserveSlip.t
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Maksim Sen <maksim.sen at inlibro.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/Reserves.pm                                     |   45 +++++-
 circ/hold-transfer-slip.pl                         |   12 +-
 circ/returns.pl                                    |    1 +
 .../prog/en/modules/circ/circulation.tt            |    4 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    2 +-
 t/db_dependent/Letters/TemplateToolkit.t           |    8 +-
 t/db_dependent/Reserves.t                          |    2 +-
 t/db_dependent/Reserves/ReserveSlip.t              |  165 ++++++++++++++++++++
 8 files changed, 223 insertions(+), 16 deletions(-)
 create mode 100644 t/db_dependent/Reserves/ReserveSlip.t


hooks/post-receive
-- 
main Koha release repository