[koha-commits] main Koha release repository branch master updated. v17.05.00-357-gc140b91

Thu Aug 10 21:33:19 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, master has been updated
       via  c140b9129124262db27c9ba17f47134ec3232ada (commit)
       via  3304c7c4ca49db1b95aa564b3550bacf260b9b4f (commit)
       via  0e2c823e8806c35673505d0e2a03081cac00190a (commit)
       via  22944fb61241239124b4db218d098b8510327276 (commit)
       via  28a979487f3d8c4a5887c484ae71c7c63e7ee03d (commit)
       via  b2a8e726fe32d4aae3f279f4142af240c60d7fe5 (commit)
       via  8651016ce8e959b5b6ca19ccddbb3f5342b5d456 (commit)
       via  b80704aa1b763c7a29c3b95c162dfb12ded8faa2 (commit)
       via  d2cceb95b47983b28242819c95e57439958b0da5 (commit)
       via  8a328a20bf3a74268346104281688b2a81be80e6 (commit)
       via  be0bf8731a2361f4fabbfff8059fef60dd364d88 (commit)
       via  ad1182411220d74cd13ea5cd1525b71cf7fef981 (commit)
       via  1b63d3e041602318b16a51a4b1798fbdc25f34bb (commit)
       via  3b87ec988dd786ca1286a7baa9f14fabdcb1c6c2 (commit)
       via  b4ce1feb1bc6b4f20cf71bd545e018917cf518db (commit)
       via  c6f8cf69d3943599fa6a0c250ae0e8221ead44ff (commit)
       via  e3dafbfccd06af8fca45fada449e93e3d0616cd6 (commit)
       via  d01ce104a7711814152e4f8228064f79c8a7f68c (commit)
      from  e35903574ce666bca32eb4676f311b99bb268ec2 (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 c140b9129124262db27c9ba17f47134ec3232ada
Author: Marc Véron <veron at veron.ch>
Date:   Wed Aug 2 18:01:06 2017 +0200

    Bug 19027 - Circulation rules: Better wording for standard rules for all libraries

    In Home > Administration > Circulation and fine rules, the standard value for
    "Select a library: All libraries" is confusing and leads to support cases.

    Change wording to "Standard rules for all libraries".

    To test:
    - Apply patch
    - Go to Home > Administration > Circulation and fine rules
    - Verfiy that text in drop down 'Select a library' makes sense.

    Followed test plan which works as intended. I agree with the wording it
    is significantly clearer than previously
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>

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

commit 3304c7c4ca49db1b95aa564b3550bacf260b9b4f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 1 17:07:33 2017 +0000

    Bug 18985 - SQL reports 'Last edit' and 'Last run' columns sort alphabetically, not chronologically

    This patch alters the DataTables configuration of the SQL reports list
    so that date columns are identified via class rather than position.

    To test, apply the patch and go to Reports -> Use saved.

    Test the re-ordering of the creation date, last edit, and last run
    columns. Each should sort correctly based on the date.

    Signed-off-by: Marc Véron <veron at veron.ch>

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

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

commit 0e2c823e8806c35673505d0e2a03081cac00190a
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:25:42 2017 +0000

    Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets

    To test:
    1 - Create an active budget
    2 - Create an inactive budget
    3 - Ensure they each have a fund with the same code
    4 - Set MarcFieldsToOrder to get the budget_code from a marc field
    5 - Stage a file using the duplicated code
    6 - Add to a basket from the staged file
    7 - Add the items
    8 - Note funds are encumbered from the inactive budget
    9 - Apply patch
    10 - Repeat 5-8 with a new basket
    11 - Note the active budget is now used

    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>

commit 22944fb61241239124b4db218d098b8510327276
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:06:16 2017 +0000

    Bug 18941 - Unit tests

    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>

commit 28a979487f3d8c4a5887c484ae71c7c63e7ee03d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:52:35 2017 -0300

    Bug 13012: Add more tests

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

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

commit b2a8e726fe32d4aae3f279f4142af240c60d7fe5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jul 19 14:57:26 2017 -0400

    Bug 13012 - suggestion.suggesteddate should be set to NOW if not defined

    Test Plan:
    1) Apply this patch
    2) prove t/db_dependent/Koha/Suggestions.t

    Signed-off-by: Marc Véron <veron at veron.ch>

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

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

commit 8651016ce8e959b5b6ca19ccddbb3f5342b5d456
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:24:08 2017 +0200

    Bug 19071: Fix Members/IssueSlip.t

    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Members/IssueSlip.t line 44.

    We do not need to delete all branches here.

    Note: The test still needs attention for noisy userenv warns, but it should
    pass now.

    Test plan:
    Run t/db_dependent/Members/IssueSlip.t

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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>

commit b80704aa1b763c7a29c3b95c162dfb12ded8faa2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:13:44 2017 +0200

    Bug 19071: Fix Circulation/issue.t

    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/issue.t line 65.

    Cause:
    See also bug 19070.
    We do not need to delete all branches here.

    Test plan:
    Run t/db_dependent/Circulation/issue.t

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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>

