Skip to content

Commit e8da9eb

Browse files
danilobredadanilobreda
authored
Merge pull request #123 from pauloadler/alteracao-campos-nt-2025.002_v1.30
Alteração Campos RTC - NT 2025.002_v1.30 - NF-e/NFC-e
2 parents 10eb34d + 8d85eb3 commit e8da9eb

9 files changed

Lines changed: 155 additions & 29 deletions

File tree

‎NFe.Classes/Informacoes/Detalhe/Tributacao/IBSCBS.cs‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,41 @@ public class IBSCBS
1212
[XmlElement(Order = 2)]
1313
public cClassTrib cClassTrib { get; set; }
1414

15-
// UB15
15+
// UB14a
1616
[XmlElement(Order = 3)]
17+
public string? indDoacao { get; set; }
18+
19+
// UB15
20+
[XmlElement(Order = 4)]
1721
public gIBSCBS gIBSCBS { get; set; }
1822

1923
// UB84
20-
[XmlElement(Order = 4)]
24+
[XmlElement(Order = 5)]
2125
public gIBSCBSMono gIBSCBSMono { get; set; }
2226

2327
// UB106
24-
[XmlElement(Order = 5)]
28+
[XmlElement(Order = 6)]
2529
public gTransfCred gTransfCred { get; set; }
2630

