[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-123-g47223f0

[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.05.x has been updated
       via  47223f0cad47913c15f4c9dacfbc0ed4682a8e2d (commit)
       via  1b8e2f600a51047191fca14bdaa19bca612887c9 (commit)
      from  9722e31033a0a86091d4abdd99fd9b1e9fddf118 (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 47223f0cad47913c15f4c9dacfbc0ed4682a8e2d
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 21:23:20 2017 -0400

    Bug 19120: Leave cancelled ordered items alone when reopening basket
    
    TEST PLAN
    ---------
    1) Apply first patch
    2) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- FAILS
    3) Apply this patch
    4) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- SUCCESS!
    5) run koha qa test tools
    
    Followed test plan, patch worked as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 632e2ad51d2510a412224ded5e51a9f991d566b4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1b8e2f600a51047191fca14bdaa19bca612887c9
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 21:21:40 2017 -0400

    Bug 19120: Add tests to reproduce the problem
    
    TEST PLAN
    ---------
    1) apply this patch
    2) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- FAILS!
       -- This proves the test works.
    3) run koha qa test tools
    
    Followed test plan, patch worked as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d34fae94995977b730e4bbfc11bdecaa3ce310a8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                                |    2 +-
 t/db_dependent/Acquisition/close_reopen_basket.t |   12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository