From 8166424b07602d5e32f4a30adf859d3a54e00525 Mon Sep 17 00:00:00 2001 From: Blou Date: Fri, 21 Dec 2018 10:33:29 -0500 Subject: [PATCH] Bug 17140: fix rounding errors when paying fines Whenever a fine (accountlines in DB) has a precision longer than two floating points, it becomes very hard for a user to clear it. Ex: 1.035 will be displayed as 1.04 or 1.03 depending on the screen. But entering any of those value in Pay Fine will not clear it. The user has no way to know the exact value to enter. This fix makes sure that the intent of the user is met, by matching the EXACT needed sum when the difference is less than 0.01. TEST 1) Create a 1.035 fine - Go to a Patron screen - Fines tab on the left - Create manual invoice 2) go to Pay fines, click Pay amount on bottom left. 3) It will show 1.03 as Total, and as Collect from patron. Click confirm. 4) An error message will appear. 5) Apply patch, do again. Signed-off-by: Hayley Mapley Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jesse Maseto Signed-off-by: Martin Renvoize (cherry picked from commit c2df905bfef771415d47aeba7db6ea445a33f1e1) Signed-off-by: Fridolin Somers --- members/pay.pl | 1 + members/paycollect.pl | 1 + 2 files changed, 2 insertions(+) diff --git a/members/pay.pl b/members/pay.pl index dd7a1efb5f..ecf1987680 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -96,6 +96,7 @@ elsif ( $input->param('confirm_writeoff') ) { my $accountline = Koha::Account::Lines->find( $accountlines_id ); + $amount = $accountline->amountoutstanding if (abs($amount - $accountline->amountoutstanding) < 0.01); if ( $amount > $accountline->amountoutstanding ) { print $input->redirect( "/cgi-bin/koha/members/paycollect.pl?" . "borrowernumber=$borrowernumber" diff --git a/members/paycollect.pl b/members/paycollect.pl index f105c8e398..f6e711a235 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -106,6 +106,7 @@ if ( $pay_individual || $writeoff_individual ) { } if ( $total_paid and $total_paid ne '0.00' ) { + $total_paid = $total_due if (abs($total_paid - $total_due) < 0.01); if ( $total_paid < 0 or $total_paid > $total_due ) { $template->param( error_over => 1, -- 2.39.2