commit d2cceb95b47983b28242819c95e57439958b0da5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:04:16 2017 +0200

    Bug 19070: Fix Circulation/Branch.t

    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/Branch.t line 49.

    Resolve:
    not ok 14 - AddReturn respects branch item return policy - noreturn
       Failed test 'AddReturn respects branch item return policy - noreturn'
       at t/db_dependent/Circulation/Branch.t line 279.
              got: 'yqiKrIkX'
         expected: undef

    Cause:
    There is a record in clubs. The constraint in clubs on branchcode does not
    include a cascaded delete. The test deletes all branches.
    Test 14 depends on item-level_itypes==1. When you set it to Biblio, it fails.

    Test plan:
    Run t/db_dependent/Circulation/Branch.t

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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>

commit 8a328a20bf3a74268346104281688b2a81be80e6
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Aug 10 13:00:19 2017 +0200

    Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

    * tools/modborrowers.pl: Dereference 'branchcode' rather than
      'value'.

    Test Plan:
    - Carry out "Batch patron modification" with any number of patrons.
      + Change the library.
      + Hit Save.
    - The library will not have been updated.
    - Apply patch.
    - Run same modification.
    - The library will have been updated

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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>

commit be0bf8731a2361f4fabbfff8059fef60dd364d88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:20:43 2017 -0300

    Bug 19074: Do not crash if cardnumber does not exist

    If a cardnumber does not exist, $borrower will be undef and the ->category call will explode
    Can't call method "category" on an undefined value at
    /home/vagrant/kohaclone/tools/modborrowers.pl line 370.

    This patch makes sure the patron exists before calling any methods.

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

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

commit ad1182411220d74cd13ea5cd1525b71cf7fef981
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Aug 10 13:33:36 2017 +0200

    Bug 19074: Fix category display in Batch patron modification.

    * tools/modborrowers.pl (GetBorrowerInfos): Fix setting of patron
      category description.
    * koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt: Use
      it.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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>

commit 1b63d3e041602318b16a51a4b1798fbdc25f34bb
Author: Marc Véron <veron at veron.ch>
Date:   Tue Aug 8 10:05:44 2017 +0200

    Bug 18555: (QA-Followup) Remove duplicate code

    Remove duplicate code as of comment #7

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

commit 3b87ec988dd786ca1286a7baa9f14fabdcb1c6c2
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 8 16:18:41 2017 +0200

    Bug 18555: Create patron list from patron import

    Create a patron list from imported patrons to be used for printing patron
    cards and other patron list related actions.

    To test:
    - Apply patch
    - Go to Home > Tools > Import patrons
    - Select a file to import and check new checkbox 'Create patron list'
    - Import file
    - Verify that in import results you see the time stamped name of the
      patronlist containig the imported patrons (if any patrons were imported)
    - Go to Home > Tools > Patron lists
    - Verify that the list shows up and contains the imported patrons

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

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

commit b4ce1feb1bc6b4f20cf71bd545e018917cf518db
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:06:39 2017 -0300

    Bug 19047: Fix AddBiblio call in ShelfBrowser.t

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

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

commit c6f8cf69d3943599fa6a0c250ae0e8221ead44ff
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 7 08:44:43 2017 +0200

    Bug 19047: Fix AddBiblio call in Reserves.t

    AddBiblio does not return a title; the biblioitemnumber is stored in the
    title variable.
    The variables for biblioitemnumber are not used and can be removed.

    Test plan:
    Run t/db_dependent/Reserves.t

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

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

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

commit e3dafbfccd06af8fca45fada449e93e3d0616cd6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:02:23 2017 -0300

    Bug 19042: Add mock IndependentBranches=0 for the other test

    These tests do not cover correctly getletter, but it is not the goal of
    this patch. Superlibrarian behaviour must be tested as well.

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

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

commit d01ce104a7711814152e4f8228064f79c8a7f68c
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Aug 4 14:24:38 2017 -0400

    Bug 19042: Silence warnings t/db_dependent/Letters.t

    TEST PLAN
    ---------
    prove t/db_dependent/Letters.t
    -- there will be a message: "C4::Context->userenv not defined!"
    apply this patch
    prove t/db_dependent/Letters.t
    -- there will no longer be that message.
    run qa test tools

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

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

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

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

Summary of changes:
 C4/Budgets.pm                                      |    5 ++--
 Koha/Suggestion.pm                                 |   18 +++++++++++++++
 .../prog/en/modules/admin/smart-rules.tt           |    2 +-
 .../en/modules/reports/guided_reports_start.tt     |   12 ++++------
 .../prog/en/modules/tools/import_borrowers.tt      |    9 ++++++++
 .../prog/en/modules/tools/modborrowers.tt          |    2 +-
 t/db_dependent/Budgets.t                           |   24 +++++++++++++++++---
 t/db_dependent/Circulation/Branch.t                |    3 +++
 t/db_dependent/Circulation/issue.t                 |    1 -
 t/db_dependent/Koha/Suggestions.t                  |   23 ++++++++++++++++++-
 t/db_dependent/Letters.t                           |    5 +++-
 t/db_dependent/Members/IssueSlip.t                 |    1 -
 t/db_dependent/Reserves.t                          |    5 ++--
 t/db_dependent/ShelfBrowser.t                      |    2 +-
 tools/import_borrowers.pl                          |   17 ++++++++++++++
 tools/modborrowers.pl                              |   11 +++++----
 16 files changed, 113 insertions(+), 27 deletions(-)

hooks/post-receive
-- 
main Koha release repository