[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-61-g5a0152f

Tue Jul 10 08:55:43 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  5a0152f3c9ae0ed1db9ded710493ccfc374736cd (commit)
       via  1b29258df1de93b9eaa0c8d66767e8d78db87def (commit)
       via  0b62e10a0523e29fd7edae3daea0a814c3dcd6de (commit)
       via  f097b4000077df1a3f2b02ddba89770211c2b68e (commit)
       via  734ce420bba38f6e0c93300d42d31f6495ff6c69 (commit)
       via  f91b9ec6457791623dd65b44f10cf682e00136ab (commit)
       via  ad004d366b5a1210dfa0cd80ea9bc6dc280e400c (commit)
       via  a80f02df557d55f455c32d1d614352aa1961bfff (commit)
       via  83f9532b01b77eeb8219635e3b54a79ef719ce6f (commit)
      from  c058a4a4858d5c03841b88ba65d232a03046304d (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 5a0152f3c9ae0ed1db9ded710493ccfc374736cd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Jul 2 12:05:55 2018 -0300

    Bug 20946: (QA follow-up) make outstanding_debits return the account lines only

    This patch was discussed with Jonathan on a QA conversation. It is
    better to keep this simpler and more reusable. And is the right approach
    in this case.

    This patch makes Koha::Account::outstanding_debits return the account
    lines, and a method is added to Koha::Account::Lines so the outstanding
    amount is calculated on the resultset. This is done the dame way it was
    done before, and the tests got adjusted.

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 1b29258df1de93b9eaa0c8d66767e8d78db87def
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Jun 27 03:53:27 2018 +0000

    Bug 20946: (RM follow-up) Additional tests and fix addition to undef

    Added a few tests with credit lines and found we got warnings, adjusted
    the routine to avoid this

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 0b62e10a0523e29fd7edae3daea0a814c3dcd6de
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 26 13:20:26 2018 +0000

    Bug 20946: Additional unit tests for 0 lines edge case

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f097b4000077df1a3f2b02ddba89770211c2b68e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 26 13:08:36 2018 +0000

    Bug 20946: Reduce number of db calls

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 734ce420bba38f6e0c93300d42d31f6495ff6c69
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Sat Jun 16 09:44:19 2018 -0300

    Bug 20946: Use K::Account->outstanding_debits in pay.pl and paycollect.pl

    This patch changes the how account lines are fetched (using
    Koha::Account->outstanding_debits) so credits are not picked.

    To test:
    - Add a $5 credit to a patron
    - Add a $1 fine
    - Go to the 'Pay fines' tab
    => FAIL: Credit is displayed
    - Try to pay all fines
    => FAIL: You are told to enter a value less than or equal to -4.00
             (Observe you cannot do that)
    - Apply this patch
    - Reload
    => SUCCESS: Credit is not displayed
    => SUCCESS: You are able to pay all fines
    - Sign off :-D

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

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f91b9ec6457791623dd65b44f10cf682e00136ab
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Sat Jun 23 05:41:00 2018 -0300

    Bug 20946: Add Koha::Account::outstanding_debits

    This patch adds a handy method that returns the total for outstanding
    debits (i.e. those that haven't been canceled with credits), and the
    corresponding Koha::Account::Line objects.

    Unit tests are added.

    To test:
    - Apply this patch
    - Run:
      $ kshell
     k$ prove t/db_dependent/Koha/Account.t
    => SUCCESS: tests pass!
    - Sign off :-D

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

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit ad004d366b5a1210dfa0cd80ea9bc6dc280e400c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jul 4 14:55:14 2018 -0300

    Bug 21029: Make "Suspend until:" translatable

    The label was part of the holds.js file. As .js files are never
    translatable it needs to be moved to template level.

    Test plan:
    - Place a hold on an item
    - Go to the patron account
    - Click on the Suspend button on the holds tab
    - View the modal, the label before the date field "Suspend until:" is
    now translatable.

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

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a80f02df557d55f455c32d1d614352aa1961bfff
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 29 10:06:31 2018 -0300

    Bug 21020: Fix return branch on transfer - SIP

    Caused by
      commit 546379cc92b733cb29a0b70247a72c770afdad26
      Bug 17680: C4::Circulation - Remove GetItemIssue, simple calls

    Since this commit AddReturn return a Koha::Issue object, not a hashref
    with item's info.

    Test plan:
    1 - Enable SIP server on your test instance
       For kohadevbox:
       cp /etc/koha/SIPConfig.xml /etc/koha/sites/kohadev/
       create patron with user/pass term1/term1 and grant circulation
       privileges
    2 - enable AutomaticItemReturn
    3 - Checkin an item which will generate a transfer via SIP2:
       perl /home/vagrant/kohaclone/misc/sip_cli_emulator.pl -a localhost -p
       6001 -su term1 -sp term1 -l LPL --item {BARCODE} -m checkin -t
       CR
    4 - Note no CT field
    5 - Apply patch
    6 - Repeate checkin via SIP2
    7 - Transfer destination is correctly returned in CT

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 83f9532b01b77eeb8219635e3b54a79ef719ce6f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Mon Jul 9 18:23:02 2018 +0100

    Revert "Bug 20864: Only set bibs_selected cookie when BrowseResultSelection is activated"

    This reverts commit 6f5952023c615e72d3fe36aafe3b5fd82c8794fd, see
    bugzilla for details

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/SIP/ILS/Transaction/Checkin.pm                  |    4 +-
 Koha/Account.pm                                    |   19 +++
 Koha/Account/Lines.pm                              |   22 +++-
 .../intranet-tmpl/prog/en/includes/js_includes.inc |    4 +-
 .../intranet-tmpl/prog/en/includes/strings.inc     |    1 +
 koha-tmpl/intranet-tmpl/prog/js/holds.js           |    2 +-
 members/pay.pl                                     |    4 +-
 members/paycollect.pl                              |    4 +-
 t/db_dependent/Koha/Account.t                      |   82 +++++++++++++
 t/db_dependent/Koha/Account/Lines.t                |  127 +++++++++++++++-----
 10 files changed, 226 insertions(+), 43 deletions(-)
 create mode 100755 t/db_dependent/Koha/Account.t

hooks/post-receive
-- 
main Koha release repository