OriusTecnologia/myadmin
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ajuste, aplicando filtro de consulta por conter NF no relatório

Browse source
This commit is contained in:
Kenio 2025-09-29 10:01:34 -03:00
parent c105c4362e
commit 6283bd31b2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vendor/model/FinancialMovements.class.php vendored
View file

@ -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

4
vendor/print/financial_movements/financial_movements_datagrid.php vendored
View file

@ -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>';