Skip to content

Commit c97cdcd

Browse files
authored
Merge pull request #93 from hhunterx/master
Forçando ordenação dos campos no XML nos novos campos da reforma tributaria
2 parents b17b92e + 380c40c commit c97cdcd

File tree

16 files changed

+129
-15
lines changed

16 files changed

+129
-15
lines changed
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class IBSCBS
46
{
57
// UB13
8+
[XmlElement(Order = 1)]
69
public CSTIBSCBS CST { get; set; }
710

811
// UB14
12+
[XmlElement(Order = 2)]
913
public cClassTrib cClassTrib { get; set; }
1014

1115
// UB15
16+
[XmlElement(Order = 3)]
1217
public gIBSCBS gIBSCBS { get; set; }
1318

1419
// UB84
20+
[XmlElement(Order = 4)]
1521
public gIBSCBSMono gIBSCBSMono { get; set; }
1622

1723
// UB106
24+
[XmlElement(Order = 5)]
1825
public gTransfCred gTransfCred { get; set; }
1926

2027
// UB109
28+
[XmlElement(Order = 6)]
2129
public gCredPresIBSZFM gCredPresIBSZFM { get; set; }
2230
}
2331
}

NFe.Classes/Informacoes/Detalhe/Tributacao/IS.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,31 @@ public class IS
1111
private decimal _vIs;
1212

1313
// UB02
14+
[XmlElement(Order = 1)]
1415
public CSTIS CSTIS { get; set; }
1516

1617
// UB03
18+
[XmlElement(Order = 2)]
1719
public cClassTribIS cClassTribIS { get; set; }
1820

1921
// UB05
22+
[XmlElement(Order = 3)]
2023
public decimal vBCIS
2124
{
2225
get => _vBcIs.Arredondar(2);
2326
set => _vBcIs = value.Arredondar(2);
2427
}
2528

2629
// UB06
30+
[XmlElement(Order = 4)]
2731
public decimal pIS
2832
{
2933
get => _pIs.Arredondar(4);
3034
set => _pIs = value.Arredondar(4);
3135
}
3236

3337
// UB07
38+
[XmlElement(Order = 5)]
3439
public decimal? pISEspec
3540
{
3641
get => _pIsEspec.Arredondar(4);
@@ -42,16 +47,19 @@ public bool ShouldSerializepISEspec()
4247
}
4348

4449
// UB09
50+
[XmlElement(Order = 6)]
4551
public string uTrib { get; set; }
4652

4753
// UB10
54+
[XmlElement(Order = 7)]
4855
public decimal qTrib
4956
{
5057
get => _qTrib.Arredondar(4);
5158
set => _qTrib = value.Arredondar(4);
5259
}
5360

