From 70133ef343e7885b4d237e51351bf05f4e490850 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 14 Sep 2015 11:11:11 +0200 Subject: [PATCH] Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee The problem making some tests fail, actually was the unneeded addition of zero accountline records by ChargeReserveFee, called by AddReserve. The balance is still zero, but a test like !$var responds differently when var is 0.00 instead of 0 or undef. This patch adjusts the test in ChargeReserveFee in order to prevent adding these records with 0.00. The first patch that adjusts the tests in Reserves.t is not strictly needed anymore, but can stay. Test plan: [1] Run t/db_dependent/Reserves.t [2] Run t/db_dependent/Reserves/GetReserveFee.t Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- C4/Reserves.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index dab2b48e5f..ed24d32e77 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -650,7 +650,7 @@ sub GetOtherReserves { sub ChargeReserveFee { my ( $borrowernumber, $fee, $title ) = @_; - return if !$fee; + return if !$fee || $fee==0; # the last test is needed to include 0.00 my $accquery = qq{ INSERT INTO accountlines ( borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding ) VALUES (?, ?, NOW(), ?, ?, 'Res', ?) };