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 .= ' REFERÊNCIA'; $header .= ' PAGAMENTO'; $header .= ' DESCRIÇÃO'; - $header .= ' OBSERVAÇÃO'; + $header .= ' CLIENTE'; $header .= ' TOTAL'; $header .= ' '; $header .= ' '; @@ -298,7 +298,7 @@ try{ $body .= ' '.$Result->movement_reference.''; $body .= ' '.date('d/m/Y', strtotime($Result->movement_date_scheduled)).''; $body .= ' '.(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' : '')).''; - $body .= ' '.$Result->description.''; + $body .= ' '.$Result->name_fantasy.''; $body .= ' '.( isset($Result->note) ? $Result->note : '' ).''; $body .= ' '.number_format($Result->movement_value, 2, ',', '.').''; $body .= ' '.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').'';