5461
// UB11
62+
[XmlElement(Order = 8)]
5563
public decimal vIS
5664
{
5765
get => _vIs.Arredondar(2);

NFe.Classes/Informacoes/Detalhe/Tributacao/gCBS.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gCBS
46
{
57
private decimal _pGBS;
68
private decimal _vGBS;
79

810
// UB37
11+
[XmlElement(Order = 1)]
912
public decimal pCBS
1013
{
1114
get => _pGBS.Arredondar(4);
1215
set => _pGBS = value.Arredondar(4);
1316
}
1417

1518
// UB40
19+
[XmlElement(Order = 2)]
1620
public gDif gDif { get; set; }
1721

1822
// UB43
23+
[XmlElement(Order = 3)]
1924
public gDevTrib gDevTrib { get; set; }
2025

2126
// UB45
27+
[XmlElement(Order = 4)]
2228
public gRed gRed { get; set; }
2329

2430
// UB67
31+
[XmlElement(Order = 5)]
2532
public decimal vCBS
2633
{
2734
get => _vGBS.Arredondar(2);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gCredPresIBSZFM
46
{
57
private decimal? _vCredPresIbsZfm;
68

79
// UB110
10+
[XmlElement(Order = 1)]
811
public tpCredPresIBSZFM tpCredPresIBSZFM { get; set; }
912

1013
// UB111
14+
[XmlElement(Order = 2)]
1115
public decimal? vCredPresIBSZFM
1216
{
1317
get => _vCredPresIbsZfm.Arredondar(2);
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,45 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gIBSCBS
46
{
57
private decimal _vBc;
68

79
// UB16
10+
[XmlElement(Order = 1)]
811
public decimal vBC
912
{
1013
get => _vBc.Arredondar(2);
1114
set => _vBc = value.Arredondar(2);
1215
}
1316

1417
// UB17
18+
[XmlElement(Order = 2)]
1519
public gIBSUF gIBSUF { get; set; }
1620

1721
// UB36
22+
[XmlElement(Order = 3)]
1823
public gIBSMun gIBSMun { get; set; }
1924

2025
// UB55
26+
[XmlElement(Order = 4)]
2127
public gCBS gCBS { get; set; }
2228

2329
// UB68
30+
[XmlElement(Order = 5)]
2431
public gTribRegular gTribRegular { get; set; }
2532

2633
// UB73
34+
[XmlElement(Order = 6)]
2735
public gIBSCredPres gIBSCredPres { get; set; }
2836

2937
// UB78
38+
[XmlElement(Order = 7)]
3039
public gIBSCredPres gCBSCredPres { get; set; }
3140

3241
// UB82a
42+
[XmlElement(Order = 8)]
3343
public gTribCompraGov gTribCompraGov { get; set; }
3444
}
3545
}

NFe.Classes/Informacoes/Detalhe/Tributacao/gIBSCBSMono.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gIBSCBSMono
46
{
57
private decimal _vTotIbsMonoItem;
68
private decimal _vTotCbsMonoItem;
79

810
// UB84a
11+
[XmlElement(Order = 1)]
912
public gMonoPadrao gMonoPadrao { get; set; }
1013

1114
// UB90
15+
[XmlElement(Order = 2)]
1216
public gMonoReten gMonoReten { get; set; }
1317

1418
// UB94
19+
[XmlElement(Order = 3)]
1520
public gMonoRet gMonoRet { get; set; }
1621

1722
// UB99
23+
[XmlElement(Order = 4)]
1824
public gMonoDif gMonoDif { get; set; }
1925

2026
// UB104
27+
[XmlElement(Order = 5)]
2128
public decimal vTotIBSMonoItem
2229
{
2330
get => _vTotIbsMonoItem.Arredondar(2);
2431
set => _vTotIbsMonoItem = value.Arredondar(2);
2532
}
2633

2734
// UB105
35+
[XmlElement(Order = 6)]
2836
public decimal vTotCBSMonoItem
2937
{
3038
get => _vTotCbsMonoItem.Arredondar(2);

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gIBSCredPres
46
{
@@ -7,23 +9,27 @@ public class gIBSCredPres
79
private decimal _vCredPresCondSus;
810

911
// UB74
12+
[XmlElement(Order = 1)]
1013
public TipocCredPres cCredPres { get; set; }
1114

1215
// UB75
16+
[XmlElement(Order = 2)]
1317
public decimal pCredPres
1418
{
1519
get => _pCredPres.Arredondar(4);
1620
set => _pCredPres = value.Arredondar(4);
1721
}
1822

1923
// UB76
24+
[XmlElement(Order = 3)]
2025
public decimal vCredPres
2126
{
2227
get => _vCredPres.Arredondar(2);
2328
set => _vCredPres = value.Arredondar(2);
2429
}
2530

2631
// UB77
32+
[XmlElement(Order = 4)]
2733
public decimal vCredPresCondSus
2834
{
2935
get => _vCredPresCondSus.Arredondar(2);

NFe.Classes/Informacoes/Detalhe/Tributacao/gIBSMun.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gIBSMun
46
{
57
private decimal _pIbsMun;
68
private decimal _vIbsMun;
79

810
// UB37
11+
[XmlElement(Order = 1)]
912
public decimal pIBSMun
1013
{
1114
get => _pIbsMun.Arredondar(4);
1215
set => _pIbsMun = value.Arredondar(4);
1316
}
1417

1518
// UB40
19+
[XmlElement(Order = 2)]
1620
public gDif gDif { get; set; }
1721

1822
// UB43
23+
[XmlElement(Order = 3)]
1924
public gDevTrib gDevTrib { get; set; }
2025

2126
// UB45
27+
[XmlElement(Order = 4)]
2228
public gRed gRed { get; set; }
2329

2430
// UB54
31+
[XmlElement(Order = 5)]
2532
public decimal vIBSMun
2633
{
2734
get => _vIbsMun.Arredondar(2);

NFe.Classes/Informacoes/Detalhe/Tributacao/gIBSUF.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gIBSUF
46
{
57
private decimal _pIbsUf;
68
private decimal _vIbsUf;
79

810
// UB18
11+
[XmlElement(Order = 1)]
912
public decimal pIBSUF
1013
{
1114
get => _pIbsUf.Arredondar(4);
1215
set => _pIbsUf = value.Arredondar(4);
1316
}
1417

1518
// UB21
19+
[XmlElement(Order = 2)]
1620
public gDif gDif { get; set; }
1721

1822
// UB24
23+
[XmlElement(Order = 3)]
1924
public gDevTrib gDevTrib { get; set; }
2025

2126
// UB26
27+
[XmlElement(Order = 4)]
2228
public gRed gRed { get; set; }
2329

2430
// UB35
31+
[XmlElement(Order = 5)]
2532
public decimal vIBSUF
2633
{
2734
get => _vIbsUf.Arredondar(2);

NFe.Classes/Informacoes/Detalhe/Tributacao/gMonoDif.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
1+
using System.Xml.Serialization;
2+
3+
namespace NFe.Classes.Informacoes.Detalhe.Tributacao
24
{
35
public class gMonoDif
46
{
@@ -8,27 +10,31 @@ public class gMonoDif
810
private decimal _vCbsMonoDif;
911

1012
// UB100
13+
[XmlElement(Order = 1)]
1114
public decimal pDifIBS
1215
{
1316
get => _pDifIbs.Arredondar(4);
1417
set => _pDifIbs = value.Arredondar(4);
1518
}
1619

1720
// UB101
21+
[XmlElement(Order = 2)]
1822
public decimal vIBSMonoDif
1923
{
2024
get => _vIbsMonoDif.Arredondar(2);
2125
set => _vIbsMonoDif = value.Arredondar(2);
2226
}
2327

2428
// UB102
29+
[XmlElement(Order = 3)]
2530
public decimal pDifCBS
2631
{
2732
get => _pDifCbs.Arredondar(4);
2833
set => _pDifCbs = value.Arredondar(4);
2934
}
3035

3136
// UB103
37+
[XmlElement(Order = 4)]
3238
public decimal vCBSMonoDif
3339
{
3440
get => _vCbsMonoDif.Arredondar(2);

0 commit comments

Comments
 (0)