27-
// UB109
28-
[XmlElement(Order = 6)]
31+
// UB112
32+
[XmlElement(Order = 7)]
33+
public gAjusteCompet? gAjusteCompet { get; set; }
34+
35+
// UB116
36+
[XmlElement(Order = 8)]
37+
public gEstornoCred? gEstornoCred { get; set; }
38+
39+
// UB120
40+
[XmlElement(Order = 9)]
41+
public gCredPresOper gCredPresOper { get; set; }
42+
43+
// UB131
44+
[XmlElement(Order = 10)]
2945
public gCredPresIBSZFM gCredPresIBSZFM { get; set; }
46+
47+
public bool ShouldSerializeindDoacao()
48+
{
49+
return indDoacao != null;
50+
}
3051
}
3152
}

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gAjusteCompet.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
4+
{
5+
public class gAjusteCompet
6+
{
7+
private decimal _vIBS;
8+
private decimal _vCBS;
9+
10+
//UB113
11+
[XmlElement(Order = 1)]
12+
public string competApur { get; set; }
13+
14+
//UB114
15+
[XmlElement(Order = 2)]
16+
public decimal vIBS
17+
{
18+
get => _vIBS.Arredondar(2);
19+
set => _vIBS = value.Arredondar(2);
20+
}
21+
22+
//UB115
23+
[XmlElement(Order = 3)]
24+
public decimal vCBS
25+
{
26+
get => _vCBS.Arredondar(2);
27+
set => _vCBS = value.Arredondar(2);
28+
}
29+
}
30+
}

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gCredPresIBSZFM.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ namespace NFe.Classes.Informacoes.Detalhe.Tributacao
55
public class gCredPresIBSZFM
66
{
77
private decimal? _vCredPresIbsZfm;
8-
9-
// UB110
8+
109
[XmlElement(Order = 1)]
11-
public tpCredPresIBSZFM tpCredPresIBSZFM { get; set; }
10+
// UB132
11+
public string competApur { get; set; }
1212

13-
// UB111
13+
// UB133
1414
[XmlElement(Order = 2)]
15+
public tpCredPresIBSZFM tpCredPresIBSZFM { get; set; }
16+
17+
// UB134
18+
[XmlElement(Order = 3)]
1519
public decimal? vCredPresIBSZFM
1620
{
1721
get => _vCredPresIbsZfm.Arredondar(2);

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gCredPresOper.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
4+
{
5+
public class gCredPresOper
6+
{
7+
private decimal _vBCCredPres;
8+
9+
//UB121
10+
[XmlElement(Order = 1)]
11+
public decimal vBCCredPres
12+
{
13+
get => _vBCCredPres.Arredondar(2);
14+
set => _vBCCredPres = value.Arredondar(2);
15+
}
16+
17+
//UB122
18+
[XmlElement(Order = 2)]
19+
public TipocCredPres cCredPres { get; set; }
20+
21+
// UB123
22+
[XmlElement(Order = 3)]
23+
public gIBSCredPres? gIBSCredPres { get; set; }
24+
25+
// UB127
26+
[XmlElement(Order = 4)]
27+
public gIBSCredPres? gCBSCredPres { get; set; }
28+
}
29+
}

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gEstornoCred.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
4+
{
5+
public class gEstornoCred
6+
{
7+
private decimal _vIBSEstCred;
8+
private decimal _vCBSEstCred;
9+
10+
// UB117
11+
[XmlElement(Order = 1)]
12+
public decimal vIBSEstCred
13+
{
14+
get => _vIBSEstCred.Arredondar(2);
15+
set => _vIBSEstCred = value.Arredondar(2);
16+
}
17+
18+
// UB118
19+
[XmlElement(Order = 2)]
20+
public decimal vCBSEstCred
21+
{
22+
get => _vCBSEstCred.Arredondar(2);
23+
set => _vCBSEstCred = value.Arredondar(2);
24+
}
25+
}
26+
}

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gIBSCBS.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ public bool vIBSSpecified
4444
[XmlElement(Order = 6)]
4545
public gTribRegular gTribRegular { get; set; }
4646

47-
// UB73
48-
[XmlElement(Order = 7)]
49-
public gIBSCredPres gIBSCredPres { get; set; }
50-
51-
// UB78
52-
[XmlElement(Order = 8)]
53-
public gIBSCredPres gCBSCredPres { get; set; }
54-
5547
// UB82a
5648
[XmlElement(Order = 9)]
5749
public gTribCompraGov gTribCompraGov { get; set; }

‎NFe.Classes/Informacoes/Detalhe/Tributacao/gIBSCredPres.cs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,32 @@ public class gIBSCredPres
66
{
77
private decimal _pCredPres;
88
private decimal _vCredPres;
9-
private decimal _vCredPresCondSus;
9+
private decimal? _vCredPresCondSus;
1010

11-
// UB74
11+
// UB124
1212
[XmlElement(Order = 1)]
13-
public TipocCredPres cCredPres { get; set; }
14-
15-
// UB75
16-
[XmlElement(Order = 2)]
1713
public decimal pCredPres
1814
{
1915
get => _pCredPres.Arredondar(4);
2016
set => _pCredPres = value.Arredondar(4);
2117
}
2218

23-
// UB76
24-
[XmlElement(Order = 3)]
19+
// UB125
20+
[XmlElement(Order = 2)]
2521
public decimal vCredPres
2622
{
2723
get => _vCredPres.Arredondar(2);
2824
set => _vCredPres = value.Arredondar(2);
2925
}
3026

31-
// UB77
32-
[XmlElement(Order = 4)]
33-
public decimal vCredPresCondSus
27+
// UB126
28+
[XmlElement(Order = 3)]
29+
public decimal? vCredPresCondSus
3430
{
3531
get => _vCredPresCondSus.Arredondar(2);
36-
set => _vCredPresCondSus = value.Arredondar(2);
32+
set => _vCredPresCondSus = value?.Arredondar(2);
3733
}
34+
35+
public bool ShouldSerializevCredPresCondSus() => vCredPresCondSus.HasValue;
3836
}
3937
}

‎NFe.Classes/Informacoes/Detalhe/prod.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using NFe.Classes.Informacoes.Detalhe.DeclaracaoImportacao;
44
using NFe.Classes.Informacoes.Detalhe.Exportacao;
55
using NFe.Classes.Informacoes.Detalhe.ProdEspecifico;
6+
using NFe.Classes.Informacoes.Detalhe.Tributacao;
67
using NFe.Classes.Informacoes.Identificacao.Tipos;
78

89
namespace NFe.Classes.Informacoes.Detalhe
@@ -103,6 +104,12 @@ public bool indEscalaSpecified
103104
[XmlElement("gCred")]
104105
public List<gCred> gCred { get; set; }
105106

107+
/// <summary>
108+
/// I05k -Classificação para subapuração do IBS na ZFM
109+
/// Versão 4.00 - NT 2025.002 v1.30
110+
/// </summary>
111+
public tpCredPresIBSZFM? tpCredPresIBSZFM { get; set; }
112+
106113
/// <summary>
107114
/// I06 - Código EX TIPI (3 posições)
108115
/// </summary>
@@ -324,5 +331,19 @@ public bool ShouldSerializeindBemMovelUsado()
324331
return indBemMovelUsado.HasValue;
325332
}
326333

334+
public bool ShouldSerializetpCredPresIBSZFM()
335+
{
336+
return tpCredPresIBSZFM.HasValue;
337+
}
338+
339+
public bool ShouldSerializetpCredPresIBSZFM()
340+
{
341+
return tpCredPresIBSZFM.HasValue;
342+
}
343+
344+
public bool ShouldSerializeindBemMovelUsado()
345+
{
346+
return indBemMovelUsado.HasValue;
347+
}
327348
}
328349
}

‎NFe.Classes/Informacoes/Total/IBSCBSTot.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Xml.Serialization;
2+
using NFe.Classes.Informacoes.Detalhe.Tributacao;
23

34
namespace NFe.Classes.Informacoes.Total
45
{
@@ -25,5 +26,9 @@ public decimal vBCIBSCBS
2526
// W57
2627
[XmlElement(Order = 4)]
2728
public gMono gMono { get; set; }
29+
30+
// W59e
31+
[XmlElement(Order = 5)]
32+
public gEstornoCred? gEstornoCred { get; set; }
2833
}
2934
}

0 commit comments

Comments
 (0)