[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-134-gc86ed52

Mon Nov 26 12:37:01 CET 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  c86ed52356ce210f3ecc658090e1ee39fa35b268 (commit)
       via  45eb022786eb4742dd3c982bd39ef35337b84ab7 (commit)
       via  64405cf90671d0126200732a64f29fad2cccffb4 (commit)
       via  9e46509487e673ea26c786fba7a334a48855fd07 (commit)
       via  121ba294c42f3db537741393a9051f8bf3b79e2b (commit)
       via  5c04130720d0497f78aad2c1850f858637355e0b (commit)
       via  a9aec1853871765f1a5d3ca82a0ff24c4bf0263e (commit)
      from  64a2cdcb83c94e6614ec2c88942fa3359de1a59c (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 c86ed52356ce210f3ecc658090e1ee39fa35b268
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Nov 15 12:37:22 2018 +0000

    Bug 7143: Update about page for new dev Thatcher Leoonard

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

commit 45eb022786eb4742dd3c982bd39ef35337b84ab7
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Nov 12 15:03:34 2018 -0300

    Bug 21749: (QA follow-up) Add more tests for ImportFramework

    This patch adds tests for:
    - Output of ImportFramework on fields removal and error conditions (file
      not found)
    - Different file format behaviour (csv, xml and ods are tested).

    To test:
    - Run
      $ kshell
     k$ prove t/db_dependent/ImportExportFramework.t
    => SUCCESS: All green :-D
    - Sign off :-D

    Note: the biblio_framework* files are based on the original one on the
    patchset, and exported in 17.11 with different formats.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

commit 64405cf90671d0126200732a64f29fad2cccffb4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Nov 12 13:14:19 2018 -0300

    Bug 21749: Fix import of CSV biblio framework

    Bug 9701 added 2 new columns to the table marc_tag_structure which broke
    the import of biblio frameworks if the CSV file was generated with a
    previous version.

    Test plan:
    - Export a biblio framework from 17.11
    - Import it into 18.05+

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    https://bugs.koha-community.org/show_bug.cgi?id=21740

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

commit 9e46509487e673ea26c786fba7a334a48855fd07
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Nov 12 13:11:42 2018 -0300

    Bug 21749: Add tests for ImportFramework

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

commit 121ba294c42f3db537741393a9051f8bf3b79e2b
Author: Thatcher Leonard <thatcher.f.leonard at gmail.com>
Date:   Tue Nov 6 14:39:28 2018 +0000

    Bug 18584: Our legacy code contains trailing-spaces

    This patch removes trailing spaces from acquisitions-search.inc

    Mentored-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

commit 5c04130720d0497f78aad2c1850f858637355e0b
Author: Dimitris Antonakis <diman at debian.diman>
Date:   Sat Nov 10 13:24:27 2018 +0200

    Bug 17597: Outdated translation credits

    Updated translation credits for the Greek language.

    Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
    Works as expected, hyperlink to openhub tested OK.
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

commit a9aec1853871765f1a5d3ca82a0ff24c4bf0263e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 29 17:26:14 2018 -0300

    Bug 21282: Sync ordered and spent values with acqui home

    The order list for each fund calculates using the ecost tax excl., but
    it should be tax incl.
    At the moment this means that the sum on the start page table and the
    order list don't match up.

    Test plan:
    - Create and receive orders
    - Values on acqui home and ordered/spent should be the same

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

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

Summary of changes:
 C4/ImportExportFramework.pm                        |   55 +++++------
 acqui/ordered.pl                                   |    4 +-
 acqui/spent.pl                                     |    8 +-
 docs/history.txt                                   |    1 +
 .../prog/en/includes/acquisitions-search.inc       |    6 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    5 +-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    3 +-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    3 +-
 t/db_dependent/ImportExportFramework.t             |  100 ++++++++++++++++++++
 .../data/frameworks/biblio_framework.csv           |   23 +++++
 .../data/frameworks/biblio_framework.ods           |  Bin 0 -> 5227 bytes
 .../data/frameworks/biblio_framework.xml           |   28 ++++++
 .../data/frameworks/biblio_framework_smaller.csv   |   18 ++++
 .../data/frameworks/biblio_framework_smaller.ods   |  Bin 0 -> 5027 bytes
 .../data/frameworks/biblio_framework_smaller.xml   |   28 ++++++
 15 files changed, 237 insertions(+), 45 deletions(-)
 create mode 100644 t/db_dependent/ImportExportFramework.t
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework.csv
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework.ods
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework.xml
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.csv
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.ods
 create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.xml

hooks/post-receive
-- 
main Koha release repository