[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.09-6-g60d5763

[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.22.x has been updated
       via  60d5763fa8aca34880bef4ee1d19ae3a110f0c01 (commit)
       via  5a436b64c3d20f5c44ec2ea70d34f749cf64a238 (commit)
       via  865ee1803860e1d626700f2220d7e06f19a6510b (commit)
       via  fcdbe914ccd2e60bbe6877b9e0373a55f6c06e45 (commit)
       via  19f88c75b967be80049d22b0a376f9c668ee7965 (commit)
       via  79b35081a6ca7e1aade1729621f2795dfe33add9 (commit)
      from  4c41ad91b5866de81fbc87cf196059cf47d4ea33 (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 60d5763fa8aca34880bef4ee1d19ae3a110f0c01
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jun 17 16:29:33 2016 +0000

    Bug 16534: (followup) - Tidy AddIssue
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f1fa65f6375b73b8e2aff3139885971f08bb27a3)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 16d14e1467be8e738752bab80e731b51f4b2d846)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 5a436b64c3d20f5c44ec2ea70d34f749cf64a238
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 23 07:48:10 2016 +0200

    Bug 16534: (followup) Correct tiny typo
    
    This patch corrects "...must be return..." to "must be returned..."
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit fe02c9fdf0550caf0b9a7e0f4b1138260c94abc9)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit b067e2803bd46672309b2586dd3da25ab4906454)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 865ee1803860e1d626700f2220d7e06f19a6510b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun May 22 10:01:56 2016 +0100

    Bug 16534: Block AddIssue from issuing if the return is not possible
    
    To make sure the return can be done, AddIssue must not trust callers (they
    should have done their job, but we are not sure) and check that the issue can
    be returned before issuing to the patron.
    
    There is no test plan here, this should not be possible from the Koha
    interface.
    However, looking at the code, it may be possible using SIP.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1a9674fd3a8d8c898d8dc208d6e3d0296daeca40)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 2cc01d139a9e24b320a12af485143670ed006e23)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit fcdbe914ccd2e60bbe6877b9e0373a55f6c06e45
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun May 22 10:03:11 2016 +0100

    Bug 16534: Add tests for AddIssue
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a879efb574028be78f0706f36bd5e1e11d54dfc2)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit e974de2c6942e83d2fd1ff52b7283c77f329798e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 19f88c75b967be80049d22b0a376f9c668ee7965
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun May 22 10:01:48 2016 +0100

    Bug 16534: Make CanBookBeIssued test if the issue can be returned
    
    If an issue is already checked out, CanBookBeIssued must check if the
    issue can be checked in before processing the return.
    In such cases (depending of the AllowReturnToBranch pref), the issue
    should not be allowed.
    
    Prior to this patch, the checkin was not done and the checkout failed
    with "Duplicate entry '1204321' for key 'itemnumber'". Indeed since bug
    14978, there is an uniq key on issues.itemnumber. Before bug 14978 the
    issue existed but was hidden (and some weird behaviors certainly
    happened!).
    
    To avoid Koha to crash, a check is added to CanBookBeIssued (call to
    CanBookBeReturned) and the librarian is not able to process the
    checkout.
    
    Test plan:
    
    - Set AllowReturnToBranch to anywhere
    - Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
    - Check the item out from Library 2
    => Confirm the checkout (should work with and without this patch)
    
    - Set AllowReturnToBranch to holdinbranch ("only the library the item
      was checked out from").
    - Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
    - Check the item out from Library 2
    => Without this patch, Koha crashed
    => With this patch, you will be warned that the checkin is not possible.
    
    Try other combinations of the AllowReturnToBranch syspref
    
    Followed test plan, works as expected
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9427d44568e6d52fde3960bda3ad957ca6a5b7fe)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit df9fbe0aefc7135ecf3e78c29a12cf780da28eae)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 79b35081a6ca7e1aade1729621f2795dfe33add9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun May 22 10:02:44 2016 +0100

    Bug 16534: Add tests for CanBookBeIssued & AllowReturnToBranch
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2c88538946e05feb65aa5b0f9007882a0ce6ac73)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 141ada91cc7de6e32e51ae5dfa203d4c89099c4e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                                  |  291 +++++++++++---------
 .../prog/en/modules/circ/circulation.tt            |    4 +
 t/db_dependent/Circulation.t                       |  171 +++++++++++-
 3 files changed, 330 insertions(+), 136 deletions(-)


hooks/post-receive
-- 
main Koha release repository