From 586fe347993093a49e2158c47796450e743618c8 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 1 May 2023 09:50:24 -0400 Subject: [PATCH] Bug 29664: Do not show voided payments in cash_register_stats.pl Test Plan: 1) Set up your cash register 2) Take a payment 3) Void that payment 4) Verify the voided fee shows for the "All payments to the library" and "Payment" transaction type filters 5) Apply this patch 6) Restart all the things! 7) Verify the voided fee no longer shows for the "All payments to the library" and "Payment" transaction type filters Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 65a45b761b65b784ac03d2c5901fb60e0dfe06b2) Signed-off-by: Martin Renvoize --- reports/cash_register_stats.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl index c2b22f9db2..1861e02200 100755 --- a/reports/cash_register_stats.pl +++ b/reports/cash_register_stats.pl @@ -82,6 +82,10 @@ if ($do_it) { } } + if ( $transaction_type eq 'PAYMENT' || $transaction_type eq 'ACT' ) { + $whereTType .= q{ AND status != 'VOID' }; + } + my $whereBranchCode = q{}; if ($manager_branchcode ne 'ALL') { $whereBranchCode = q{ AND m.branchcode = ?}; -- 2.20.1