From caf6a619bf725030dc133aa5b09aca24dde16cd1 Mon Sep 17 00:00:00 2001 From: Kenio de Souza Date: Tue, 23 Sep 2025 10:35:06 -0300 Subject: [PATCH] =?UTF-8?q?Ajuste,=20adicionado=20informa=C3=A7=C3=A3o=20d?= =?UTF-8?q?e=20NF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/model/FinancialMovements.class.php | 5 +-- .../financial_movements_datagrid.php | 33 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/vendor/model/FinancialMovements.class.php b/vendor/model/FinancialMovements.class.php index 063c9e2..6e9a947 100644 --- a/vendor/model/FinancialMovements.class.php +++ b/vendor/model/FinancialMovements.class.php @@ -740,11 +740,12 @@ class FinancialMovements cbc.value, cbc.commission_date_paid, u.name_first, - u.name_last + u.name_last, + (select count(d.documents_id) from documents d where d.financial_movements_id = fm.financial_movements_id and documents_categorys_id = 2) as nf from financial_movements fm left join companies c on fm.company_id = c.company_id left join companies_budgets_commissions cbc on fm.financial_movements_id = cbc.financial_movements_id - left join users u on cbc.user_id = u.user_id + left join users u on cbc.user_id = u.user_id where fm.movement_date_cancel is null '; /** verifica se a consulta será pela data de pagamento */ diff --git a/vendor/view/financial_movements/financial_movements_datagrid.php b/vendor/view/financial_movements/financial_movements_datagrid.php index 62911a6..e57200b 100644 --- a/vendor/view/financial_movements/financial_movements_datagrid.php +++ b/vendor/view/financial_movements/financial_movements_datagrid.php @@ -79,7 +79,12 @@ try{ } /** Consulta a quantidade de registros */ - $NumberRecords = (int)$FinancialMovements->Count($companyId, $FinancialMovementsValidate->getSearch(), $FinancialMovementsValidate->getType(), $FinancialMovementsValidate->getStatusSearch(), $FinancialMovementsValidate->getDateStart(), $FinancialMovementsValidate->getDateEnd())->qtde; + $NumberRecords = (int)$FinancialMovements->Count($companyId, + $FinancialMovementsValidate->getSearch(), + $FinancialMovementsValidate->getType(), + $FinancialMovementsValidate->getStatusSearch(), + $FinancialMovementsValidate->getDateStart(), + $FinancialMovementsValidate->getDateEnd())->qtde; /** Verifico a quantidade de registros localizados */ if ($NumberRecords > 0){ //Caso tenha registros cadastrados, carrego o layout @@ -221,7 +226,31 @@ try{ foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){ ?> - +