[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-81-g61cfb6e

Sat Oct 14 14:55:52 CEST 2017

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, 16.11.x has been updated
       via  61cfb6e24172804e48edc01e9dde2081cffcbaec (commit)
       via  b49ec7a57dcec8f01fda13a8453c958964ef7810 (commit)
       via  0363a97768a5ff3c54a5824f018cb827a2192869 (commit)
       via  a05377d49ef3637be9f9b01ff6686fc317cd9bf5 (commit)
       via  d4360a18fcc298664933ecbdb067f6e6bc4bc288 (commit)
       via  6290543d62eebcb4a40e8c65d5fecb180faf89c3 (commit)
       via  a1e8e8542aaf14489b5eae7e08ba685fd5c81b55 (commit)
       via  e9a507aa3ceea8ff4306fdf72616223f187154c5 (commit)
       via  34ab316b1c7c8cd6d4272d1094350366095d7810 (commit)
       via  ac8ba913ba42dc932929b5714684a8ec971b30d5 (commit)
       via  a5ea0b2d8d7dfe4f2c644e5407617af0f9b08a3c (commit)
       via  5199bb74dcdef65b78a8e740a93ddd3c3ea9766a (commit)
       via  dda4bca35d479df1d4039a7b892fe9af4328bc79 (commit)
       via  9fef1265b770dd7df2688b19b5d853470c0fa948 (commit)
      from  319369ccc2b4c7e356cf2d24b9571b6365e4ccb8 (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 61cfb6e24172804e48edc01e9dde2081cffcbaec
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Wed Aug 23 07:57:30 2017 +0000

    Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices

    Signed-off-by: Your Name <david.bourgault at inlibro.com>

commit b49ec7a57dcec8f01fda13a8453c958964ef7810
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Oct 9 16:20:49 2017 -0300

    Bug 18996: (followup) Fix tests count [16.11.x]

    This patch fixes a wrong tests count introduced on merging.

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

commit 0363a97768a5ff3c54a5824f018cb827a2192869
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Mar 30 04:15:54 2017 +0000

    Bug 18351: Able to delete budget with funds

    To test:
    1) Create a budget, add a fund
    2) Delete budget. Notice this is successful and triggers no warning
    message etc.
    3) Go to Funds. Notice the funds appear as if they are not there
    4) Go into mysql and view the aqbudgetperiods table - notice the funds
    are still there and are now inaccessible.
    5) Apply patch
    6) Create a budget, add a fund
    7) Attempt to delete budget. Notice you can't click Delete button.
    Confirm number of funds in hover message is correct.
    8) Delete fund
    9) Confirm you can now delete budget.

    Sponsored-by: Catalyst IT

    Signed-off-by: Felix Hemme <felix.hemme at thulb.uni-jena.de>

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Some code fixes

    See Comment 5. Ready to test.

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Code fix

    See comment 10.
    Ready for testing.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL

    This patch adds a check in the script for existing funds so that the
    budget cannot be deleted when forcing the URL and has other small fixes.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete

    Followed test plan and patch works as described.

    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0ed469525fe16e36663c1f5266568beb5e27672d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 2a9dc2e595d916e4fb94948871f665df06b7088b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a05377d49ef3637be9f9b01ff6686fc317cd9bf5
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 21:16:05 2017 +0000

    Bug 19257: Prevent warn when reopening a basket

    To test:
    1) Go to Acquisitions, find a vendor and a basket (create if you don't
    have either)
    2) Close the basket
    3) View the basket and reopen it
    4) Notice the warn
    5) Apply the patch and repeat steps 1-3
    6) Notice the warn no longer shows and the basket is reopened as
    expected

    Sponsored-by: Catalyst IT

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6ed1513e5fe91772c1720963006bf8f04452416d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit d4360a18fcc298664933ecbdb067f6e6bc4bc288
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Aug 31 21:18:24 2017 +0000

    Bug 19228: Trigger confirm delete when removing item from course

    To test:
    1) Enable UseCourseReserves syspref
    2) Go to Course Reserves
    3) Add a new course if you don't already have one
    4) Add an item to the course
    5) Click 'remove' to delete the item from the course
    6) Notice the item deletes straight away with no confirmation prompt
    7) Apply the patch
    8) Repeat steps 4 and 5
    9) Confirm the confirmation box pops up and works as expected

    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 870f562e58c8327565b52d3b10f5a8ed2a000706)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6290543d62eebcb4a40e8c65d5fecb180faf89c3
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Aug 31 21:25:28 2017 +0000

    Bug 19229: Return to course when cancelling out of edit form

    To test:
    1) Ensure UseCourseReserves is enabled
    2) Go to Course Reserves, create a course
    3) Edit course
    4) Click Cancel
    5) Notice you are returned to the courses home page rather than returned
    to the course
    6) Apply patch
    7) Go to edit course and click cancel again
    8) Confirm you are returned to the course and that this feels like the
    natural expectation.

    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit f55af2fc078a7d6a05238232bc276e6924307179)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit ae405f61c8d4c04361267b500347a496a2ce7d58)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a1e8e8542aaf14489b5eae7e08ba685fd5c81b55
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 13:14:56 2017 -0300

    Bug 17834: Make translation easier

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0c6538f033f43cde33d186561a93a197467bd9a1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 11b73c1fa06c870a62640ffa8fd8f8610df5df18)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit e9a507aa3ceea8ff4306fdf72616223f187154c5
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Apr 20 03:12:14 2017 +0000

    Bug 17834: Change library news text for single-branch libraries

    To test:
    1) Log into OPAC, go to home page
    2) Confirm that the text shows as 'RSS feed for (branchname) library
    news' if single-branch library
    3) Confirm text shows as normal for libraries with more than one branch

    Sponsored-by: Catalyst IT

    Signed-off-by: maricris <mlabancia at gmail.com>

    Signed-off-by: anafe <anafeazuela at yahoo.com>

    Signed-off-by: iflora <iflora at unimas.my>

    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 1417f83e8b8a57e70e9120244a36204cf4acb3c2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit e25bb0548d4ee69b9d79567a626fe91487386b71)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 34ab316b1c7c8cd6d4272d1094350366095d7810
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 28 14:00:28 2017 -0300

    Bug 19081: Do not list plugins that have been uninstalled

    Under plack, can_load should not check if a package is in cache, but
    reload it. Otherwise plugins that have been uninstalled will still get
    listed.
    The error raised by can_load must only be displayed if the plugin has
    been removed.

    Test plan:
    1/ Upload a plugin
    2/ Note the plugin is listed as installed
    3/ Modify the package of the plugin to add a compilation error (use
    'Foo' for instance)
    4/ Reload the page
    5/ The plugin is not listed and a warning appear in the logs
    6/ Remove the compilation error and uninstall the plugin
    7/ The plugin is no longer listed and no warning appear in the logs

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Bug 19081: Remove useless $plugin_file variable

    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 d928038a523b7ef44257ddfe97c405173c9b3b2e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 53c84ea289e73fa2f56711dd8dd8e7ebac591ae7)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit ac8ba913ba42dc932929b5714684a8ec971b30d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Oct 3 16:01:15 2017 +0200

    Bug 19343: [16.11.X] Remove private lists with edit permission from search results

    If the list is not shared, it should not be listed. We only need to remove
    the allow_add line.

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

