From b78e31e5181f9bc832150c22a50a40f763bfe7ad Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 12 Mar 2025 11:36:51 -0400 Subject: [PATCH] Fix Recurring Income by Client Report with the updated recurring invoice vars --- report_recurring_by_client.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/report_recurring_by_client.php b/report_recurring_by_client.php index 9a2efc72..bb181194 100644 --- a/report_recurring_by_client.php +++ b/report_recurring_by_client.php @@ -5,12 +5,12 @@ require_once "includes/inc_all_reports.php"; validateAccountantRole(); $sql = mysqli_query($mysqli, " - SELECT clients.client_id, clients.client_name, - SUM(CASE WHEN recurring.recurring_frequency = 'month' THEN recurring.recurring_amount - WHEN recurring.recurring_frequency = 'year' THEN recurring.recurring_amount / 12 END) AS recurring_monthly_total + SELECT client_id, client_name, + SUM(CASE WHEN recurring_invoice_frequency = 'month' THEN recurring_invoice_amount + WHEN recurring_invoice_frequency = 'year' THEN recurring_invoice_amount / 12 END) AS recurring_monthly_total FROM clients - LEFT JOIN recurring ON clients.client_id = recurring.recurring_client_id - WHERE recurring.recurring_status = 1 + LEFT JOIN recurring_invoices ON client_id = recurring_invoice_client_id + WHERE recurring_invoice_status = 1 GROUP BY clients.client_id HAVING recurring_monthly_total > 0 ORDER BY recurring_monthly_total DESC