[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.03-35-g145eef6

Mon Sep 17 16:59:04 CEST 2018

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  145eef6a9037b93cd8902f0a77582fcadbf517bc (commit)
       via  c82595a4fa5c93ba5220ab0c95bc296f70fa5a78 (commit)
       via  ad16c9f5b20525303eb631107883cb37e36de8cd (commit)
       via  c28d8f0600806f9930d115b2fdbccc21f5e86436 (commit)
      from  9659b2f447ef21a71b3d3698fba126be526a8849 (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 145eef6a9037b93cd8902f0a77582fcadbf517bc
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 3 15:13:57 2018 +0000

    Bug 13692: series link is taking you to just 800a instead of whole 800

    This patch modifies the OPAC and staff client's XSL template for the
    detail page so that series links based on a traced 490 tag use both
    author and series title from the 800 tag.

    To test you should have multiple titles in the same series with matching
    490 and 800 tags in each record. Apply the patch and restart Plack if
    necessary.

    View the detail page for one of the series' titles. The "Series:" link
    should link to a search which uses both series title and author.
    Clicking the link should return the correct results.

    Test both the OPAC and staff client.

    Signed-off-by: John Sterbenz <jsterben at umich.edu>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit cf5a92461835725fe44bb726c98bcfbf909dfdc8)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit c82595a4fa5c93ba5220ab0c95bc296f70fa5a78
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Sat Sep 15 16:10:22 2018 -0400

    Bug 21356: Add Missing space in parcel.tt

    This patch adds a space between the user's name and 'On:'
    in parcel.tt.

    To test:

    1) Go to Acquisitions
    2) Search for a vendor
    3) Create a new basket
    4) Add an order to the basket
    5) Close the basket
    6) Receive the order
    7) In the page title 'Receipt summary' notice there is no space
    between the 'Received by' user name and 'On:'
    8) Apply the patch
    9) Refresh the page, there should now be a space

    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d56c19138c36b79ba7d46c0a65c92469bf6fd12c)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit ad16c9f5b20525303eb631107883cb37e36de8cd
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Aug 23 14:44:31 2018 +0000

    Bug 21262: Do not format numbers for editing if too big

    This patch copies the code from bug 15770 to the format_for_editing
    sub.

    It also corrects schema issue, listing the purpose for two acq columns
    instead of claing unused

    To test:
    1 - Edit a fund
    2 - Set warning at amount to: 100000000000000
    3 - Save budget
    4 - Try to edit - internal server error
    5 - Apply patch
    6 - Should be able to edit budget
    7 - Number should appear unformatted

    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    2 quick notes:
    1. Code must be moved to a subroutine if reused later
    2. It would have prefered to have the comment of the 2 DB columns on a separate patch
    (even separate bug report). As it's minor and that the patch will certainly backported
    I will not block it.

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7a84297ac4b29f4bdaf1bc4d01def71eb924d4fa)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit c28d8f0600806f9930d115b2fdbccc21f5e86436
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun Sep 16 09:49:46 2018 -0700

    Bug 21360: Prevent IssueSlip.t to fail when run at 23:59

    Not sure what happened on bug 15029 (Make the IssueSlip tests pass even if
    launched after 23:00) but we should have tested with 23:59, not 23:50...

    koha_1       |     # Looks like you planned 3 tests but ran 2.
    koha_1       |
    koha_1       | #   Failed test 'Issue slip'
    koha_1       | #   at t/db_dependent/Members/IssueSlip.t line 294.
    koha_1       | Label not found for "last SKIP" at /usr/share/perl5/Test/More.pm line 1370.
    koha_1       | # Looks like your test exited with 255 just after 1.
    koha_1       | [23:59:10] t/db_dependent/Members/IssueSlip.t
    koha_1       | Dubious, test returned 255 (wstat 65280, 0xff00)
    koha_1       | Failed 3/3 subtests

    Test plan:
    0/ Don't apply this patch
    1/ sudo date -s "2018-09-15 23:59:00";prove t/db_dependent/Members/IssueSlip.t
    => You should get the error
    2/ Apply this patch and repeat 1.
    => Tests should pass now!

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 60788555b3d79902ccef9f20cf76d4c764efcba0)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 Koha/Number/Price.pm                               |    5 +++++
 installer/data/mysql/kohastructure.sql             |    4 ++--
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    2 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |    2 +-
 t/db_dependent/Members/IssueSlip.t                 |   21 ++++++++++++++------
 6 files changed, 25 insertions(+), 11 deletions(-)

hooks/post-receive
-- 
main Koha release repository