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

[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  ad718868553f149d0e9ea9ec7b7718677bac6c5e (commit)
       via  fba32956691ec0b3295e75aa8554d1454cb29819 (commit)
       via  2fdd3ef94a424d956fd6032662e6a69ddb81e511 (commit)
      from  3352a6ee9e7526e228f66ea420fd99709a601f82 (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 ad718868553f149d0e9ea9ec7b7718677bac6c5e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 28 08:51:24 2017 +0200

    Bug 19004: [QA Follow-up] No need to check item-level_itypes again
    
    As Jonathan pointed out, GetItem already called effective_itemtype.
    So we can just use $item->{itype} here.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0e744d49b557e3401ae7b700b1410b022a4e851c)

commit fba32956691ec0b3295e75aa8554d1454cb29819
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 9 16:30:03 2017 +0200

    Bug 19004: Adjust AddReturn for retrieving item type
    
    In the regular situation, you can get itemtype via biblio and then
    biblioitem as well as via biblioitem (at least when item-level_itypes
    is set to biblio).
    
    But since Koha unfortunately defined two relations in item, one for
    biblioitemnumber (the good one) and one for biblionumber (redundant),
    TestBuilder (correctly) builds one biblioitem and two biblios.
    
    If you item-level_itypes to biblio record, this will result in failing tests
    when calling AddReturn (in this case Koha/Patrons.t).
    It will crash on:
        Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826.
    Cause: AddReturn goes via the biblionumber to biblio and than to
    biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder
    but a database design problem.)
    
    This patch makes a small change in AddReturn to retrieve the itemtype via
    biblioitem. It actually is a shorter road than items->biblio->biblioitems.
    
    Note: I do not test the Biblioitems->find call, since we already checked
    the GetItem call before and we have a foreign key constraint.
    I did not call $item->effective_itemtype since we still use GetItem; this
    could be done later.
    
    Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and
    we called AddBiblio before, we should link biblioitemnumber as well.
    
    Test plan:
    [1] Do not apply this patch yet.
    [2] Set item-level_itypes to biblio record.
    [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.)
    [4] Apply this patch.
    [5] Run t/db_dependent/Koha/Patrons.t again.
    [6] Run t/db_dependent/Circulation/Returns.t
    [7] Git grep on AddReturn and run a few other tests calling it.
        Note: Bugs 19070/19071 address three tests that call AddReturn too.
    [8] In the interface, check in a book.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Note: Bugs 19070 and 19071 are already pushed. The command in comment #4
          has all the tests successful.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0fc3f19605d3979333dc333237205b9bef6ab60b)

commit 2fdd3ef94a424d956fd6032662e6a69ddb81e511
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sun Jul 30 16:53:00 2017 +0200

    Bug 19004: Patrons.t should create its own data for enrollment fees.
    
    If the patron categories J, K, YA would not exist, Patrons.t would fail.
    
    Test plan:
    [1] Remove one of these patron categories.
    [2] Run t/db_dependent/Koha/Patrons.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 57427f7a10c887964fa4d4397c6ec238af2bc694)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                    |    6 ++----
 t/db_dependent/Circulation/Returns.t |    4 +++-
 t/db_dependent/Koha/Patrons.t        |   16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository