[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-31-ga48123c213
Git repo owner
gitmaster at git.koha-community.org
Sat Jul 25 20:51:37 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, 20.05.x has been updated
via a48123c2131ba9f28f174e0cfc51807e1e42b9ad (commit)
via f073ec206c701b0ea4bfab9878b60fa718377373 (commit)
via 518332c0826381af3a3dbe35573610f411e80955 (commit)
via 754e900fbec98503589770a73ac4164d32b732df (commit)
via 54a4aa7d934f9636b9ee19ee9b2ac442658d2dd2 (commit)
from 2fb5292dbf8244f0e4b2e20503371258d886b81e (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 a48123c2131ba9f28f174e0cfc51807e1e42b9ad
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 23 15:10:50 2020 +0100
Bug 8338: (QA follow-up) Clean up warning
This patch moves the accountline->store call below the FinesLog code
such that we return the same 'thing' from _FixOverduesOnReturn as the
other clauses of the routine.
We also take the oportunity to clean up the warning thrown by an errant
call to the routine such that we output the actual itemnumber rather
than a HASH reference marker.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit dae82b191abb87b88e6f455179f5776ce04dc2b8)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit f073ec206c701b0ea4bfab9878b60fa718377373
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jun 22 08:49:15 2020 +0100
Bug 8338: (QA follow-up) Fix perlcritic error
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 312b1c68870aec89eb81b31e7d168421548d2586)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 518332c0826381af3a3dbe35573610f411e80955
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 2 17:37:38 2020 +0100
Bug 8338: (follow-up) Fix test
This patch moves the previous test introduced with bug 24075 into the
same block as the rest of the AddReturn tests and updates it to test for
the new 'remove accountline' behaviour as well as the reduce and refund
behaviour.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 64bb70d579ffe3a6967103239ba683fd1c0cbd25)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 754e900fbec98503589770a73ac4164d32b732df
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed May 13 14:11:38 2020 +0100
Bug 8338: Remove zero amount overdues on backdated returns where appropriate
This patch removes any overdues which would be reversed on a backdated
return if CalcFineOnBackdate is enabled and the user has not already
attempted to pay off the accruing fine.
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 3f3534a8eeed87869fd6a858866455c10087d7e1)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 54a4aa7d934f9636b9ee19ee9b2ac442658d2dd2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed May 13 14:11:16 2020 +0100
Bug 8338: Unit Tests
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit a25b95c2e63a1705f406388f4419aa7972abc3b8)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 16 +--
t/db_dependent/Circulation.t | 236 +++++++++++++++++++++++++++++++++----------
2 files changed, 194 insertions(+), 58 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list