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

Ajustando relatorio de movimentações

Browse source
This commit is contained in:
Kenio 2025-09-02 09:47:03 -03:00
parent 46dee36bb4
commit 23e838eb4e
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -693,7 +693,14 @@ class FinancialMovements
}
/** Lista todos os egistros do banco com ou sem paginação*/
public function All(int $companyId, int $start, int $max, string $search, string $type, int $status, string $dateStart, string $dateEnd)
public function All(int $companyId,
int $start,
int $max,
string $search,
string $type,
int $status,
string $dateStart,
string $dateEnd)
{
/** Parametros de entrada */
$this->companyId = $companyId;
@ -722,6 +729,8 @@ class FinancialMovements
fm.movement_date_paid,
fm.reference as movement_reference,
fm.status,
fm.movement_value_registration_tariff,
fm.movement_value_settlement_tariff,
c.reference,
c.cns,
c.name_fantasy,

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

@ -128,9 +128,10 @@ try{
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 90px">VENCIMENTO</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">CLIENTE</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center">CNS</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">VALOR R$</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">MORA R$</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">MULTA R$</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">TAXAS R$</td>';
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">TOTAL R$</td>';
$header .= ' </tr>';
$header .= ' </table>';
@ -170,10 +171,11 @@ try{
$body .= ' <td style="text-align: center; width: 90px">'.date('d/m/Y', strtotime($Result->movement_date_scheduled)).'</td>';
$body .= ' <td style="text-align: center; width: '.($FinancialMovementsValidate->getStatusSearch() == 1 ? '120' : '90').'px">'.(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">'.$Result->description.'</td>';
$body .= ' <td style="text-align: left">'.$Result->name_fantasy.'</td>';
$body .= ' <td style="text-align: left">'.$Result->cns.'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.number_format($Result->movement_value, 2, ',', '.').'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_paid) ? number_format($Result->movement_value_paid, 2, ',', '.') : number_format($Result->movement_value, 2, ',', '.')).'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_fees) ? number_format($Result->movement_value_fees, 2, ',', '.') : '').'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_registration_tariff) ? number_format($Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff, 2, ',', '.') : '').'</td>';
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid+($Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff)), 2, ',', '.') : number_format($Result->movement_value, 2, ',', '.')).'</td>';
$body .= ' </tr>';
$i++;