Fix Recurring Income by Client Report with the updated recurring invoice vars
This commit is contained in:
@@ -5,12 +5,12 @@ require_once "includes/inc_all_reports.php";
|
|||||||
validateAccountantRole();
|
validateAccountantRole();
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli, "
|
$sql = mysqli_query($mysqli, "
|
||||||
SELECT clients.client_id, clients.client_name,
|
SELECT client_id, client_name,
|
||||||
SUM(CASE WHEN recurring.recurring_frequency = 'month' THEN recurring.recurring_amount
|
SUM(CASE WHEN recurring_invoice_frequency = 'month' THEN recurring_invoice_amount
|
||||||
WHEN recurring.recurring_frequency = 'year' THEN recurring.recurring_amount / 12 END) AS recurring_monthly_total
|
WHEN recurring_invoice_frequency = 'year' THEN recurring_invoice_amount / 12 END) AS recurring_monthly_total
|
||||||
FROM clients
|
FROM clients
|
||||||
LEFT JOIN recurring ON clients.client_id = recurring.recurring_client_id
|
LEFT JOIN recurring_invoices ON client_id = recurring_invoice_client_id
|
||||||
WHERE recurring.recurring_status = 1
|
WHERE recurring_invoice_status = 1
|
||||||
GROUP BY clients.client_id
|
GROUP BY clients.client_id
|
||||||
HAVING recurring_monthly_total > 0
|
HAVING recurring_monthly_total > 0
|
||||||
ORDER BY recurring_monthly_total DESC
|
ORDER BY recurring_monthly_total DESC
|
||||||
|
|||||||
Reference in New Issue
Block a user