[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.08-68-g60adc95f52

Git repo owner gitmaster at git.koha-community.org
Mon Aug 17 01:08:04 CEST 2020


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, 19.11.x has been updated
       via  60adc95f52fff6ce84a7583eb4fb2b010e259ff7 (commit)
       via  eedc6954327ce7916d7758fcfd3c2176e698eecf (commit)
       via  f02072241f22c3f2a134719c8ac5989fd0e47d04 (commit)
      from  b24d51eccdb553076c2216d35d873f93ba38f28e (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 60adc95f52fff6ce84a7583eb4fb2b010e259ff7
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Aug 4 18:28:42 2020 +0000

    Bug 25683: (follow-up) Use COALESCE instead of IFNULL
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e1509855d3aa2729127ac352525be62505d752f9)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 6bea771b8048282c61b260699e1b62d8944a7f90)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

commit eedc6954327ce7916d7758fcfd3c2176e698eecf
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Jun 10 12:26:06 2020 +0000

    Bug 25683: Fix grouping of results
    
    DBIX doesn't seem to work as I expected - if trying to group by we can only
    get the columns we grouped by, otherwise the queries are much more complicated
    and come out wrong
    
    This patch removes the 'amountoutstanding' from the query. Note that we do return patron
    object, however, to access all the columns we must discard_changes (or refetch)
    
    Also fixes a typo 'verbosse'
    
    To test:
    1 - charge a $1 fine to a patron
    2 - pay off the fine
    3 - perl misc/cronjobs/update_patrons_category.pl -f J -t J -fu=5 -v
    4 - Note the patron is returned twice
    5 - export DBIC_TRACE=1
    6 - repeat 3 - view the SQL query and see how odd it is
    7 - Apply this patch
    8 - repeat 3 - simpler query
    9 - patron returned only once
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c7ae33f60c18d2874370e7c2d2f3042fe1331e0e)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 41f73194c42d306f3aa9893a01d01938489546bd)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

commit f02072241f22c3f2a134719c8ac5989fd0e47d04
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Jun 9 10:52:26 2020 +0000

    Bug 25683: Patron with no accountlines should have 0 outstanding (not NULL)
    
    Test plan:
    - Have a patron with nothing in accountlines
    - run update_patron_categories to find patrons with fines under $5 (-fu=5)
      - Your patron is not found
      - Give your patron a manual charge of $1
      - rerun the cron, your patron is found
      - pay off your patron's fine, putting their balance at $0
      - rerun the cron, your patron is found
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 09146f4a995d50206c7f1c2d80e797b3cb1175c5)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 6ae42c8c3c7e402db20f424d16950a6162951ac1)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

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

Summary of changes:
 Koha/Patrons.pm                          | 6 +++---
 misc/cronjobs/update_patrons_category.pl | 9 +++++----
 t/db_dependent/Patrons.t                 | 9 ++++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list