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 39e4c6c5d791853985773e4032357372f77d7587 (commit) via 60e24be115539daedc4172099eec9cc5dd5bc813 (commit) via e702ff89f77e50b1bcef1cdc1548627957251df0 (commit) from 2e8a6a4b097f7ed7bb33efe819693752abba33cb (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 39e4c6c5d791853985773e4032357372f77d7587 Author: Katrin Fischer <katrin.fischer...@web.de> Date: Mon Mar 11 08:33:13 2019 +0000 Bug 13094: Make it easy to hide 'Cancel all' button on holds over report This patch makes some small modifications to the 'Holds awaiting pickup' report: - Fixes typo sypref - Fixes 'Home branch' to 'Home library' - Adds a span to easily hide the cancel all button with CSS To test: - Make sure you have a hold appearing on the awaiting pickup list second tab: Holds waiting over... - Verify the 'cancel all' button on top shows - Verify syspref and Home library changes mentioned above - Add #holdsover-cancel-all { display:none; } to IntrentUserCSS - Verify that the button and the text have vanished Note: If the text doesn't display next to the button, try toggling the TransferWhenCancelAllWaitingHolds system preference. Signed-off-by: Liz Rea <wizzy...@gmail.com> Signed-off-by: Chris Cormack <chr...@catalyst.net.nz> Signed-off-by: Martin Renvoize <martin.renvo...@ptfs-europe.com> commit 60e24be115539daedc4172099eec9cc5dd5bc813 Author: Kyle M Hall <k...@bywatersolutions.com> Date: Mon Mar 25 13:55:43 2019 -0400 Bug 18344: Add unit tests Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Martin Renvoize <martin.renvo...@ptfs-europe.com> commit e702ff89f77e50b1bcef1cdc1548627957251df0 Author: Kyle M Hall <k...@bywatersolutions.com> Date: Tue Mar 28 11:05:28 2017 +0000 Bug 18344: Allow overdue fines cap at replacement price, and cap by amount to work together There is no reason that a library shouldn't be able to use the monetary fines cap and the replacement price cap at the same time. The code is written in such a way that they already work harmoniously. We have librarians who wish to use both so they can set a high cap of $10.00 but also use the replacement price cap so that a $20.00 book would only get a fine of $10.00, but a $5.00 paperback will only get a fine of $5.00 Test Plan: 1) Apply this patch 2) Create a rule with a fines cap of $10, *and* a cap at replacement price, and a daily fine of $1 3) Create two items, one with a replacement price of $5 and one with a replacement price of $15 4) Check out these items to a patron, backdate the checkouts so they are already overdue by a couple months 5) Check the items in ( make sure calc fine at checkin is enabled for you ) 6) Note the one item has a fine of $5 and the other has a fine of $10! Signed-off-by: David Kuhn <techservs...@gmail.com> Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Martin Renvoize <martin.renvo...@ptfs-europe.com> ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/waiting_holds.inc | 2 +- .../prog/en/modules/admin/smart-rules.tt | 3 -- .../prog/en/modules/circ/waitingreserves.tt | 37 ++++++++-------- t/db_dependent/Circulation/CalcFine.t | 46 +++++++++++++++++++- 4 files changed, 65 insertions(+), 23 deletions(-) hooks/post-receive -- main Koha release repository _______________________________________________ koha-commits mailing list koha-commits@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits