Skip to content

fix: treat vRetCSLL as CSLL only #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitormattos merged 4 commits into from
Oct 8, 2026
Merged

fix: treat vRetCSLL as CSLL only #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efdb777
fix: describe vRetCSLL as CSLL only
vitormattos Oct 8, 2026
7bde405
fix: map vRetCSLL explicitly as CSLL
vitormattos Oct 8, 2026
5cba420
fix: label vRetCSLL correctly in DANFSe
vitormattos Oct 8, 2026
d552383
test: keep CSLL separate from PIS and COFINS
vitormattos Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Danfse/DanfseTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function buildData(array $nfse): array
'tributacao_federal' => [
'irrf' => $this->currencyOrDash($this->val($tribFed, 'vRetIRRF')),
'cp' => $this->currencyOrDash($this->val($tribFed, 'vRetCP')),
'contribuicoes_sociais' => $this->currencyOrDash($this->val($tribFed, 'vRetCSLL')),
'csll' => $this->currencyOrDash($this->val($tribFed, 'vRetCSLL')),
'pis' => $this->currencyOrDash($this->val($tribFed, 'piscofins', 'vPis')),
'cofins' => $this->currencyOrDash($this->val($tribFed, 'piscofins', 'vCofins')),
'descricao_retencao' => $this->pisCofinsRetentionLabel(
Expand Down
6 changes: 3 additions & 3 deletions src/Danfse/HTMLTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,8 @@
<span class="value"><?= $data['tributacao_federal']['cp'] ?? '-' ?></span>
</td>
<td style="width: 25%;">
<span class="label">Contribuições Sociais - Retidas</span>
<span class="value"><?= $data['tributacao_federal']['contribuicoes_sociais'] ?? '-' ?></span>
<span class="label">CSLL - Retida</span>
<span class="value"><?= $data['tributacao_federal']['csll'] ?? '-' ?></span>
</td>
<td style="width: 25%;"></td>
</tr>
Expand All @@ -498,7 +498,7 @@
<span class="value"><?= $data['tributacao_federal']['cofins'] ?? '-' ?></span>
</td>
<td colspan="2">
<span class="label">Descrição Contrib. Sociais - Retidas</span>
<span class="label">Tipo de retenção PIS/COFINS/CSLL</span>
<span class="value"><?= $data['tributacao_federal']['descricao_retencao'] ?? '-' ?></span>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion src/Dto/DpsData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function __construct(
/** Valor do IRRF. */
public string $federalValorIrrf = '',

/** Valor das contribuições sociais retidas (CSLL). */
/** Valor da CSLL retida. */
public string $federalValorCsll = '',

/** Valor da contribuição previdenciária retida. */
Expand Down
10 changes: 5 additions & 5 deletions tests/Unit/Danfse/DanfseGoldenReferenceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,23 +120,23 @@ public function testAuthorizedXmlWithoutIbsCbsStillRendersRequiredV2Section(): v
self::assertStringContainsString('DANFSe v2.0', $html);
}

public function testFederalRetentionUsesOfficialV2Semantics(): void
public function testFederalRetentionKeepsCsllSeparateFromPisAndCofins(): void
{
$nfse = $this->fixtureData();
$nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['piscofins']['tpRetPisCofins'] = '4';
$nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['vRetCSLL'] = '1149.75';
unset($nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['vRetCSLL']);

$template = new DanfseTemplate();
$data = $template->buildData($nfse);
$html = $template->render($nfse, new DanfseConfig());

self::assertSame('R$ 1.149,75', $data['tributacao_federal']['contribuicoes_sociais']);
self::assertSame('-', $data['tributacao_federal']['csll']);
self::assertSame(
'4 - PIS/COFINS Retidos, CSLL Não Retido',
$data['tributacao_federal']['descricao_retencao'],
);
self::assertStringContainsString('Contribuições Sociais - Retidas', $html);
self::assertStringContainsString('Descrição Contrib. Sociais - Retidas', $html);
self::assertStringContainsString('CSLL - Retida', $html);
self::assertStringContainsString('Tipo de retenção PIS/COFINS/CSLL', $html);
}

public function testHomologationReferenceCarriesVisibleMarker(): void
Expand Down
Loading