From 6283bd31b274ef685a2d5ef0ffefc4a21a8e0ba7 Mon Sep 17 00:00:00 2001
From: Kenio de Souza <kenio@outlook.com>
Date: Mon, 29 Sep 2025 10:01:34 -0300
Subject: [PATCH] =?UTF-8?q?Ajuste,=20aplicando=20filtro=20de=20consulta=20?=
 =?UTF-8?q?por=20conter=20NF=20no=20relat=C3=B3rio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vendor/model/FinancialMovements.class.php                    | 5 +++--
 .../financial_movements/financial_movements_datagrid.php     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vendor/model/FinancialMovements.class.php b/vendor/model/FinancialMovements.class.php
index 3bff382..7406838 100644
--- a/vendor/model/FinancialMovements.class.php
+++ b/vendor/model/FinancialMovements.class.php
@@ -733,14 +733,15 @@ class FinancialMovements
 							 c.reference,
 							 c.cns,
 							 c.name_fantasy,
+							 c.cnpj,
 							 c.contract_type,
 							 (select fmn.notification_date from financial_movements_notify fmn where fmn.financial_movements_id = fm.financial_movements_id order by fmn.financial_movements_notify_id desc limit 0, 1) as notification_date,
 							 (select fmn.message from financial_movements_notify fmn where fmn.financial_movements_id = fm.financial_movements_id order by fmn.financial_movements_notify_id desc limit 0, 1) as message,
 							 cbc.companies_budgets_commissions_id,
 							 cbc.value,
 							 cbc.commission_date_paid,
-							 u.name_first,
-							 u.name_last,
+							 u.nickname,
+							 u.name,
 							 (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
diff --git a/vendor/print/financial_movements/financial_movements_datagrid.php b/vendor/print/financial_movements/financial_movements_datagrid.php
index eb84e9a..e5bf076 100644
--- a/vendor/print/financial_movements/financial_movements_datagrid.php
+++ b/vendor/print/financial_movements/financial_movements_datagrid.php
@@ -146,7 +146,7 @@ try{
                     $header .= '          <td style="color: #FFF; padding: 4px; text-align: center; width: 90px">REFERÊNCIA</td>';
                     $header .= '          <td style="color: #FFF; padding: 4px; text-align: center; width: 90px">PAGAMENTO</td>';
                     $header .= '          <td style="color: #FFF; padding: 4px; text-align: center">DESCRIÇÃO</td>';
-                    $header .= '          <td style="color: #FFF; padding: 4px; text-align: center">OBSERVAÇÃO</td>';
+                    $header .= '          <td style="color: #FFF; padding: 4px; text-align: center">CLIENTE</td>';
                     $header .= '          <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">TOTAL</td>';                
                     $header .= '       </tr>';
                     $header .= '    </table>';      
@@ -298,7 +298,7 @@ try{
                                 $body .= '          <td style="text-align: center; width: 90px; border: #333 solid 1px; padding: 2px ; margin: 1px">'.$Result->movement_reference.'</td>';
                                 $body .= '          <td style="text-align: center; width: 90px; border: #333 solid 1px; padding: 2px ; margin: 1px">'.date('d/m/Y', strtotime($Result->movement_date_scheduled)).'</td>';
                                 $body .= '          <td style="text-align: center; width: 90px; border: #333 solid 1px; padding: 2px ; margin: 1px">'.(isset($Result->movement_date_paid) ? date('d/m/Y', strtotime($Result->movement_date_paid)) : ($Main->CheckDay($Result->movement_date_scheduled) > 1 ? $Main->diffDate($Result->movement_date_scheduled, date('Y-m-d')).' dia(s) de atraso' : '')).'</td>';
-                                $body .= '          <td style="text-align: left; border: #333 solid 1px; padding: 2px ; margin: 1px">'.$Result->description.'</td>';                            
+                                $body .= '          <td style="text-align: left; border: #333 solid 1px; padding: 2px ; margin: 1px">'.$Result->name_fantasy.'</td>';                            
                                 $body .= '          <td style="text-align: left; border: #333 solid 1px; padding: 2px ; margin: 1px">'.( isset($Result->note) ? $Result->note : '' ).'</td>';
                                 $body .= '          <td style="text-align: right; width: 60px; border: #333 solid 1px; padding: 2px ; margin: 1px">'.number_format($Result->movement_value, 2, ',', '.').'</td>';
                                 $body .= '          <td style="text-align: right; width: 60px; border: #333 solid 1px; padding: 2px ; margin: 1px">'.( isset($Result->movement_value_paid) ?  number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').'</td>';