commit a5ea0b2d8d7dfe4f2c644e5407617af0f9b08a3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 3 11:45:45 2017 -0300

    Bug 19343: [16.11.X] Add tests

commit 5199bb74dcdef65b78a8e740a93ddd3c3ea9766a
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 22 08:58:11 2017 +0000

    Bug 19116: Hold not set to waiting after transfer

    Test plan:

    0) Do not apply the patch
    1) Place hold on item from another branch
    2) Switch to that branch
    3) Check them in at the other branch to set them into transport status (T)
    4) Switch back to your homebranch
    5) Check items in again, use the different confirm buttons and
        compare: Only "confirm and print" will be set to waiting, "confirm"
        remains in transport.
    6) Apply the patch
    7) Repeat 1-5 - now should work as expected - the hold is marked waiting
    on "confirm" button too
    8) Check the hold from the same branch, to make sure this doesn't add
    regression

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 80fd5cd0dbfe8c5612325ca65251d36a97fcfc1c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 2a0dc0f1d28ad03dd48326caff120dfe3b3daacd)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit dda4bca35d479df1d4039a7b892fe9af4328bc79
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Fri Sep 22 08:40:56 2017 +0000

    Bug 19116: (followup) Add tests to highlight the problem in CheckReserves

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a0c73b7bdafd21e19e0c1ba6a7ea222216d70500)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b3cd8c2def10285e2efb85bf88a47f315d80a8a5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9fef1265b770dd7df2688b19b5d853470c0fa948
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 4 14:14:31 2017 -0300

    Bug 19116: Unit tests

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 021d1d3714602be64609b9db82fd92e8bb1b42c0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit bc3bfeab37abf9e83b26ae4635595aa5fc5b93ea)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/Reserves.pm                                     |    6 ++-
 Koha/Plugins.pm                                    |    6 ++-
 Koha/Virtualshelves.pm                             |    1 -
 acqui/addorderiso2709.pl                           |    1 +
 acqui/basket.pl                                    |    2 +-
 admin/aqbudgetperiods.pl                           |   30 ++++++++---
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   40 ++++++++++-----
 .../en/modules/course_reserves/course-details.tt   |   10 ++--
 .../prog/en/modules/course_reserves/course.tt      |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |   14 ++++-
 t/db_dependent/Circulation.t                       |   54 +++++++++++++++++++-
 t/db_dependent/SIP/Message.t                       |    2 +-
 t/db_dependent/Virtualshelves.t                    |    1 +
 13 files changed, 134 insertions(+), 35 deletions(-)

hooks/post-receive
-- 
main Koha release repository